aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2023-12-13 04:52:41 -0500
committersotech117 <michael_foiani@brown.edu>2023-12-13 04:53:45 -0500
commitadc6d81d78b3ae24ae16c9d233864432ec09a4cb (patch)
tree832552c0777c93860b1648e5383dd390c2a91a3e
parentf887bd83942f13efe98d0c2cd997d037ed2ef068 (diff)
cleanup parser
-rw-r--r--cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-2cd214bbddfccda91a18.json (renamed from cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-f3cb0b557301e59f7738.json)2
-rw-r--r--cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T09-48-00-0376.json (renamed from cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T08-43-44-0090.json)4
-rw-r--r--cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-5ee24e2bf2daefbb3dce.json (renamed from cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-6bb81f03ba2a679a3648.json)6
-rw-r--r--cmake-build-debug/.ninja_depsbin185620 -> 251220 bytes
-rw-r--r--cmake-build-debug/.ninja_log110
-rw-r--r--cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt136
-rw-r--r--cmake-build-debug/Testing/Temporary/LastTest.log4
-rwxr-xr-xcmake-build-debug/projects_raybin1757881 -> 1792137 bytes
-rw-r--r--cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp83
-rw-r--r--src/physics/physics.cpp1
-rw-r--r--src/raytracer/raytracer.cpp2
-rw-r--r--src/utils/sceneparser.cpp4
-rw-r--r--src/utils/sceneparser.h1
13 files changed, 180 insertions, 173 deletions
diff --git a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-f3cb0b557301e59f7738.json b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-2cd214bbddfccda91a18.json
index 117930a..4ed393f 100644
--- a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-f3cb0b557301e59f7738.json
+++ b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-2cd214bbddfccda91a18.json
@@ -59,7 +59,7 @@
{
"directoryIndex" : 0,
"id" : "projects_ray::@6890427a1f51a3e7e1df",
- "jsonFile" : "target-projects_ray-Debug-6bb81f03ba2a679a3648.json",
+ "jsonFile" : "target-projects_ray-Debug-5ee24e2bf2daefbb3dce.json",
"name" : "projects_ray",
"projectIndex" : 0
},
diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T08-43-44-0090.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T09-48-00-0376.json
index b82cc59..1cf4f02 100644
--- a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T08-43-44-0090.json
+++ b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T09-48-00-0376.json
@@ -26,7 +26,7 @@
"objects" :
[
{
- "jsonFile" : "codemodel-v2-f3cb0b557301e59f7738.json",
+ "jsonFile" : "codemodel-v2-2cd214bbddfccda91a18.json",
"kind" : "codemodel",
"version" :
{
@@ -86,7 +86,7 @@
},
"codemodel-v2" :
{
- "jsonFile" : "codemodel-v2-f3cb0b557301e59f7738.json",
+ "jsonFile" : "codemodel-v2-2cd214bbddfccda91a18.json",
"kind" : "codemodel",
"version" :
{
diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-6bb81f03ba2a679a3648.json b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-5ee24e2bf2daefbb3dce.json
index 3aefaf4..106eced 100644
--- a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-6bb81f03ba2a679a3648.json
+++ b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-5ee24e2bf2daefbb3dce.json
@@ -535,11 +535,11 @@
"dependencies" :
[
{
- "id" : "projects_ray_autogen_timestamp_deps::@6890427a1f51a3e7e1df"
- },
- {
"backtrace" : 0,
"id" : "projects_ray_autogen::@6890427a1f51a3e7e1df"
+ },
+ {
+ "id" : "projects_ray_autogen_timestamp_deps::@6890427a1f51a3e7e1df"
}
],
"id" : "projects_ray::@6890427a1f51a3e7e1df",
diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps
index 86079ac..6c6014a 100644
--- a/cmake-build-debug/.ninja_deps
+++ b/cmake-build-debug/.ninja_deps
Binary files differ
diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log
index 0d369e6..963f968 100644
--- a/cmake-build-debug/.ninja_log
+++ b/cmake-build-debug/.ninja_log
@@ -1,52 +1,72 @@
# ninja log v5
-40 927 1702445407116631389 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 41959d435611c983
-1 163 1702457024072116037 build.ninja 34bb77e754b05480
-1129 1843 1702062977342546570 CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o ce6e3c7f960de866
-778 1680 1702455844579253848 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a
-1349 2143 1702455845042258829 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32
-6 33 1702456619262289500 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-1673 2487 1702455845385059746 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a
-36 740 1702456619964796396 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f
-1562 2374 1702455845272409626 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898
-6 33 1702456619262289500 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-389 1153 1702062976653549225 CMakeFiles/projects_ray.dir/src/4dvecops/vec4operations.cpp.o d05a5fd3c2f1f4c4
-740 850 1702456620077400849 projects_ray dac5017ee9a78855
-2144 3044 1702455845943590700 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f
-6 33 1702456619262289500 projects_ray_autogen/timestamp d580242d2b9854b3
-1680 2550 1702455845448778562 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273
+41 346 1702458736765477760 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o 834a2b4cd58f4bc0
+394 1673 1702455844569355061 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3
+395 1224 1702455844119704463 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b
+1416 2234 1702455845132156823 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e
+1768 2754 1702455845653411517 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4
+1257 2056 1702455844955251720 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec
+2374 3096 1702455845997075354 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 502b39b3210366aa
+6 34 1702459569545220070 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
+37 1225 1702459570730266885 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09
+1150 1837 1702062977336494519 CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o edbb1aa44772a316
+394 1349 1702455844246930552 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd
+395 1257 1702455844154620007 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c
+2056 3488 1702455846386519566 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc
2234 3052 1702455845951827480 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o a8cce28f179d7603
395 1416 1702455844310918869 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df
2244 2361 1702451055097878643 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o efaf5a8825d854f8
-395 778 1702455843677504099 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36
-2043 2512 1702455845412890139 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 624c5f86ab14c5d7
-641 1562 1702455844459709662 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a
395 640 1702455843541542312 CMakeFiles/projects_ray.dir/src/settings.cpp.o 7c89207347735849
-2056 3488 1702455846386519566 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc
-395 1257 1702455844154620007 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c
-394 1349 1702455844246930552 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd
-1150 1837 1702062977336494519 CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o edbb1aa44772a316
-37 1238 1702456519005277138 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09
-6 33 1702456619262289500 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
-2374 3096 1702455845997075354 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 502b39b3210366aa
-1257 2056 1702455844955251720 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec
-1768 2754 1702455845653411517 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4
-1416 2234 1702455845132156823 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e
-395 1224 1702455844119704463 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b
-394 1673 1702455844569355061 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3
-7 34 1702457773852713787 projects_ray_autogen/timestamp d580242d2b9854b3
-7 34 1702457773852713787 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-7 34 1702457773852713787 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
-7 34 1702457773852713787 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-7 34 1702458736456292571 projects_ray_autogen/timestamp d580242d2b9854b3
-7 34 1702458736456292571 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-7 34 1702458736456292571 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
-7 34 1702458736456292571 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-41 346 1702458736765477760 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o 834a2b4cd58f4bc0
-40 1194 1702458737610622648 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09
-1194 1305 1702458737725464756 projects_ray 86ae0811ba2c2c7e
+641 1562 1702455844459709662 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a
+2043 2512 1702455845412890139 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 624c5f86ab14c5d7
+395 778 1702455843677504099 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36
+1680 2550 1702455845448778562 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273
6 34 1702459569545220070 projects_ray_autogen/timestamp d580242d2b9854b3
-6 34 1702459569545220070 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-6 34 1702459569545220070 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
-6 34 1702459569545220070 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
-37 1225 1702459570730266885 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09
+2144 3044 1702455845943590700 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f
1225 1333 1702459570842365438 projects_ray 86ae0811ba2c2c7e
+389 1153 1702062976653549225 CMakeFiles/projects_ray.dir/src/4dvecops/vec4operations.cpp.o d05a5fd3c2f1f4c4
+6 34 1702459569545220070 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+1562 2374 1702455845272409626 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898
+36 740 1702456619964796396 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f
+1673 2487 1702455845385059746 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a
+1349 2143 1702455845042258829 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32
+6 34 1702459569545220070 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+40 927 1702445407116631389 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 41959d435611c983
+1 163 1702460880368507701 build.ninja 34bb77e754b05480
+778 1680 1702455844579253848 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a
+1129 1843 1702062977342546570 CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o ce6e3c7f960de866
+1 150 1702460880368507701 build.ninja 34bb77e754b05480
+6 378 1702460880753349000 projects_ray_autogen/timestamp d580242d2b9854b3
+6 378 1702460880753349000 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+6 378 1702460880753349000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
+6 378 1702460880753349000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+379 730 1702460881107785623 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36
+379 1120 1702460881494568456 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b
+379 1168 1702460881545284725 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c
+380 1177 1702460881553434612 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a
+378 1216 1702460881592286056 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd
+378 1283 1702460881659666314 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df
+730 1510 1702460881885695819 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a
+378 1521 1702460881896743297 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3
+1120 1885 1702460882261330090 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f
+1168 1890 1702460882267789115 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec
+1177 1895 1702460882272963410 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32
+1216 1933 1702460882311360847 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e
+1283 1966 1702460882343827351 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898
+1510 2202 1702460882580502453 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a
+1521 2217 1702460882595229326 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273
+7 35 1702461035711183332 projects_ray_autogen/timestamp d580242d2b9854b3
+7 35 1702461035711183332 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+7 35 1702461035711183332 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
+7 35 1702461035711183332 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+39 710 1702461036381251216 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 502b39b3210366aa
+39 793 1702461036464468281 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f
+39 802 1702461036472746129 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o a8cce28f179d7603
+39 802 1702461036473172511 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4
+38 1257 1702461036927692148 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09
+39 1319 1702461036989676398 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc
+5 31 1702461044784363293 projects_ray_autogen/timestamp d580242d2b9854b3
+5 31 1702461044784363293 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+5 31 1702461044784363293 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
+5 31 1702461044784363293 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+35 341 1702461045091432494 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o 834a2b4cd58f4bc0
+341 451 1702461045202472985 projects_ray 86ae0811ba2c2c7e
diff --git a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
index ad8a396..e122eb0 100644
--- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
+++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
@@ -1,21 +1,23 @@
# Generated by CMake. Changes will be overwritten.
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/physics/physics.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/physics/physics.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/main.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/texture/texture.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h
mmc:Q_OBJECT
- mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h
+ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/moc_predefs.h
mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h
mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h
@@ -468,6 +470,7 @@
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
+ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h
@@ -518,6 +521,7 @@
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h
@@ -538,6 +542,7 @@
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h
@@ -610,21 +615,50 @@
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h
+ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/rotations4d.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4operations.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h
/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
mmc:Q_OBJECT
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
@@ -1076,18 +1110,10 @@
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4operations.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/rotations4d.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h
mmc:Q_OBJECT
- mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h
+ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/moc_predefs.h
mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h
mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h
@@ -1540,7 +1566,6 @@
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h
- mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h
mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h
@@ -1591,7 +1616,6 @@
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h
@@ -1612,7 +1636,6 @@
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h
@@ -1685,54 +1708,31 @@
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h
- mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h
mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/texture/texture.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/main.cpp
-/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/physics/physics.h
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp
+/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/physics/physics.cpp
diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log
index 94a8504..a944323 100644
--- a/cmake-build-debug/Testing/Temporary/LastTest.log
+++ b/cmake-build-debug/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: Dec 13 04:30 EST
+Start testing: Dec 13 04:50 EST
----------------------------------------------------------
-End testing: Dec 13 04:30 EST
+End testing: Dec 13 04:50 EST
diff --git a/cmake-build-debug/projects_ray b/cmake-build-debug/projects_ray
index d00c5aa..a29336e 100755
--- a/cmake-build-debug/projects_ray
+++ b/cmake-build-debug/projects_ray
Binary files differ
diff --git a/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp b/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp
index 3d75784..facdd40 100644
--- a/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp
+++ b/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp
@@ -68,12 +68,11 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers:
"updateZwSlider",
"updateRotationSlider",
"onValChangeWSlider",
- "onValChangeWBox",
- "updateCameraPosition"
+ "onValChangeWBox"
);
#else // !QT_MOC_HAS_STRING_DATA
struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t {
- uint offsetsAndSizes[62];
+ uint offsetsAndSizes[60];
char stringdata0[11];
char stringdata1[13];
char stringdata2[1];
@@ -104,7 +103,6 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t {
char stringdata27[21];
char stringdata28[19];
char stringdata29[16];
- char stringdata30[21];
};
#define QT_MOC_LITERAL(ofs, len) \
uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len
@@ -139,8 +137,7 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st
QT_MOC_LITERAL(420, 14), // "updateZwSlider"
QT_MOC_LITERAL(435, 20), // "updateRotationSlider"
QT_MOC_LITERAL(456, 18), // "onValChangeWSlider"
- QT_MOC_LITERAL(475, 15), // "onValChangeWBox"
- QT_MOC_LITERAL(491, 20) // "updateCameraPosition"
+ QT_MOC_LITERAL(475, 15) // "onValChangeWBox"
},
"MainWindow",
"onUploadFile",
@@ -171,8 +168,7 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st
"updateZwSlider",
"updateRotationSlider",
"onValChangeWSlider",
- "onValChangeWBox",
- "updateCameraPosition"
+ "onValChangeWBox"
};
#undef QT_MOC_LITERAL
#endif // !QT_MOC_HAS_STRING_DATA
@@ -184,7 +180,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = {
11, // revision
0, // classname
0, 0, // classinfo
- 28, 14, // methods
+ 27, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
@@ -192,34 +188,33 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = {
0, // signalCount
// slots: name, argc, parameters, tag, flags, initial metatype offsets
- 1, 0, 182, 2, 0x08, 1 /* Private */,
- 3, 0, 183, 2, 0x08, 2 /* Private */,
- 4, 0, 184, 2, 0x08, 3 /* Private */,
- 5, 1, 185, 2, 0x08, 4 /* Private */,
- 7, 1, 188, 2, 0x08, 6 /* Private */,
- 8, 1, 191, 2, 0x08, 8 /* Private */,
- 9, 1, 194, 2, 0x08, 10 /* Private */,
- 10, 1, 197, 2, 0x08, 12 /* Private */,
- 11, 1, 200, 2, 0x08, 14 /* Private */,
- 12, 1, 203, 2, 0x08, 16 /* Private */,
- 13, 1, 206, 2, 0x08, 18 /* Private */,
- 14, 1, 209, 2, 0x08, 20 /* Private */,
- 15, 1, 212, 2, 0x08, 22 /* Private */,
- 16, 1, 215, 2, 0x08, 24 /* Private */,
- 17, 1, 218, 2, 0x08, 26 /* Private */,
- 18, 1, 221, 2, 0x08, 28 /* Private */,
- 19, 1, 224, 2, 0x08, 30 /* Private */,
- 20, 0, 227, 2, 0x08, 32 /* Private */,
- 21, 1, 228, 2, 0x08, 33 /* Private */,
- 22, 1, 231, 2, 0x08, 35 /* Private */,
- 23, 1, 234, 2, 0x08, 37 /* Private */,
- 24, 1, 237, 2, 0x08, 39 /* Private */,
- 25, 1, 240, 2, 0x08, 41 /* Private */,
- 26, 1, 243, 2, 0x08, 43 /* Private */,
- 27, 1, 246, 2, 0x08, 45 /* Private */,
- 28, 1, 249, 2, 0x08, 47 /* Private */,
- 29, 1, 252, 2, 0x08, 49 /* Private */,
- 30, 0, 255, 2, 0x08, 51 /* Private */,
+ 1, 0, 176, 2, 0x08, 1 /* Private */,
+ 3, 0, 177, 2, 0x08, 2 /* Private */,
+ 4, 0, 178, 2, 0x08, 3 /* Private */,
+ 5, 1, 179, 2, 0x08, 4 /* Private */,
+ 7, 1, 182, 2, 0x08, 6 /* Private */,
+ 8, 1, 185, 2, 0x08, 8 /* Private */,
+ 9, 1, 188, 2, 0x08, 10 /* Private */,
+ 10, 1, 191, 2, 0x08, 12 /* Private */,
+ 11, 1, 194, 2, 0x08, 14 /* Private */,
+ 12, 1, 197, 2, 0x08, 16 /* Private */,
+ 13, 1, 200, 2, 0x08, 18 /* Private */,
+ 14, 1, 203, 2, 0x08, 20 /* Private */,
+ 15, 1, 206, 2, 0x08, 22 /* Private */,
+ 16, 1, 209, 2, 0x08, 24 /* Private */,
+ 17, 1, 212, 2, 0x08, 26 /* Private */,
+ 18, 1, 215, 2, 0x08, 28 /* Private */,
+ 19, 1, 218, 2, 0x08, 30 /* Private */,
+ 20, 0, 221, 2, 0x08, 32 /* Private */,
+ 21, 1, 222, 2, 0x08, 33 /* Private */,
+ 22, 1, 225, 2, 0x08, 35 /* Private */,
+ 23, 1, 228, 2, 0x08, 37 /* Private */,
+ 24, 1, 231, 2, 0x08, 39 /* Private */,
+ 25, 1, 234, 2, 0x08, 41 /* Private */,
+ 26, 1, 237, 2, 0x08, 43 /* Private */,
+ 27, 1, 240, 2, 0x08, 45 /* Private */,
+ 28, 1, 243, 2, 0x08, 47 /* Private */,
+ 29, 1, 246, 2, 0x08, 49 /* Private */,
// slots: parameters
QMetaType::Void,
@@ -249,7 +244,6 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = {
QMetaType::Void, QMetaType::Float, 6,
QMetaType::Void, QMetaType::Int, 6,
QMetaType::Void, QMetaType::Double, 6,
- QMetaType::Void,
0 // eod
};
@@ -339,9 +333,7 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { {
QtPrivate::TypeAndForceComplete<int, std::false_type>,
// method 'onValChangeWBox'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
- QtPrivate::TypeAndForceComplete<double, std::false_type>,
- // method 'updateCameraPosition'
- QtPrivate::TypeAndForceComplete<void, std::false_type>
+ QtPrivate::TypeAndForceComplete<double, std::false_type>
>,
nullptr
} };
@@ -379,7 +371,6 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
case 24: _t->updateRotationSlider((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break;
case 25: _t->onValChangeWSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break;
case 26: _t->onValChangeWBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break;
- case 27: _t->updateCameraPosition(); break;
default: ;
}
}
@@ -404,13 +395,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
- if (_id < 28)
+ if (_id < 27)
qt_static_metacall(this, _c, _id, _a);
- _id -= 28;
+ _id -= 27;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
- if (_id < 28)
+ if (_id < 27)
*reinterpret_cast<QMetaType *>(_a[0]) = QMetaType();
- _id -= 28;
+ _id -= 27;
}
return _id;
}
diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
index 3cba57c..9c9a513 100644
--- a/src/physics/physics.cpp
+++ b/src/physics/physics.cpp
@@ -73,6 +73,5 @@ void Physics::updateShapePositions(std::vector<RenderShapeData> &shapes)
for (auto &shape : shapes)
{
shape.translation4d += shape.velocity;
- shape.inverseTranslation4d -= shape.velocity;
}
} \ No newline at end of file
diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp
index f9bef4f..558877a 100644
--- a/src/raytracer/raytracer.cpp
+++ b/src/raytracer/raytracer.cpp
@@ -91,7 +91,7 @@ glm::vec4 RayTracer::getPixelFromRay(
float minDist = FINF;
// shoot a ray at each shape
for (const RenderShapeData &shape : scene.getShapes()) {
- glm::vec4 pObject = Vec4Ops::inverseTransformPoint4(pWorld, shape.inverseCTM, shape.inverseTranslation4d);
+ glm::vec4 pObject = Vec4Ops::inverseTransformPoint4(pWorld, shape.inverseCTM, -shape.translation4d);
glm::vec4 dObject = glm::normalize(Vec4Ops::inverseTransformDir4(dWorld, shape.inverseCTM));
// std::cout << "pObject: " << pObject.x << ", " << pObject.y << ", " << pObject.z << ", " << pObject.w << std::endl;
// std::cout << "dObject: " << dObject.x << ", " << dObject.y << ", " << dObject.z << ", " << dObject.w << std::endl;
diff --git a/src/utils/sceneparser.cpp b/src/utils/sceneparser.cpp
index c601f0b..2cad55a 100644
--- a/src/utils/sceneparser.cpp
+++ b/src/utils/sceneparser.cpp
@@ -65,7 +65,7 @@ void initTree(SceneNode* currentNode, std::vector<RenderShapeData> *shapes, std:
}
}
- currentCTM *= glm::translate(glm::mat4(1.0f), glm::vec3(currentTranslation4d));
+ // currentCTM *= glm::translate(glm::mat4(1.0f), glm::vec3(currentTranslation4d));
for(auto primitive : currentNode->primitives) {
@@ -74,11 +74,9 @@ void initTree(SceneNode* currentNode, std::vector<RenderShapeData> *shapes, std:
.ctm = currentCTM,
.translation4d = currentTranslation4d,
.inverseCTM = glm::inverse(currentCTM),
- .inverseTranslation4d = -currentTranslation4d,
.velocity = primitive->velocity,
};
shapes->push_back(rsd);
- // }
}
// add the lights
diff --git a/src/utils/sceneparser.h b/src/utils/sceneparser.h
index 96803c9..65b0bc8 100644
--- a/src/utils/sceneparser.h
+++ b/src/utils/sceneparser.h
@@ -11,7 +11,6 @@ struct RenderShapeData {
glm::mat4 ctm; // the cumulative transformation matrix
glm::vec4 translation4d; // appended to the right of the ctm (for 4d translation)
glm::mat4 inverseCTM;
- glm::vec4 inverseTranslation4d; // appended to the right of the inverse ctm (for 4d translation)
glm::vec4 velocity;
};