From 05387337cfadaf43999f22e25af4234bfdd1360e Mon Sep 17 00:00:00 2001 From: TheRedShip Date: Fri, 3 Jan 2025 16:48:57 +0100 Subject: [PATCH] ~ | map changing --- scenes/cornell.rt | 27 +++++++++++++++++++++++++++ scenes/test.rt | 33 ++++++++------------------------- shaders/compute.glsl | 2 +- 3 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 scenes/cornell.rt diff --git a/scenes/cornell.rt b/scenes/cornell.rt new file mode 100644 index 0000000..e51f5b3 --- /dev/null +++ b/scenes/cornell.rt @@ -0,0 +1,27 @@ + +MAT 255 255 255 0.0 0.0 0.0 +MAT 255 255 255 5.0 0.0 0.0 + +MAT 255 100 100 0.0 0.0 0.0 +MAT 100 100 255 0.0 0.0 0.0 +MAT 100 255 100 0.0 0.0 0.0 + +MAT 255 255 255 0.0 0.98 0.0 + +sp 0 -1 0 1 5 + +sp 0 -2 -1 2 2 +sp -1 -2 0.8 2 3 +sp 1 -2 0.8 2 4 + +qu -1 2.9 -1 2 0 0 0 0 2 1 + +pl 0 3 0 0 -1 0 5 +pl 0 -3 0 0 1 0 5 +pl 3 0 0 -1 0 0 3 +pl -3 0 0 1 0 0 2 +pl 0 0 -3 0 0 1 0 +pl 0 0 3 0 0 -1 0 + + +R 1.0 -2.0 10 diff --git a/scenes/test.rt b/scenes/test.rt index 693a94a..10105ee 100644 --- a/scenes/test.rt +++ b/scenes/test.rt @@ -1,27 +1,10 @@ - -MAT 255 255 255 0.0 0.0 0.0 -MAT 255 255 255 5.0 0.0 0.0 - -MAT 255 100 100 0.0 0.0 0.0 -MAT 100 100 255 0.0 0.0 0.0 -MAT 100 255 100 0.0 0.0 0.0 - -MAT 255 255 255 0.0 1.0 0.0 - -sp 0 -1 0 1 5 - -sp 0 -2 -1 2 2 -sp -1 -2 0.8 2 3 -sp 1 -2 0.8 2 4 - -qu -1.5 2.9 -1.5 3 0 0 0 0 3 1 - -pl 0 3 0 0 -1 0 5 -pl 0 -3 0 0 1 0 0 -pl 3 0 0 -1 0 0 3 -pl -3 0 0 1 0 0 2 -pl 0 0 -3 0 0 1 0 -pl 0 0 3 0 0 -1 0 +MAT 255 255 255 0.0 0.0 0.0 //white +MAT 255 100 100 0.0 0.0 0.0 //red +MAT 255 255 255 5.0 0.0 0.0 //sun -R 1.0 -2.0 10 +pl 0 -1 0 0 1 0 0 + +cu 0 1 -3 1 1 1 + +sp 15 30 -30 30 2 diff --git a/shaders/compute.glsl b/shaders/compute.glsl index cd64881..4bfa9f5 100644 --- a/shaders/compute.glsl +++ b/shaders/compute.glsl @@ -97,7 +97,7 @@ vec3 pathtrace(Ray ray, vec2 uv) float closest_t = 1e30; - for (int i = 0; i < 4; i++) + for (int i = 0; i < 10; i++) { hitInfo hit = traceRay(ray); if (hit.obj_index == -1)