~ | Modified scene

This commit is contained in:
TheRedShip
2025-01-12 21:38:04 +01:00
parent a551347084
commit 0482f34ce5
9 changed files with 54 additions and 13 deletions

View File

@ -7,10 +7,10 @@ Pos=1515,93
Size=368,276 Size=368,276
[Window][Material] [Window][Material]
Pos=1601,205 Pos=1613,197
Size=297,259 Size=290,238
[Window][Camera] [Window][Camera]
Pos=1614,5 Pos=1618,9
Size=279,183 Size=279,183

View File

@ -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 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 sp -0.600 -0.500 -2 1 0

View File

@ -1,6 +1,6 @@
CAM 0.361576 0.0380219 0.276604 -78.8 231.6 0 1 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 255 255 3.0 0.0 0.0
MAT 255 100 100 0.0 0.0 0.0 MAT 255 100 100 0.0 0.0 0.0

View File

@ -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 150 080 0.0 0.0 0.0 //green
MAT 040 080 150 0.0 0.0 0.0 //blue 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 # sp 40 100 100 50 0

View File

@ -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.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 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 +9.000 -25.00 6.0 3
sp +10.00 +8.700 -15.00 5.4 3 sp +10.00 +8.700 -15.00 5.4 3

43
scenes/window.rt Normal file
View File

@ -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

View File

@ -144,8 +144,6 @@ vec3 pathtrace(Ray ray, inout uint rng_state)
vec3 color = vec3(1.0); vec3 color = vec3(1.0);
vec3 light = vec3(0.0); vec3 light = vec3(0.0);
float closest_t = 1e30;
for (int i = 0; i < camera.bounce; i++) for (int i = 0; i < camera.bounce; i++)
{ {
hitInfo hit = traceRay(ray); hitInfo hit = traceRay(ray);

View File

@ -38,9 +38,9 @@ vec3 randomHemisphereDirection(vec3 normal, inout uint rng_state)
vec3 GetEnvironmentLight(Ray ray) 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 SunFocus = 1.5;
float SunIntensity = 1; float SunIntensity = 0.5;
vec3 GroundColour = vec3(0.5, 0.5, 0.5); vec3 GroundColour = vec3(0.5, 0.5, 0.5);
vec3 SkyColourHorizon = vec3(135 / 255.0f, 206 / 255.0f, 235 / 255.0f); 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 // Combine ground, sky, and sun
vec3 composite = mix(GroundColour, skyGradient, groundToSkyT) + sun * int(groundToSkyT >= 1); vec3 composite = mix(GroundColour, skyGradient, groundToSkyT) + sun * int(groundToSkyT >= 1);
return composite; return composite;
} }

View File

@ -46,4 +46,4 @@ Ray newRay(hitInfo hit, Ray ray, inout uint rng_state)
else if (mat.type == 1) else if (mat.type == 1)
return (dieletricRay(hit, ray, mat)); return (dieletricRay(hit, ray, mat));
return (ray); return (ray);
} }