From f887bd83942f13efe98d0c2cd997d037ed2ef068 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Wed, 13 Dec 2023 04:46:45 -0500 Subject: fixing changes --- .idea/QtSettings.xml | 2 +- CMakeLists.txt | 2 + .../reply/codemodel-v2-0cd8fea12d6b4dd04e04.json | 94 - .../reply/codemodel-v2-f3cb0b557301e59f7738.json | 94 + .../v1/reply/index-2023-12-13T05-49-38-0227.json | 108 - .../v1/reply/index-2023-12-13T08-43-44-0090.json | 108 + ...et-projects_ray-Debug-59e38b50932a7f88906c.json | 942 --------- ...et-projects_ray-Debug-6bb81f03ba2a679a3648.json | 956 +++++++++ cmake-build-debug/.ninja_deps | Bin 314960 -> 185620 bytes cmake-build-debug/.ninja_log | 153 +- cmake-build-debug/CMakeFiles/clion-Debug-log.txt | 2 +- .../projects_ray_autogen.dir/AutogenInfo.json | 11 + .../projects_ray_autogen.dir/ParseCache.txt | 12 +- cmake-build-debug/Testing/Temporary/LastTest.log | 4 +- cmake-build-debug/build.ninja | 12 +- cmake-build-debug/projects_ray | Bin 1756297 -> 1757881 bytes .../SKZFJBACJG/moc_raytracer.cpp | 64 +- .../UVLADIE3JM/moc_mainwindow.cpp | 272 +-- cmake-build-debug/projects_ray_autogen/deps | 2 + .../reply/cmakeFiles-v1-a16b0193dc8db858df05.json | 1619 +++++++++++++++ .../reply/cmakeFiles-v1-af80d878e91b46f14517.json | 2123 -------------------- .../reply/codemodel-v2-2d9caf1903ea79a14920.json | 94 - .../reply/codemodel-v2-7bbcc18c3f80baad1f49.json | 94 + .../v1/reply/index-2023-12-13T05-49-38-0799.json | 108 - .../v1/reply/index-2023-12-13T08-43-44-0090.json | 108 + ...-projects_ray-Release-d5a7b6c8d394e2a91e97.json | 946 --------- ...-projects_ray-Release-f07e7915bfe6c14064a6.json | 960 +++++++++ cmake-build-release/.ninja_deps | Bin 564116 -> 175420 bytes cmake-build-release/.ninja_log | 32 +- .../CMakeFiles/clion-Release-log.txt | 16 +- .../projects_ray_autogen.dir/AutogenInfo.json | 112 +- .../projects_ray_autogen.dir/ParseCache.txt | 124 +- cmake-build-release/Testing/Temporary/LastTest.log | 4 +- cmake-build-release/build.ninja | 67 +- cmake-build-release/projects_ray | Bin 353305 -> 353289 bytes scenefiles-4d/sphere_collision.json | 66 + src/physics/physics.cpp | 78 + src/physics/physics.h | 26 + src/raytracer/raytracer.cpp | 9 +- src/utils/sceneparser.cpp | 23 +- student_outputs/0.png | Bin 0 -> 6453 bytes student_outputs/1.png | Bin 0 -> 6453 bytes 42 files changed, 4490 insertions(+), 4957 deletions(-) delete mode 100644 cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-0cd8fea12d6b4dd04e04.json create mode 100644 cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-f3cb0b557301e59f7738.json delete mode 100644 cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T05-49-38-0227.json create mode 100644 cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T08-43-44-0090.json delete mode 100644 cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-59e38b50932a7f88906c.json create mode 100644 cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-6bb81f03ba2a679a3648.json create mode 100644 cmake-build-release/.cmake/api/v1/reply/cmakeFiles-v1-a16b0193dc8db858df05.json delete mode 100644 cmake-build-release/.cmake/api/v1/reply/cmakeFiles-v1-af80d878e91b46f14517.json delete mode 100644 cmake-build-release/.cmake/api/v1/reply/codemodel-v2-2d9caf1903ea79a14920.json create mode 100644 cmake-build-release/.cmake/api/v1/reply/codemodel-v2-7bbcc18c3f80baad1f49.json delete mode 100644 cmake-build-release/.cmake/api/v1/reply/index-2023-12-13T05-49-38-0799.json create mode 100644 cmake-build-release/.cmake/api/v1/reply/index-2023-12-13T08-43-44-0090.json delete mode 100644 cmake-build-release/.cmake/api/v1/reply/target-projects_ray-Release-d5a7b6c8d394e2a91e97.json create mode 100644 cmake-build-release/.cmake/api/v1/reply/target-projects_ray-Release-f07e7915bfe6c14064a6.json create mode 100644 scenefiles-4d/sphere_collision.json create mode 100644 src/physics/physics.cpp create mode 100644 src/physics/physics.h create mode 100644 student_outputs/0.png create mode 100644 student_outputs/1.png diff --git a/.idea/QtSettings.xml b/.idea/QtSettings.xml index dd42746..faa7b06 100644 --- a/.idea/QtSettings.xml +++ b/.idea/QtSettings.xml @@ -1,7 +1,7 @@ -