diff --git a/output.path b/output.path index afe9c07..ed2b18a 100644 Binary files a/output.path and b/output.path differ diff --git a/scenes/noneuclidian.rt b/scenes/noneuclidian.rt index f31f2f6..5d6d4f7 100644 --- a/scenes/noneuclidian.rt +++ b/scenes/noneuclidian.rt @@ -1,43 +1,81 @@ CAM -3.31413 5.09653 9.67312 -19.6 -74.7992 0 1 90 5 -MAT 100 200 100 0.0 0.0 0.0 CHK 25.5 // 0 +MAT 100 200 100 0.0 0.0 0.0 CHK 10.0 // 0 MAT 200 200 200 0.0 0.0 0.0 // 1 -MAT 200 100 100 0 0 0 // 2 portal -MAT 100 100 200 0 0 0 // 3 portal +MAT 255 255 255 0 1 0 DIE -1 // 2 portal +MAT 255 255 255 0 1 0 DIE -1 // 3 portal -MAT 100 200 100 0 0 0 // 4 portal -MAT 200 100 200 0 0 0 // 5 portal +MAT 255 255 255 0 1 0 DIE -1 // 4 portal +MAT 255 255 255 0 1 0 DIE -1 // 5 portal -qu -20 0 -20 40 0 0 0 0 40 0 0 +qu -15 0 -15 30 0 0 0 0 30 0 0 # long tunnel entrance -po -9 0 6.65 3.1 0 0 0 3.1 0 0 2 -po 6.7 0 1.9 3.1 0 0 0 3.1 0 1 2 +po -9 0 3.0 3 0 0 0 3 0 0 2 +po 6 0 0 3 0 0 0 3 0 1 2 # long tunnel entrance behind -po -9 0 -5.89 3.1 0 0 0 3.1 0 1 3 -po 6.7 0 -1.2 3.1 0 0 0 3.1 0 0 3 - -sp 0 1 0 1 0 +po -9 0 -6 3 0 0 0 3 0 1 3 +po 6 0 -3 3 0 0 0 3 0 0 3 # long tunnel -qu -9 0 -5.89 0 3.1 0 0 0 12.54 0 1 -qu -5.9 0 -5.89 0 3.1 0 0 0 12.54 0 1 -qu -9 3.1 -5.89 3.1 0 0 0 0 12.54 0 1 +qu -9.0 0 -6 0 3 0 0 0 9 0 1 +qu -6 0 -6 0 3 0 0 0 9 0 1 +qu -9 3 -6 3 0 0 0 0 9 0 1 # small tunnel -qu 9.8 0 -1.2 0 3.1 0 0 0 3.1 0 1 -qu 6.7 0 -1.2 0 3.1 0 0 0 3.1 0 1 -qu 6.7 3.1 -1.2 3.1 0 0 0 0 3.1 0 1 +qu 9.0 0 -3 0 3 0 0 0 3 0 1 +qu 6 0 -3 0 3 0 0 0 3 0 1 +qu 6 3 -3 3 0 0 0 0 3 0 1 + +#small tunnel entrance +po 6 0 0 3 0 0 0 3 0 0 4 +po -9 0 3 3 0 0 0 3 0 1 4 + +#small tunnel entrance behind +po 6 0 -3 3 0 0 0 3 0 1 5 +po -9 0 -6 3 0 0 0 3 0 0 5 + + +############## + +MAT 200 100 100 0.0 0.0 0.0 CHK 5.0 // 6 + +#floor 1 +qu 15 0 15 15 0 0 0 0 -15 0 6 +qu 27 0 15 15 0 0 0 0 -15 0 6 + +#upstairs +qu 15 0 0 15 0 0 0 5 -15 0 6 +qu 27 0 0 15 0 0 0 5 -15 0 6 + +#floor 2 + +qu 15 5 -15 15 0 0 0 0 -15 0 6 +qu 27 5 -15 15 0 0 0 0 -15 0 6 + +#upward tunnel +qu 21 -7.5 -15 0 0 15 0 15 5 0 1 +qu 24 -7.5 -15 0 0 15 0 15 5 0 1 +qu 21 9.165 -15 0 -5 15 3 0 0 0 1 + +#downard tunnel +qu 33 -7.5 -15 0 0 15 0 15 5 0 1 +qu 36 -7.5 -15 0 0 15 0 15 5 0 1 +qu 33 9.165 -15 0 -5 15 3 0 0 0 1 + +#upward tunnel entrance +po 21 0 0 0 4.165 0 3 0 0 1 2 +po 36 5 -15 0 4.165 0 -3 0 0 1 2 + +#upward tunnel entrance behind +po 21 5 -15 0 4.165 0 3 0 0 0 3 +po 33 0 0 0 4.165 0 3 0 0 0 3 + + +# po 24 5 -15 0 4.165 0 -3 0 0 0 3 +# po 33 0 0 0 4.165 0 3 0 0 0 3 - -# # small tunnel entrance -# po 9.5 2 1 3 0 0 0 3 0 0 4 -# po -1.5 2 4 3 0 0 0 3 0 1 4 - -# #small tunnel entrace behind -# po 9.5 2 -1 3 0 0 0 3 0 1 5 -# po -1.5 2 -4 3 0 0 0 3 0 0 5 diff --git a/scenes/sponza.rt b/scenes/sponza.rt index 67d8e74..f9e345a 100644 --- a/scenes/sponza.rt +++ b/scenes/sponza.rt @@ -4,7 +4,7 @@ MAT 255 255 255 0.0 1.0 0.5 // dragon 0 MAT 255 220 50 0.0 1.0 0.5 // dragon 1 # pl 0 0 0 0 1 0 0 // floor -MAT 255 255 255 5.0 0.0 0.0 // light 2 +MAT 255 225 200 10.0 0.0 0.0 // light 2 MAT 255 100 100 2.0 0.0 0.0 // light red portal 3 MAT 100 100 255 2.0 0.0 0.0 // light blue portal 4 @@ -14,22 +14,14 @@ sp 0 50 0 25 2 OBJ obj/sponza.obj 0 0 0 0.025 -# OBJ obj/Dragon_80K.obj 7 2.5 0 9 0 140 0 0 OBJ obj/Dragon_80K.obj 9 1.35 -3.5 5 0 40 0 1 - OBJ obj/Dragon_800K.obj 10 3.35 -3.5 45 0 230 0 0 -# OBJ obj/Dragon_80K.obj 9 1.35 -3.5 5 0 40 0 1 -OBJ obj/jinx.obj 2.5 14.0 -10.5 2.0 0 -90 0 -OBJ obj/jinx.obj 2.5 14.0 10.5 2.0 0 90 0 +# OBJ obj/jinx.obj 2.5 14.0 -10.5 2.0 0 -90 0 +# OBJ obj/jinx.obj 2.5 14.0 10.5 2.0 0 90 0 po 31 13 -13 0 3 0 0 0 3 1 3 po -34 13 -13 0 3 0 0 0 3 0 4 po 31 13 9 0 3 0 0 0 3 1 3 -po -34 13 9 0 3 0 0 0 3 0 4 - - -OBJ obj/axdubois/standing/standing.obj -26.5 10.25 -4 2 0 90 0 -OBJ obj/axdubois/sitting/sitting.obj 6 12.75 -5.90 2 -OBJ obj/axdubois/standing_arms_crossed/standing_arms_crossed.obj 22 12.67 2 2 0 90 0 +po -34 13 9 0 3 0 0 0 3 0 4 \ No newline at end of file diff --git a/scenes/test.rt b/scenes/test.rt index 09f2c6f..ba8a3e9 100644 --- a/scenes/test.rt +++ b/scenes/test.rt @@ -4,7 +4,8 @@ TEX skymap.hdr MAT 200 200 200 0.0 0.0 0.0 CHK -1 // 0 MAT 255 255 255 1.0 0.0 0.0 LAM 0 // 1 -sp 0 2 0 150 1 +# sp 0 2 0 150 1 -pl 0 0 0 0 1 0 0 +# pl 0 0 0 0 1 0 0 +OBJ obj/castle.obj diff --git a/srcs/class/Scene.cpp b/srcs/class/Scene.cpp index f8ee49a..342553d 100644 --- a/srcs/class/Scene.cpp +++ b/srcs/class/Scene.cpp @@ -36,8 +36,8 @@ Scene::Scene(std::string &name) _gpu_denoise.enabled = 0; _gpu_denoise.pass = 0; _gpu_denoise.c_phi = 0.4f; - _gpu_denoise.p_phi = 0.05f; - _gpu_denoise.n_phi = 0.05f; + _gpu_denoise.p_phi = 0.1f; + _gpu_denoise.n_phi = 0.1f; if (!file.is_open()) {