From 3b3813793fda539d27a1d7caeaf8d82acd7c12de Mon Sep 17 00:00:00 2001 From: RedShip Date: Tue, 4 Feb 2025 18:56:10 +0100 Subject: [PATCH] + | Map changing --- includes/RT/objects/Quad.hpp | 1 - scenes/lambo.rt | 8 ++++---- scenes/noneuclidian.rt | 14 ++++++++++++-- scenes/portalcornell.rt | 2 +- scenes/portalrotation.rt | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/includes/RT/objects/Quad.hpp b/includes/RT/objects/Quad.hpp index e1f17f9..d0b1584 100644 --- a/includes/RT/objects/Quad.hpp +++ b/includes/RT/objects/Quad.hpp @@ -23,7 +23,6 @@ class Quad : public Object float x, y, z; float x1, y1, z1; float x2, y2, z2; - bool double_face; int mat_index; if (!(line >> x >> y >> z)) diff --git a/scenes/lambo.rt b/scenes/lambo.rt index f29e63b..19c8f89 100644 --- a/scenes/lambo.rt +++ b/scenes/lambo.rt @@ -2,14 +2,14 @@ CAM -2.41462 2.57199 4.09049 -1.80012 -50.2012 0.02 2.973 45.75 MAT 20 20 20 0. 0.9 0.5 // 0 gray # pl 0 5.2 0 0 -1 0 0 // floor -qu -5 5 -5 0 0 10 10 0 0 0 +qu -5 5 -5 0 0 10 10 0 0 0 0 MAT 255 100 100 1.0 0.0 0.0 //1 red MAT 100 100 255 1.0 0.0 0.0 //2 blue -po -0.75 1.5 5 0 1.5 0 1.5 0 0 1 2 -po -0.75 10 2.4 0 1.5 0 1.5 0 0 1 1 +po -0.75 1.5 5 0 1.5 0 1.5 0 0 0 2 +po -0.75 10 2.4 0 1.5 0 1.5 0 0 0 1 MAT 200 200 200 0. 0. 0. // 3 white @@ -19,7 +19,7 @@ cu 0 10 0 5 5 5 3 sp 0 10 0 1 4 -OBJ scenes/obj/lambo.obj 0 1.5 0 1 0 0 0 +OBJ obj/lambo.obj 0 1.5 0 1 0 0 0 diff --git a/scenes/noneuclidian.rt b/scenes/noneuclidian.rt index 4a75efa..c47f2c5 100644 --- a/scenes/noneuclidian.rt +++ b/scenes/noneuclidian.rt @@ -7,14 +7,24 @@ MAT 200 200 200 0 0 0 // 2 portal pl 0 0 0 0 1 0 0 +# long tunnel po -1.5 0 4.5 3 0 0 0 3 0 0 2 po -1.5 0 -4.5 3 0 0 0 3 0 1 2 qu -1.5 0 -5 0 3 0 0 0 10 0 1 qu 1.5 0 -5 0 3 0 0 0 10 0 1 - qu -1.5 3 -5 3 0 0 0 0 10 0 1 +# small tunnel +qu 9.5 0 -1 0 3 0 0 0 2 0 1 +qu 12.5 0 -1 0 3 0 0 0 2 0 1 +qu 9.5 3 -1 3 0 0 0 0 2 0 1 -cu 10 1.5 0 3 3 5 1 +# small tunnel entrance +po 9.5 0 1 3 0 0 0 3 0 0 2 +po -1.5 0 4.49 3 0 0 0 3 0 1 2 + +#small tunnel entrace behind +po 9.5 0 -1 3 0 0 0 3 0 1 2 +po -1.5 0 -4.49 3 0 0 0 3 0 0 2 \ No newline at end of file diff --git a/scenes/portalcornell.rt b/scenes/portalcornell.rt index 15146bc..fa2fe75 100644 --- a/scenes/portalcornell.rt +++ b/scenes/portalcornell.rt @@ -18,7 +18,7 @@ pl 0 0 0 0 1 0 0 cu 0 0.5 0 1 1 1 1 sp 0 1.5 0 1 1 -qu -1 4 -1 2 0 0 0 0 2 2 +qu -1 4 -1 2 0 0 0 0 2 1 2 cu 0 2.5 0 5 5 5 1 diff --git a/scenes/portalrotation.rt b/scenes/portalrotation.rt index d765ace..34f5369 100644 --- a/scenes/portalrotation.rt +++ b/scenes/portalrotation.rt @@ -9,7 +9,7 @@ MAT 255 255 100 0.0 0.0 0.0 //yellow MAT 50 50 50 0.0 0.0 0.0 //gray -qu -1 2.5 -1 2 0 0 0 0 2 0 +qu -1 2.5 -1 2 0 0 0 0 2 0 0 pl 0 3 0 0 -1 0 1 pl 0 -3 0 0 1 0 6