aboutsummaryrefslogtreecommitdiff
path: root/cmake-build-debug
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2023-12-13 13:47:44 -0500
committersotech117 <michael_foiani@brown.edu>2023-12-13 13:47:44 -0500
commit33a1cdc3532d145944b00a4ca03fd01d4d5b9532 (patch)
tree833760d85ed92c39c1f9ffbd591dde4cf619689e /cmake-build-debug
parent4fb06778c1a19914c759ab5db495754b1fd9e2c3 (diff)
get the collision detections for cubes and sphers to work using specific cases of separate axis theorem. however, the velocities are no longer flipping.
Diffstat (limited to 'cmake-build-debug')
-rw-r--r--cmake-build-debug/.ninja_depsbin374244 -> 388940 bytes
-rw-r--r--cmake-build-debug/.ninja_log15
-rw-r--r--cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt14
-rw-r--r--cmake-build-debug/Testing/Temporary/LastTest.log4
-rwxr-xr-xcmake-build-debug/projects_raybin1791273 -> 1791977 bytes
-rw-r--r--cmake-build-debug/t/0051.pngbin10240 -> 10898 bytes
-rw-r--r--cmake-build-debug/t/0052.pngbin7111 -> 11034 bytes
-rw-r--r--cmake-build-debug/t/0053.pngbin5001 -> 10240 bytes
-rw-r--r--cmake-build-debug/t/0054.pngbin5001 -> 8874 bytes
-rw-r--r--cmake-build-debug/t/0055.pngbin5001 -> 7887 bytes
-rw-r--r--cmake-build-debug/t/0056.pngbin5001 -> 7111 bytes
-rw-r--r--cmake-build-debug/t/0057.pngbin5001 -> 5952 bytes
12 files changed, 24 insertions, 9 deletions
diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps
index 1ca2b40..f6a7fec 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 685dc50..429cb1e 100644
--- a/cmake-build-debug/.ninja_log
+++ b/cmake-build-debug/.ninja_log
@@ -74,3 +74,18 @@
6 33 1702464988627122049 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
36 385 1702464988976504214 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o 834a2b4cd58f4bc0
385 500 1702464989092420764 projects_ray 86ae0811ba2c2c7e
+9 38 1702479083966379711 projects_ray_autogen/timestamp d580242d2b9854b3
+9 38 1702479083966379711 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+9 38 1702479083966379711 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
+9 38 1702479083966379711 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+42 425 1702479084350114782 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o 834a2b4cd58f4bc0
+42 807 1702479084729594037 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b
+42 816 1702479084739396620 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a
+42 1291 1702479085212892849 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09
+1291 1406 1702479085332510630 projects_ray 86ae0811ba2c2c7e
+6 34 1702479173168446542 projects_ray_autogen/timestamp d580242d2b9854b3
+6 34 1702479173168446542 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+6 34 1702479173168446542 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3
+6 34 1702479173168446542 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3
+37 371 1702479173503387529 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o 834a2b4cd58f4bc0
+371 480 1702479173612853561 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 26628ad..2feb068 100644
--- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
+++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt
@@ -4,10 +4,10 @@
/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/physics/physics.h
/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/illuminate/shadow.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/accelerate/myqtconcurrent.cpp
/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/camera/camera.h
/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h
@@ -1722,15 +1722,15 @@
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/vec4ops/transform4d.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/mainwindow.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/raytracer/raytracescene.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.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
diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log
index 59ca1bc..d4b869d 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 05:56 EST
+Start testing: Dec 13 09:52 EST
----------------------------------------------------------
-End testing: Dec 13 05:56 EST
+End testing: Dec 13 09:52 EST
diff --git a/cmake-build-debug/projects_ray b/cmake-build-debug/projects_ray
index 5656d31..39520b6 100755
--- a/cmake-build-debug/projects_ray
+++ b/cmake-build-debug/projects_ray
Binary files differ
diff --git a/cmake-build-debug/t/0051.png b/cmake-build-debug/t/0051.png
index 82c2295..d5bf016 100644
--- a/cmake-build-debug/t/0051.png
+++ b/cmake-build-debug/t/0051.png
Binary files differ
diff --git a/cmake-build-debug/t/0052.png b/cmake-build-debug/t/0052.png
index 287a7bd..9d075d9 100644
--- a/cmake-build-debug/t/0052.png
+++ b/cmake-build-debug/t/0052.png
Binary files differ
diff --git a/cmake-build-debug/t/0053.png b/cmake-build-debug/t/0053.png
index 6c4130c..82c2295 100644
--- a/cmake-build-debug/t/0053.png
+++ b/cmake-build-debug/t/0053.png
Binary files differ
diff --git a/cmake-build-debug/t/0054.png b/cmake-build-debug/t/0054.png
index 6c4130c..76f0f23 100644
--- a/cmake-build-debug/t/0054.png
+++ b/cmake-build-debug/t/0054.png
Binary files differ
diff --git a/cmake-build-debug/t/0055.png b/cmake-build-debug/t/0055.png
index 6c4130c..aa1e20e 100644
--- a/cmake-build-debug/t/0055.png
+++ b/cmake-build-debug/t/0055.png
Binary files differ
diff --git a/cmake-build-debug/t/0056.png b/cmake-build-debug/t/0056.png
index 6c4130c..287a7bd 100644
--- a/cmake-build-debug/t/0056.png
+++ b/cmake-build-debug/t/0056.png
Binary files differ
diff --git a/cmake-build-debug/t/0057.png b/cmake-build-debug/t/0057.png
index 6c4130c..8f42fec 100644
--- a/cmake-build-debug/t/0057.png
+++ b/cmake-build-debug/t/0057.png
Binary files differ