aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake-build-release/.ninja_log123
-rw-r--r--cmake-build-release/Testing/Temporary/LastTest.log4
-rw-r--r--scenefiles-4d/unit_cone.json2
-rw-r--r--scenefiles-4d/unit_cylinder.json2
4 files changed, 22 insertions, 109 deletions
diff --git a/cmake-build-release/.ninja_log b/cmake-build-release/.ninja_log
index ee636d4..e50c793 100644
--- a/cmake-build-release/.ninja_log
+++ b/cmake-build-release/.ninja_log
@@ -1,118 +1,31 @@
# ninja log v5
-1988 3376 1702449495343876471 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
-1786 2556 1702449494524724589 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214
-1242 1987 1702449493956540906 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
-1572 2267 1702449494236003666 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
-675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb
-1527 2227 1702449494195758020 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
-1548 2226 1702449494194849367 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
-1650 1757 1702450784828580285 projects_ray 45fbfe11691b47a4
-6 413 1702450783479044000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-414 1149 1702450784217680884 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-766 1547 1702449493516117104 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
-414 1650 1702450784718468874 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
-1946 2293 1702449494263175911 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2
-643 1572 1702449493540998673 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386
-423 643 1702449492612892188 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51
-424 766 1702449492735548848 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0
-2092 2899 1702449494868005082 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
-414 1313 1702450784381951546 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
-40 161 1702447876286034325 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4
-424 1159 1702449493127944322 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
-1348 2092 1702449494060410954 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
-414 1444 1702450784512237864 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
-414 1177 1702450784246381086 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
-2227 2872 1702449494841801073 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
-6 413 1702450783479044000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-1251 2006 1702449493973524002 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
-6 413 1702450783479044000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-424 1250 1702449493216958161 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
-2007 2777 1702449494744944219 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
-6 413 1702450783479044000 projects_ray_autogen/timestamp 55fca76aac650d2f
-7 37 1702451620435896085 projects_ray_autogen/timestamp 55fca76aac650d2f
-7 37 1702451620435896085 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-7 37 1702451620435896085 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-7 37 1702451620435896085 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-40 1399 1702451621791849149 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
-1399 1523 1702451621921376701 projects_ray 45fbfe11691b47a4
-6 412 1702451939391778000 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 412 1702451939391778000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 412 1702451939391778000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 412 1702451939391778000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-414 1110 1702451940091575362 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
-414 1170 1702451940153636470 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
-413 1213 1702451940196527649 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
-414 1259 1702451940242362875 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
-413 1367 1702451940350959554 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
-413 1485 1702451940468829130 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
-413 1693 1702451940676439710 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
-6 33 1702451943459045623 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 33 1702451943459045623 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 33 1702451943459045623 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 33 1702451943459045623 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-37 699 1702451944121685745 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
-37 706 1702451944128482186 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
-37 712 1702451944135134042 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
-37 716 1702451944139225231 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
-37 718 1702451944141614019 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
-36 722 1702451944145674792 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
-36 759 1702451944182171578 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-6 409 1702451967248888000 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 409 1702451967248888000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 409 1702451967248888000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 409 1702451967248888000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-410 857 1702451967700101879 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0
-410 1203 1702451968043672489 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
-411 1269 1702451968101036439 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
-409 1350 1702451968184296925 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
-411 1452 1702451968294549421 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
-410 1505 1702451968347842640 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
-857 1653 1702451968494503672 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-410 1717 1702451968559045111 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
-410 1878 1702451968719347900 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
-1203 1931 1702451968773961349 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
-1269 2000 1702451968842692563 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
-1351 2045 1702451968887720776 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
-1452 2135 1702451968977829870 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
-1505 2195 1702451969036438382 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
-1653 2342 1702451969184886358 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
-1717 2474 1702451969317858048 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214
-2045 2707 1702451969550779321 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
-1931 2719 1702451969562451340 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
-2000 2794 1702451969637881909 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
-1878 3249 1702451970091892310 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
-3249 3358 1702451970204198381 projects_ray 45fbfe11691b47a4
-6 33 1702452369238762000 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 33 1702452369238762000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 33 1702452369238762000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 33 1702452369238762000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-36 1360 1702452370562378093 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
-1360 1465 1702452370669676125 projects_ray 45fbfe11691b47a4
7 406 1702452576958836000 projects_ray_autogen/timestamp 55fca76aac650d2f
+1950 2726 1702452579281942761 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
+408 1266 1702452577821843548 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
7 406 1702452576958836000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-7 406 1702452576958836000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
+1266 1950 1702452578506323308 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
7 406 1702452576958836000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-407 631 1702452577188925730 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51
-407 764 1702452577320246727 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0
-407 1084 1702452577636902535 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
+2160 2797 1702452579353843525 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
406 1224 1702452577780216305 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
-408 1266 1702452577821843548 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
-407 1345 1702452577900255040 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
407 1478 1702452578033432441 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
-764 1513 1702452578068197159 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
+1345 2037 1702452578590039217 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
+407 1084 1702452577636902535 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
+2038 2840 1702452579396783205 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
+40 161 1702447876286034325 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4
+407 1345 1702452577900255040 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
+407 764 1702452577320246727 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0
+407 631 1702452577188925730 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51
632 1535 1702452578086357696 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386
+1837 2197 1702452578754826578 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2
407 1693 1702452578247598042 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
+764 1513 1702452578068197159 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
1084 1837 1702452578392517130 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-1224 1917 1702452578473192908 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
-1266 1950 1702452578506323308 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
-1345 2037 1702452578590039217 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
-1478 2160 1702452578715901294 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
+7 406 1702452576958836000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
+3319 3423 1702452579981981184 projects_ray 45fbfe11691b47a4
1513 2179 1702452578735842902 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
-1837 2197 1702452578754826578 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2
+1478 2160 1702452578715901294 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
+675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb
1535 2212 1702452578769213805 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
1693 2445 1702452579001092270 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214
-1950 2726 1702452579281942761 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
-2160 2797 1702452579353843525 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
-2038 2840 1702452579396783205 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
+1224 1917 1702452578473192908 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
1917 3319 1702452579874611066 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
-3319 3423 1702452579981981184 projects_ray 45fbfe11691b47a4
diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log
index 15e684e..032ef86 100644
--- a/cmake-build-release/Testing/Temporary/LastTest.log
+++ b/cmake-build-release/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: Dec 13 02:29 EST
+Start testing: Dec 13 02:32 EST
----------------------------------------------------------
-End testing: Dec 13 02:29 EST
+End testing: Dec 13 02:32 EST
diff --git a/scenefiles-4d/unit_cone.json b/scenefiles-4d/unit_cone.json
index 9591e9c..42bf44b 100644
--- a/scenefiles-4d/unit_cone.json
+++ b/scenefiles-4d/unit_cone.json
@@ -13,7 +13,7 @@
"heightAngle": 30.0,
"depthAngle": 30.0,
"focus": [0.0, 0.0, 0.0, 0.0],
- "over": [0.0, 1.0, 0.0, 0.0]
+ "over": [0.0, 0.0, 0.0, 1.0]
},
"groups": [
{
diff --git a/scenefiles-4d/unit_cylinder.json b/scenefiles-4d/unit_cylinder.json
index 2a795db..62e9cef 100644
--- a/scenefiles-4d/unit_cylinder.json
+++ b/scenefiles-4d/unit_cylinder.json
@@ -13,7 +13,7 @@
"heightAngle": 30.0,
"depthAngle": 30.0,
"focus": [0.0, 0.0, 0.0, 0.0],
- "over": [0.0, 1.0, 0.0, 0.0]
+ "over": [0.0, 0.0, 0.0, 1.0]
},
"groups": [
{