Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Framework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vulkan2021
VkCV Framework
Commits
3fbfbc40
Commit
3fbfbc40
authored
3 years ago
by
Alex Laptop
Browse files
Options
Downloads
Patches
Plain Diff
Add adjustable f0
parent
e0eacdf3
No related branches found
No related tags found
1 merge request
!101
Path tracing
Pipeline
#27261
passed
3 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
projects/path_tracer/shaders/path_tracer.comp
+3
-2
3 additions, 2 deletions
projects/path_tracer/shaders/path_tracer.comp
projects/path_tracer/src/main.cpp
+10
-7
10 additions, 7 deletions
projects/path_tracer/src/main.cpp
with
13 additions
and
9 deletions
projects/path_tracer/shaders/path_tracer.comp
+
3
−
2
View file @
3fbfbc40
...
...
@@ -12,6 +12,8 @@ struct Material {
float ks; // specular percentage
vec3 albedo;
float r; // roughness
vec3 f0;
float padding;
};
struct Sphere{
...
...
@@ -358,8 +360,7 @@ vec3 castRay(Ray ray) {
if(intersection.hit){
vec3 diffuseBRDF = computeDiffuseBRDF(intersection.material);
vec3 f0 = vec3(0.04);
vec3 specularBRDF = computeSpecularBRDF(f0, intersection.material.r, NoV, NoL, NoH);
vec3 specularBRDF = computeSpecularBRDF(intersection.material.f0, intersection.material.r, NoV, NoL, NoH);
brdf = mix(diffuseBRDF, specularBRDF, intersection.material.ks);
...
...
This diff is collapsed.
Click to expand it.
projects/path_tracer/src/main.cpp
+
10
−
7
View file @
3fbfbc40
...
...
@@ -10,13 +10,15 @@ int main(int argc, const char** argv) {
// structs must match shader version
struct
Material
{
Material
(
const
glm
::
vec3
&
emission
,
const
glm
::
vec3
&
albedo
,
float
ks
,
float
roughness
)
:
emission
(
emission
),
albedo
(
albedo
),
ks
(
ks
),
roughness
(
roughness
){}
Material
(
const
glm
::
vec3
&
emission
,
const
glm
::
vec3
&
albedo
,
float
ks
,
float
roughness
,
const
glm
::
vec3
&
f0
)
:
emission
(
emission
),
albedo
(
albedo
),
ks
(
ks
),
roughness
(
roughness
)
,
f0
(
f0
)
{}
glm
::
vec3
emission
;
float
ks
;
glm
::
vec3
albedo
;
float
roughness
;
glm
::
vec3
f0
;
float
padding
;
};
struct
Sphere
{
...
...
@@ -147,11 +149,11 @@ int main(int argc, const char** argv) {
typedef
std
::
pair
<
std
::
string
,
Material
>
MaterialSetting
;
std
::
vector
<
MaterialSetting
>
materialSettings
;
materialSettings
.
emplace_back
(
MaterialSetting
(
"white"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.65
),
0
,
0.25
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"red"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.5
,
0.0
,
0.0
),
0
,
0.25
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"green"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.0
,
0.5
,
0.0
),
0
,
0.25
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"light"
,
Material
(
glm
::
vec3
(
20
),
glm
::
vec3
(
0
),
0
,
0.25
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"sphere"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.65
),
1
,
0.25
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"white"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.65
),
0
,
0.25
,
glm
::
vec3
(
0.04
)
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"red"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.5
,
0.0
,
0.0
),
0
,
0.25
,
glm
::
vec3
(
0.04
)
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"green"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.0
,
0.5
,
0.0
),
0
,
0.25
,
glm
::
vec3
(
0.04
)
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"light"
,
Material
(
glm
::
vec3
(
20
),
glm
::
vec3
(
0
),
0
,
0.25
,
glm
::
vec3
(
0.04
)
)));
materialSettings
.
emplace_back
(
MaterialSetting
(
"sphere"
,
Material
(
glm
::
vec3
(
0
),
glm
::
vec3
(
0.65
),
1
,
0.25
,
glm
::
vec3
(
0.04
)
)));
const
uint32_t
whiteMaterialIndex
=
0
;
const
uint32_t
redMaterialIndex
=
1
;
...
...
@@ -425,6 +427,7 @@ int main(int argc, const char** argv) {
setting
.
second
.
emission
=
emissionStrength
*
emissionColor
;
updateMaterials
|=
ImGui
::
ColorEdit3
(
"Albedo color"
,
&
setting
.
second
.
albedo
.
x
);
updateMaterials
|=
ImGui
::
ColorEdit3
(
"F0"
,
&
setting
.
second
.
f0
.
x
);
updateMaterials
|=
ImGui
::
DragFloat
(
"ks"
,
&
setting
.
second
.
ks
,
0.01
,
0
,
1
);
updateMaterials
|=
ImGui
::
DragFloat
(
"roughness"
,
&
setting
.
second
.
roughness
,
0.01
,
0
,
1
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment