Merge branch 'main' of https://github.com/NicholasBottone/the-all-americans-in-cs1230

merge.

9 files changed, 68 insertions, 102 deletions

diff --git a/cmake-build-release/.ninja_deps b/cmake-build-release/.ninja_deps
index 952ef5a..d95e49d 100644
--- a/cmake-build-release/.ninja_deps
+++ b/cmake-build-release/.ninja_deps
diff --git a/cmake-build-release/.ninja_log b/cmake-build-release/.ninja_log
index e96dbd6..99c02bb 100644
--- a/cmake-build-release/.ninja_log
+++ b/cmake-build-release/.ninja_log
@@ -1,81 +1,38 @@
 # ninja log v5
-6	33	1702494657193358368	projects_ray_autogen/timestamp	55fca76aac650d2f
-2077	2851	1702462517058646265	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	cef03b69fda1011b
-438	1344	1702462515545535814	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	4a558d7c0ab76c07
-6	33	1702494657193358368	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-1344	2092	1702462516300411446	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	899987bee3f68062
-6	33	1702494657193358368	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-2218	2872	1702462517080832082	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	cad2614c6119bd5e
-38	804	1702463675446226154	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	1ad68196f2f117c1
-437	1601	1702462515805754359	CMakeFiles/projects_ray.dir/src/main.cpp.o	94fb23c1a8b2c56c
-1359	2077	1702462516285286127	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	ee619672f0183b37
-36	672	1702476793942504595	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	dc9fbf174942b6a6
-2092	2885	1702462517093496918	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	58a267a27bf597a8
-39	165	1702463674808123565	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	7e5d8f712f75efb4
-38	932	1702463675573687879	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	8a94e9f3bb65e6ba
-438	829	1702462515033688087	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	ae395a7ba55f31e0
-407	631	1702452577188925730	CMakeFiles/projects_ray.dir/src/settings.cpp.o	af593dd8c38f8a51
-439	1359	1702462515565289355	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	e6ffba0ae97d5386
-1992	2343	1702462516552200253	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	d7fc6a03a78a11b2
-38	1259	1702494275468562720	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	19b4d88ef40a6db1
-37	705	1702476734667828050	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	d2b1593379e5dcda
-39	763	1702463675404819921	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	36fb1526130d4f10
-6	33	1702494657193358368	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-398	502	1702494657660374115	projects_ray	3c6678764a94cd8d
-1602	2264	1702462516471699727	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	2155c0e78af65352
-1501	2218	1702462516425466564	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	1275de63f43c05f3
-675	2432	1702446595224556920	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	5dbf3687fca6fb
-36	398	1702494657554914881	CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o	d5828f7344b43f3f
-1615	2318	1702462516525793547	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	856523a4b6d122f7
-1827	2585	1702462516791291975	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	9dee6d99978c214
-1339	2073	1702462516281240152	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	976dc05943374640
-2073	3450	1702462517657027523	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	202e3ecc659447bc
-6	33	1702494755780900179	projects_ray_autogen/timestamp	55fca76aac650d2f
-6	33	1702494755780900179	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-6	33	1702494755780900179	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-6	33	1702494755780900179	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-36	403	1702494756147888488	CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o	d5828f7344b43f3f
-403	509	1702494756255186655	projects_ray	3c6678764a94cd8d
-7	35	1702494833428081459	projects_ray_autogen/timestamp	55fca76aac650d2f
-7	35	1702494833428081459	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-7	35	1702494833428081459	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-7	35	1702494833428081459	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-6	32	1702494849284648714	projects_ray_autogen/timestamp	55fca76aac650d2f
-6	32	1702494849284648714	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-6	32	1702494849284648714	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-6	32	1702494849284648714	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-35	407	1702494849657201819	CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o	d5828f7344b43f3f
-407	512	1702494849763669789	projects_ray	3c6678764a94cd8d
-7	35	1702494961651104096	projects_ray_autogen/timestamp	55fca76aac650d2f
-7	35	1702494961651104096	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-7	35	1702494961651104096	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-7	35	1702494961651104096	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-39	435	1702494962047836436	CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o	d5828f7344b43f3f
-38	1212	1702494962823847784	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	19b4d88ef40a6db1
-1212	1321	1702494962935100852	projects_ray	3c6678764a94cd8d
-7	37	1702495000430555599	projects_ray_autogen/timestamp	55fca76aac650d2f
-7	37	1702495000430555599	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-7	37	1702495000430555599	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-7	37	1702495000430555599	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-40	465	1702495000855327912	CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o	d5828f7344b43f3f
-465	577	1702495000968930071	projects_ray	3c6678764a94cd8d
-6	34	1702495498362101972	projects_ray_autogen/timestamp	55fca76aac650d2f
-6	34	1702495498362101972	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-6	34	1702495498362101972	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-6	34	1702495498362101972	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-38	422	1702495498747152397	CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o	d5828f7344b43f3f
-38	1236	1702495499559229977	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	19b4d88ef40a6db1
-1236	1356	1702495499682771576	projects_ray	3c6678764a94cd8d
-7	35	1702495941274671322	projects_ray_autogen/timestamp	55fca76aac650d2f
-7	35	1702495941274671322	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-7	35	1702495941274671322	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-7	35	1702495941274671322	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
+1666	3046	1702497097295909804	CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o	202e3ecc659447bc
+1140	1837	1702497096085146678	CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o	976dc05943374640
+1523	2282	1702497096531611886	CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o	9dee6d99978c214
+1451	2131	1702497096380486233	CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o	856523a4b6d122f7
 38	401	1702495941638045833	CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o	d5828f7344b43f3f
-37	1162	1702495942397678180	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	19b4d88ef40a6db1
-1162	1268	1702495942506905697	projects_ray	3c6678764a94cd8d
-6	35	1702496243232609101	projects_ray_autogen/timestamp	55fca76aac650d2f
-6	35	1702496243232609101	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-6	35	1702496243232609101	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
-6	35	1702496243232609101	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
-38	641	1702496243835910355	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	899987bee3f68062
-641	746	1702496243942338030	projects_ray	3c6678764a94cd8d
+675	2432	1702446595224556920	CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o	5dbf3687fca6fb
+1248	1928	1702497096178394382	CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o	1275de63f43c05f3
+1325	1985	1702497096235343592	CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o	2155c0e78af65352
+3047	3151	1702497097402820224	projects_ray	3c6678764a94cd8d
+6	402	1702497094648997000	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
+760	1523	1702497095772646199	CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o	36fb1526130d4f10
+403	1145	1702497095394701107	CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o	d2b1593379e5dcda
+403	1666	1702497095914109507	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	19b4d88ef40a6db1
+1992	2343	1702462516552200253	CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o	d7fc6a03a78a11b2
+439	1359	1702462515565289355	CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o	e6ffba0ae97d5386
+407	631	1702452577188925730	CMakeFiles/projects_ray.dir/src/settings.cpp.o	af593dd8c38f8a51
+402	760	1702497095009522684	CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o	ae395a7ba55f31e0
+1837	2618	1702497096868816203	CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o	58a267a27bf597a8
+402	1325	1702497095574081723	CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o	8a94e9f3bb65e6ba
+39	165	1702463674808123565	CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o	7e5d8f712f75efb4
+403	1139	1702497095385981417	CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o	dc9fbf174942b6a6
+1202	1891	1702497096140561406	CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o	ee619672f0183b37
+402	1451	1702497095699157098	CMakeFiles/projects_ray.dir/src/main.cpp.o	94fb23c1a8b2c56c
+402	1202	1702497095450609413	CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o	1ad68196f2f117c1
+1891	2548	1702497096798003571	CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o	cad2614c6119bd5e
+6	402	1702497094648997000	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
+1145	1837	1702497096085693338	CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o	899987bee3f68062
+6	402	1702497094648997000	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
+403	1248	1702497095497895611	CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o	4a558d7c0ab76c07
+1837	2603	1702497096853321259	CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o	cef03b69fda1011b
+6	402	1702497094648997000	projects_ray_autogen/timestamp	55fca76aac650d2f
+6	35	1702497126689510841	projects_ray_autogen/timestamp	55fca76aac650d2f
+6	35	1702497126689510841	projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
+6	35	1702497126689510841	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp	55fca76aac650d2f
+6	35	1702497126689510841	/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp	55fca76aac650d2f
+38	1246	1702497127896359680	CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o	19b4d88ef40a6db1
+1247	1353	1702497128006536270	projects_ray	3c6678764a94cd8d
diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log
index 01f6a24..c17d7a1 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 14:40 EST
+Start testing: Dec 13 14:52 EST
 ----------------------------------------------------------
-End testing: Dec 13 14:40 EST
+End testing: Dec 13 14:52 EST
diff --git a/cmake-build-release/projects_ray b/cmake-build-release/projects_ray
index 9d000d8..9c0da34 100755
--- a/cmake-build-release/projects_ray
+++ b/cmake-build-release/projects_ray
diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp
index 704be7e..fb63d77 100644
--- a/src/camera/camera.cpp
+++ b/src/camera/camera.cpp
@@ -5,28 +5,32 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>  // Include this header for glm::rotate
 
+void Camera::updateViewMatrix(SceneCameraData cameraData) {
+    m_viewMatrix = Vec4Ops::getViewMatrix4(cameraData.look, cameraData.up, cameraData.over);
+    //  add settings.xy rotation
+    m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xy), glm::vec3(0.f, 1.f, 0.f));
+    m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.yz), glm::vec3(1.f, 0.f, 0.f));
+    m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xz), glm::vec3(0.f, 0.f, 1.f));
+
+    m_translationVector = -cameraData.pos;
+
+    m_inverseViewMatrix = glm::inverse(m_viewMatrix);
+    m_inverseTranslationVector = -m_translationVector;
+    m_controlPoints = {
+            {cameraData.pos[0], cameraData.pos[1], cameraData.pos[2]},
+            {cameraData.pos[0], cameraData.pos[1] - 2.f, cameraData.pos[2] - 2.f},
+            {cameraData.pos[0] + 2.f, cameraData.pos[1] + 2.f, cameraData.pos[2] -2.f},
+            {cameraData.pos[0] + 2.f, cameraData.pos[1], cameraData.pos[2]}
+    };
+}
+
 Camera::Camera(SceneCameraData cameraData) :
     m_pos(cameraData.pos),
     m_heightAngle(cameraData.heightAngle),
     m_focalLength(cameraData.focalLength),
     m_aperture(cameraData.aperture)
 {
-     m_viewMatrix = Vec4Ops::getViewMatrix4(cameraData.look, cameraData.up, cameraData.over);
-    //  add settings.xy rotation
-     m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xy), glm::vec3(0.f, 1.f, 0.f));
-     m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.yz), glm::vec3(1.f, 0.f, 0.f));
-     m_viewMatrix = glm::rotate(m_viewMatrix, glm::radians(settings.xz), glm::vec3(0.f, 0.f, 1.f));
-
-     m_translationVector = -cameraData.pos;
-
-     m_inverseViewMatrix = glm::inverse(m_viewMatrix);
-     m_inverseTranslationVector = -m_translationVector;
-     m_controlPoints = {
-        {cameraData.pos[0], cameraData.pos[1], cameraData.pos[2]},
-        {cameraData.pos[0], cameraData.pos[1] - 2.f, cameraData.pos[2] - 2.f},
-        {cameraData.pos[0] + 2.f, cameraData.pos[1] + 2.f, cameraData.pos[2] -2.f},
-        {cameraData.pos[0] + 2.f, cameraData.pos[1], cameraData.pos[2]}
-     };
+    updateViewMatrix(cameraData);
 }
 
 glm::mat4 Camera::getViewMatrix() const {
diff --git a/src/camera/camera.h b/src/camera/camera.h
index 08750fb..37314c5 100644
--- a/src/camera/camera.h
+++ b/src/camera/camera.h
@@ -40,6 +40,8 @@ public:
     float cameraDepth = -1.f;
     std::vector<glm::vec3> m_controlPoints;
 
+    void updateViewMatrix(SceneCameraData cameraData);
+
 private:
     glm::mat4 m_viewMatrix{};
     glm::mat4 m_inverseViewMatrix{};
@@ -51,5 +53,6 @@ private:
 
     glm::vec4 m_translationVector{};
     glm::vec4 m_inverseTranslationVector{};
+
 };
 
diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp
index 71a1c7f..b5e8986 100644
--- a/src/raytracer/raytracer.cpp
+++ b/src/raytracer/raytracer.cpp
@@ -54,9 +54,10 @@ void RayTracer::render(RGBA *imageData, const RayTraceScene &scene) {
             settings.currentTime++;
 //            settings.w++;
 
-            // update physics
+            // update physics for moving objects
             Physics::updateShapePositions(m_metaData.shapes);
             Physics::handleCollisions(m_metaData.shapes);
+
         } else { // done rendering
             // assemble the video
             saveFFMPEGVideo(settings.bulkOutputFolderPath);
@@ -173,7 +174,8 @@ void RayTracer::sceneChanged(QLabel* imageLabel) {
     m_imageData = reinterpret_cast<RGBA *>(image.bits());
 
     RayTraceScene rtScene{ m_width, m_height, m_metaData, m_depth };
-
+    // update the camera position
+    rtScene.m_camera.updateViewMatrix(m_metaData.cameraData);
     this->render(m_imageData, rtScene);
 
     QImage flippedImage = image.mirrored(false, false);
diff --git a/src/raytracer/raytracescene.cpp b/src/raytracer/raytracescene.cpp
index 77541e3..a81d535 100644
--- a/src/raytracer/raytracescene.cpp
+++ b/src/raytracer/raytracescene.cpp
@@ -57,7 +57,7 @@ const std::vector<SceneLightData> RayTraceScene::getLights() const {
     return m_lights;
 }
 
-const Camera& RayTraceScene::getCamera() const {
+const Camera RayTraceScene::getCamera() const {
     // Optional TODO: implement the getter or make your own design
     return m_camera;
 }
diff --git a/src/raytracer/raytracescene.h b/src/raytracer/raytracescene.h
index 35e4fb4..b608918 100644
--- a/src/raytracer/raytracescene.h
+++ b/src/raytracer/raytracescene.h
@@ -28,18 +28,18 @@ public:
     const std::vector<SceneLightData> getLights() const;
 
     // The getter of the shared pointer to the camera instance of the scene
-    const Camera& getCamera() const;
+    const Camera getCamera() const;
 
     KdTree *m_kdTree;
     bvh *m_bvh;
 
     const int &depth() const;
 
+    Camera& m_camera;
 private:
     int m_width;
     int m_height;
     SceneGlobalData m_sceneGlobalData;
-    Camera& m_camera;
     std::vector<RenderShapeData>m_shapes;
     std::vector<SceneLightData>m_lights;
     int m_depth;