diff --git a/imgui.ini b/imgui.ini index 419840a..7c1c0d6 100644 --- a/imgui.ini +++ b/imgui.ini @@ -7,10 +7,10 @@ Pos=1515,93 Size=368,276 [Window][Material] -Pos=1601,205 -Size=297,259 +Pos=1613,197 +Size=290,238 [Window][Camera] -Pos=1614,5 +Pos=1618,9 Size=279,183 diff --git a/scenes/colored_light.rt b/scenes/colored_light.rt index bb1be60..c5017cf 100644 --- a/scenes/colored_light.rt +++ b/scenes/colored_light.rt @@ -6,7 +6,7 @@ MAT 010 010 255 5 0.0 1.0 MAT 255 255 255 0 1.7 1.0 DIE -MAT 255 255 255 0 0.0 1.0 +MAT 200 200 200 0 0.0 1.0 sp -0.600 -0.500 -2 1 0 diff --git a/scenes/cornell.rt b/scenes/cornell.rt index 0886254..deff5da 100644 --- a/scenes/cornell.rt +++ b/scenes/cornell.rt @@ -1,6 +1,6 @@ CAM 0.361576 0.0380219 0.276604 -78.8 231.6 0 1 -MAT 255 255 255 0.0 0.0 0.0 +MAT 200 200 200 0.0 0.0 0.0 MAT 255 255 255 3.0 0.0 0.0 MAT 255 100 100 0.0 0.0 0.0 diff --git a/scenes/fox.rt b/scenes/fox.rt index 218055b..f67993c 100644 --- a/scenes/fox.rt +++ b/scenes/fox.rt @@ -4,7 +4,7 @@ MAT 255 255 255 5.0 0.0 0.0 //white light MAT 040 150 080 0.0 0.0 0.0 //green MAT 040 080 150 0.0 0.0 0.0 //blue -MAT 255 255 255 0.0 0.0 0 //white +MAT 200 200 200 0.0 0.0 0 //white # sp 40 100 100 50 0 diff --git a/scenes/pillard.rt b/scenes/pillard.rt index 5cb9db8..25305d3 100644 --- a/scenes/pillard.rt +++ b/scenes/pillard.rt @@ -11,7 +11,7 @@ sp +0.000 +17.00 -20.00 4.0 2 MAT 250 250 250 0.0 1.5 0.0 DIE // 3 white 0 0 1 MAT 250 250 250 0.0 1.0 1.0 // 4 white 0 1 0 -MAT 250 250 250 0.0 0.0 0.0 // 5 white 1 0 0 +MAT 200 200 200 0.0 0.0 0.0 // 5 white 1 0 0 sp +10.00 +9.000 -25.00 6.0 3 sp +10.00 +8.700 -15.00 5.4 3 diff --git a/scenes/window.rt b/scenes/window.rt new file mode 100644 index 0000000..4140e71 --- /dev/null +++ b/scenes/window.rt @@ -0,0 +1,43 @@ +CAM 11.1641 1.64529 -17.9646 -4.2 -237.4 0 1 90 5 + +MAT 255 255 255 0.0 1.0 0.0 //white +MAT 150 150 150 0.0 1.0 0.0 //grey + +pl 0 0 0 0 1 0 1 + + +qu 0 0 0 0 6 0 18 0 0 0 +qu 0 0 -18 0 6 0 18 0 0 0 +qu 18 0 -18 0 6 0 0 0 18 0 +qu 0 6 -18 18 0 0 0 0 18 0 + +cu 0.25 3 -0.25 0.5 6 0.5 0 +cu 0.25 3 -1.25 0.5 6 0.5 0 +cu 0.25 3 -2.25 0.5 6 0.5 0 +cu 0.25 3 -3.25 0.5 6 0.5 0 +cu 0.25 3 -4.25 0.5 6 0.5 0 +cu 0.25 3 -5.25 0.5 6 0.5 0 +cu 0.25 3 -6.25 0.5 6 0.5 0 +cu 0.25 3 -7.25 0.5 6 0.5 0 +cu 0.25 3 -8.25 0.5 6 0.5 0 +cu 0.25 3 -9.25 0.5 6 0.5 0 +cu 0.25 3 -10.25 0.5 6 0.5 0 +cu 0.25 3 -11.25 0.5 6 0.5 0 +cu 0.25 3 -12.25 0.5 6 0.5 0 +cu 0.25 3 -13.25 0.5 6 0.5 0 +cu 0.25 3 -14.25 0.5 6 0.5 0 +cu 0.25 3 -15.25 0.5 6 0.5 0 +cu 0.25 3 -16.25 0.5 6 0.5 0 +cu 0.25 3 -17.25 0.5 6 0.5 0 + + +cu 12 3 -17 0.1 6 2 0 +cu 12 3 -13 0.1 6 2 0 +cu 12 5 -15 0.1 2 4 0 +cu 15 3 -12 6.1 6 0.1 0 + + + + + + diff --git a/shaders/compute.glsl b/shaders/compute.glsl index db38c2a..83142f1 100644 --- a/shaders/compute.glsl +++ b/shaders/compute.glsl @@ -144,8 +144,6 @@ vec3 pathtrace(Ray ray, inout uint rng_state) vec3 color = vec3(1.0); vec3 light = vec3(0.0); - float closest_t = 1e30; - for (int i = 0; i < camera.bounce; i++) { hitInfo hit = traceRay(ray); diff --git a/shaders/random.glsl b/shaders/random.glsl index f6abca6..a6b689b 100644 --- a/shaders/random.glsl +++ b/shaders/random.glsl @@ -38,9 +38,9 @@ vec3 randomHemisphereDirection(vec3 normal, inout uint rng_state) vec3 GetEnvironmentLight(Ray ray) { - vec3 sun_pos = vec3(-0.5, 0.5, 0.5); + vec3 sun_pos = vec3(-1., 1.0, 0.); float SunFocus = 1.5; - float SunIntensity = 1; + float SunIntensity = 0.5; vec3 GroundColour = vec3(0.5, 0.5, 0.5); vec3 SkyColourHorizon = vec3(135 / 255.0f, 206 / 255.0f, 235 / 255.0f); @@ -53,4 +53,4 @@ vec3 GetEnvironmentLight(Ray ray) // Combine ground, sky, and sun vec3 composite = mix(GroundColour, skyGradient, groundToSkyT) + sun * int(groundToSkyT >= 1); return composite; -} \ No newline at end of file +} diff --git a/shaders/scatter.glsl b/shaders/scatter.glsl index b33b2c6..7917abb 100644 --- a/shaders/scatter.glsl +++ b/shaders/scatter.glsl @@ -46,4 +46,4 @@ Ray newRay(hitInfo hit, Ray ray, inout uint rng_state) else if (mat.type == 1) return (dieletricRay(hit, ray, mat)); return (ray); -} \ No newline at end of file +}