diff options
35 files changed, 332 insertions, 352 deletions
| Binary files differ diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T09-48-00-0376.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T09-53-51-0856.json index 1cf4f02..1cf4f02 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T09-48-00-0376.json +++ b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-13T09-53-51-0856.json diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps Binary files differindex 6c6014a..031dd47 100644 --- a/cmake-build-debug/.ninja_deps +++ b/cmake-build-debug/.ninja_deps diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 963f968..dc524c3 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -1,72 +1,42 @@ # ninja log v5 -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 +2140 2488 1702461234346954104 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o 834a2b4cd58f4bc0 +1650 2484 1702461234339871819 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273 +400 1261 1702461233115482244 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b +1299 2125 1702461233980239567 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e +1793 2595 1702461234452164205 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4 +1274 2083 1702461233938106442 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec +2133 2828 1702461234685065994 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 502b39b3210366aa +7 34 1702463023882809263 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 +398 1650 1702461233506493482 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3 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 +37 1177 1702463025020326699 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 +398 1299 1702461233154558734 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd +400 1274 1702461233131863686 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c +2083 3372 1702461235228370790 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc +2125 2912 1702461234769354994 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o a8cce28f179d7603 +399 1454 1702461233308570364 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df +37 152 1702463023999450059 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o efaf5a8825d854f8 395 640 1702455843541542312 CMakeFiles/projects_ray.dir/src/settings.cpp.o 7c89207347735849 -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 -2144 3044 1702455845943590700 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f -1225 1333 1702459570842365438 projects_ray 86ae0811ba2c2c7e +400 1287 1702461233144107850 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a +35 357 1702461342953591323 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 624c5f86ab14c5d7 +379 730 1702460881107785623 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36 +7 34 1702463023882809263 projects_ray_autogen/timestamp d580242d2b9854b3 +2124 2912 1702461234768371311 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f +1177 1291 1702463025138632151 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 +7 34 1702463023882809263 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +1367 2133 1702461233989136508 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898 +38 779 1702462795305796358 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f +1454 2223 1702461234080170871 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a +7 34 1702463023882809263 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +1287 2140 1702461233997370480 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32 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 +400 1366 1702461233220861182 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a +1 157 1702461231847780692 build.ninja 34bb77e754b05480 +40 927 1702445407116631389 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 41959d435611c983 +6 34 1702463101546966682 projects_ray_autogen/timestamp d580242d2b9854b3 +6 34 1702463101546966682 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +6 34 1702463101546966682 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 +6 34 1702463101546966682 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +37 1196 1702463102702277587 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 +1196 1307 1702463102818847175 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 e122eb0..af2bc6e 100644 --- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -4,15 +4,15 @@ /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/utils/scenefilereader.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/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/illuminate/reflect.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/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 @@ -1727,10 +1727,10 @@ /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/accelerate/myqtconcurrent.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/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/illuminate/shadow.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 diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index a944323..c063c1b 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:50 EST +Start testing: Dec 13 05:25 EST ---------------------------------------------------------- -End testing: Dec 13 04:50 EST +End testing: Dec 13 05:25 EST diff --git a/cmake-build-debug/build.ninja b/cmake-build-debug/build.ninja index 2f49b46..2afd916 100644 --- a/cmake-build-debug/build.ninja +++ b/cmake-build-debug/build.ninja @@ -366,7 +366,7 @@ build projects_ray_autogen/timestamp projects_ray_autogen/mocs_compilation.cpp | ############################################# # Phony custom command for CMakeFiles/projects_ray_autogen_timestamp_deps -build CMakeFiles/projects_ray_autogen_timestamp_deps | ${cmake_ninja_workdir}CMakeFiles/projects_ray_autogen_timestamp_deps: phony /Users/sotech117/Qt/6.5.2/macos/./libexec/uic /Users/sotech117/Qt/6.5.2/macos/./libexec/moc +build CMakeFiles/projects_ray_autogen_timestamp_deps | ${cmake_ninja_workdir}CMakeFiles/projects_ray_autogen_timestamp_deps: phony /Users/sotech117/Qt/6.5.2/macos/./libexec/moc /Users/sotech117/Qt/6.5.2/macos/./libexec/uic ############################################# diff --git a/cmake-build-debug/projects_ray b/cmake-build-debug/projects_ray Binary files differindex a29336e..5f8480b 100755 --- a/cmake-build-debug/projects_ray +++ b/cmake-build-debug/projects_ray diff --git a/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp b/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp index e0375a1..2b1fe61 100644 --- a/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp +++ b/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp @@ -50,11 +50,12 @@ static constexpr auto qt_meta_stringdata_CLASSRayTracerENDCLASS = QtMocHelpers:: "zwRotationChanged", "rotationChanged", "cameraPositionChanged", - "glm::vec3" + "glm::vec3", + "timeValueChanged" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { - uint offsetsAndSizes[24]; + uint offsetsAndSizes[26]; char stringdata0[10]; char stringdata1[18]; char stringdata2[1]; @@ -67,6 +68,7 @@ struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { char stringdata9[16]; char stringdata10[22]; char stringdata11[10]; + char stringdata12[17]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSRayTracerENDCLASS_t::offsetsAndSizes) + ofs), len @@ -83,7 +85,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str QT_MOC_LITERAL(107, 17), // "zwRotationChanged" QT_MOC_LITERAL(125, 15), // "rotationChanged" QT_MOC_LITERAL(141, 21), // "cameraPositionChanged" - QT_MOC_LITERAL(163, 9) // "glm::vec3" + QT_MOC_LITERAL(163, 9), // "glm::vec3" + QT_MOC_LITERAL(173, 16) // "timeValueChanged" }, "RayTracer", "xyRotationChanged", @@ -96,7 +99,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str "zwRotationChanged", "rotationChanged", "cameraPositionChanged", - "glm::vec3" + "glm::vec3", + "timeValueChanged" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -108,22 +112,23 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSRayTracerENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 8, 14, // methods + 9, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 8, // signalCount + 9, // signalCount // signals: name, argc, parameters, tag, flags, initial metatype offsets - 1, 1, 62, 2, 0x06, 1 /* Public */, - 4, 1, 65, 2, 0x06, 3 /* Public */, - 5, 1, 68, 2, 0x06, 5 /* Public */, - 6, 1, 71, 2, 0x06, 7 /* Public */, - 7, 1, 74, 2, 0x06, 9 /* Public */, - 8, 1, 77, 2, 0x06, 11 /* Public */, - 9, 1, 80, 2, 0x06, 13 /* Public */, - 10, 1, 83, 2, 0x06, 15 /* Public */, + 1, 1, 68, 2, 0x06, 1 /* Public */, + 4, 1, 71, 2, 0x06, 3 /* Public */, + 5, 1, 74, 2, 0x06, 5 /* Public */, + 6, 1, 77, 2, 0x06, 7 /* Public */, + 7, 1, 80, 2, 0x06, 9 /* Public */, + 8, 1, 83, 2, 0x06, 11 /* Public */, + 9, 1, 86, 2, 0x06, 13 /* Public */, + 10, 1, 89, 2, 0x06, 15 /* Public */, + 12, 1, 92, 2, 0x06, 17 /* Public */, // signals: parameters QMetaType::Void, QMetaType::Float, 3, @@ -134,6 +139,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSRayTracerENDCLASS[] = { QMetaType::Void, QMetaType::Float, 3, QMetaType::Void, QMetaType::Float, 3, QMetaType::Void, 0x80000000 | 11, 3, + QMetaType::Void, QMetaType::Int, 3, 0 // eod }; @@ -170,7 +176,10 @@ Q_CONSTINIT const QMetaObject RayTracer::staticMetaObject = { { QtPrivate::TypeAndForceComplete<float, std::false_type>, // method 'cameraPositionChanged' QtPrivate::TypeAndForceComplete<void, std::false_type>, - QtPrivate::TypeAndForceComplete<glm::vec3, std::false_type> + QtPrivate::TypeAndForceComplete<glm::vec3, std::false_type>, + // method 'timeValueChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type> >, nullptr } }; @@ -189,6 +198,7 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v case 5: _t->zwRotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; case 6: _t->rotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; case 7: _t->cameraPositionChanged((*reinterpret_cast< std::add_pointer_t<glm::vec3>>(_a[1]))); break; + case 8: _t->timeValueChanged((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -249,6 +259,13 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v return; } } + { + using _t = void (RayTracer::*)(int ); + if (_t _q_method = &RayTracer::timeValueChanged; *reinterpret_cast<_t *>(_a[1]) == _q_method) { + *result = 8; + return; + } + } } } @@ -271,13 +288,13 @@ int RayTracer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 8) + if (_id < 9) qt_static_metacall(this, _c, _id, _a); - _id -= 8; + _id -= 9; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 8) + if (_id < 9) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 8; + _id -= 9; } return _id; } @@ -337,4 +354,11 @@ void RayTracer::cameraPositionChanged(glm::vec3 _t1) void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 7, _a); } + +// SIGNAL 8 +void RayTracer::timeValueChanged(int _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 8, _a); +} QT_WARNING_POP 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 facdd40..584c51b 100644 --- a/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp +++ b/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp @@ -68,11 +68,12 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "updateZwSlider", "updateRotationSlider", "onValChangeWSlider", - "onValChangeWBox" + "onValChangeWBox", + "updateTimeValue" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { - uint offsetsAndSizes[60]; + uint offsetsAndSizes[62]; char stringdata0[11]; char stringdata1[13]; char stringdata2[1]; @@ -103,6 +104,7 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { char stringdata27[21]; char stringdata28[19]; char stringdata29[16]; + char stringdata30[16]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len @@ -137,7 +139,8 @@ 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(475, 15), // "onValChangeWBox" + QT_MOC_LITERAL(491, 15) // "updateTimeValue" }, "MainWindow", "onUploadFile", @@ -168,7 +171,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st "updateZwSlider", "updateRotationSlider", "onValChangeWSlider", - "onValChangeWBox" + "onValChangeWBox", + "updateTimeValue" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -180,7 +184,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 27, 14, // methods + 28, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -188,33 +192,34 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 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 */, + 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 */, // slots: parameters QMetaType::Void, @@ -244,6 +249,7 @@ 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 }; @@ -333,7 +339,9 @@ 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> + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'updateTimeValue' + QtPrivate::TypeAndForceComplete<void, std::false_type> >, nullptr } }; @@ -371,6 +379,7 @@ 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->updateTimeValue(); break; default: ; } } @@ -395,13 +404,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 27) + if (_id < 28) qt_static_metacall(this, _c, _id, _a); - _id -= 27; + _id -= 28; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 27) + if (_id < 28) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 27; + _id -= 28; } return _id; } diff --git a/cmake-build-debug/t/0000.png b/cmake-build-debug/t/0000.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0000.png diff --git a/cmake-build-debug/t/0001.png b/cmake-build-debug/t/0001.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0001.png diff --git a/cmake-build-debug/t/0002.png b/cmake-build-debug/t/0002.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0002.png diff --git a/cmake-build-debug/t/0003.png b/cmake-build-debug/t/0003.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0003.png diff --git a/cmake-build-debug/t/0004.png b/cmake-build-debug/t/0004.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0004.png diff --git a/cmake-build-debug/t/0005.png b/cmake-build-debug/t/0005.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0005.png diff --git a/cmake-build-debug/t/0006.png b/cmake-build-debug/t/0006.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0006.png diff --git a/cmake-build-debug/t/0007.png b/cmake-build-debug/t/0007.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0007.png diff --git a/cmake-build-debug/t/0008.png b/cmake-build-debug/t/0008.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0008.png diff --git a/cmake-build-debug/t/0009.png b/cmake-build-debug/t/0009.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0009.png diff --git a/cmake-build-debug/t/0010.png b/cmake-build-debug/t/0010.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0010.png diff --git a/cmake-build-debug/t/0011.png b/cmake-build-debug/t/0011.png Binary files differnew file mode 100644 index 0000000..86d6e6c --- /dev/null +++ b/cmake-build-debug/t/0011.png diff --git a/cmake-build-debug/t/video.mp4 b/cmake-build-debug/t/video.mp4 Binary files differnew file mode 100644 index 0000000..8cde98d --- /dev/null +++ b/cmake-build-debug/t/video.mp4 diff --git a/cmake-build-release/.ninja_deps b/cmake-build-release/.ninja_deps Binary files differindex 8528a57..4707b4e 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 c813835..6ee0e2c 100644 --- a/cmake-build-release/.ninja_log +++ b/cmake-build-release/.ninja_log @@ -29,3 +29,37 @@ 1693 2445 1702452579001092270 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 1224 1917 1702452578473192908 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 37 1350 1702453553072409034 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +11 437 1702462514637006000 projects_ray_autogen/timestamp 55fca76aac650d2f +11 437 1702462514637006000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +11 437 1702462514637006000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +11 437 1702462514637006000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +438 829 1702462515033688087 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0 +438 1210 1702462515415388730 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6 +437 1339 1702462515543405911 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1 +438 1344 1702462515545535814 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 +439 1359 1702462515565289355 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386 +437 1501 1702462515708177441 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba +437 1601 1702462515805754359 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c +830 1615 1702462515822103088 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda +438 1827 1702462516031648706 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 +1210 1992 1702462516198957720 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +1339 2073 1702462516281240152 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 +1359 2077 1702462516285286127 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 +1344 2092 1702462516300411446 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062 +1501 2218 1702462516425466564 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 +1602 2264 1702462516471699727 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 +1615 2318 1702462516525793547 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 +1992 2343 1702462516552200253 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2 +1827 2585 1702462516791291975 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 +2264 2588 1702462516797352603 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o d5828f7344b43f3f +2077 2851 1702462517058646265 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b +2218 2872 1702462517080832082 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e +2092 2885 1702462517093496918 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8 +2073 3450 1702462517657027523 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +3450 3554 1702462517764497503 projects_ray 3c6678764a94cd8d +6 34 1702462715705850065 projects_ray_autogen/timestamp 55fca76aac650d2f +6 34 1702462715705850065 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 34 1702462715705850065 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +6 34 1702462715705850065 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +37 697 1702462716365530139 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +697 800 1702462716470331928 projects_ray 3c6678764a94cd8d diff --git a/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index 0e68cf3..4a4c9a2 100644 --- a/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1713,8 +1713,8 @@ 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/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/intersect/intersect.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/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/mainwindow.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.h @@ -1725,8 +1725,10 @@ /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/texture/texture.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/vec4ops/rotations4d.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/utils/scenefilereader.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/physics/physics.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/physics/physics.cpp diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log index eb05971..33edd7d 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 03:35 EST +Start testing: Dec 13 05:19 EST ---------------------------------------------------------- -End testing: Dec 13 03:35 EST +End testing: Dec 13 05:19 EST diff --git a/cmake-build-release/projects_ray b/cmake-build-release/projects_ray Binary files differindex 08c529b..afc2578 100755 --- a/cmake-build-release/projects_ray +++ b/cmake-build-release/projects_ray diff --git a/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp b/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp index e0375a1..2b1fe61 100644 --- a/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp +++ b/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp @@ -50,11 +50,12 @@ static constexpr auto qt_meta_stringdata_CLASSRayTracerENDCLASS = QtMocHelpers:: "zwRotationChanged", "rotationChanged", "cameraPositionChanged", - "glm::vec3" + "glm::vec3", + "timeValueChanged" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { - uint offsetsAndSizes[24]; + uint offsetsAndSizes[26]; char stringdata0[10]; char stringdata1[18]; char stringdata2[1]; @@ -67,6 +68,7 @@ struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { char stringdata9[16]; char stringdata10[22]; char stringdata11[10]; + char stringdata12[17]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSRayTracerENDCLASS_t::offsetsAndSizes) + ofs), len @@ -83,7 +85,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str QT_MOC_LITERAL(107, 17), // "zwRotationChanged" QT_MOC_LITERAL(125, 15), // "rotationChanged" QT_MOC_LITERAL(141, 21), // "cameraPositionChanged" - QT_MOC_LITERAL(163, 9) // "glm::vec3" + QT_MOC_LITERAL(163, 9), // "glm::vec3" + QT_MOC_LITERAL(173, 16) // "timeValueChanged" }, "RayTracer", "xyRotationChanged", @@ -96,7 +99,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str "zwRotationChanged", "rotationChanged", "cameraPositionChanged", - "glm::vec3" + "glm::vec3", + "timeValueChanged" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -108,22 +112,23 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSRayTracerENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 8, 14, // methods + 9, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 8, // signalCount + 9, // signalCount // signals: name, argc, parameters, tag, flags, initial metatype offsets - 1, 1, 62, 2, 0x06, 1 /* Public */, - 4, 1, 65, 2, 0x06, 3 /* Public */, - 5, 1, 68, 2, 0x06, 5 /* Public */, - 6, 1, 71, 2, 0x06, 7 /* Public */, - 7, 1, 74, 2, 0x06, 9 /* Public */, - 8, 1, 77, 2, 0x06, 11 /* Public */, - 9, 1, 80, 2, 0x06, 13 /* Public */, - 10, 1, 83, 2, 0x06, 15 /* Public */, + 1, 1, 68, 2, 0x06, 1 /* Public */, + 4, 1, 71, 2, 0x06, 3 /* Public */, + 5, 1, 74, 2, 0x06, 5 /* Public */, + 6, 1, 77, 2, 0x06, 7 /* Public */, + 7, 1, 80, 2, 0x06, 9 /* Public */, + 8, 1, 83, 2, 0x06, 11 /* Public */, + 9, 1, 86, 2, 0x06, 13 /* Public */, + 10, 1, 89, 2, 0x06, 15 /* Public */, + 12, 1, 92, 2, 0x06, 17 /* Public */, // signals: parameters QMetaType::Void, QMetaType::Float, 3, @@ -134,6 +139,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSRayTracerENDCLASS[] = { QMetaType::Void, QMetaType::Float, 3, QMetaType::Void, QMetaType::Float, 3, QMetaType::Void, 0x80000000 | 11, 3, + QMetaType::Void, QMetaType::Int, 3, 0 // eod }; @@ -170,7 +176,10 @@ Q_CONSTINIT const QMetaObject RayTracer::staticMetaObject = { { QtPrivate::TypeAndForceComplete<float, std::false_type>, // method 'cameraPositionChanged' QtPrivate::TypeAndForceComplete<void, std::false_type>, - QtPrivate::TypeAndForceComplete<glm::vec3, std::false_type> + QtPrivate::TypeAndForceComplete<glm::vec3, std::false_type>, + // method 'timeValueChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type> >, nullptr } }; @@ -189,6 +198,7 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v case 5: _t->zwRotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; case 6: _t->rotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; case 7: _t->cameraPositionChanged((*reinterpret_cast< std::add_pointer_t<glm::vec3>>(_a[1]))); break; + case 8: _t->timeValueChanged((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -249,6 +259,13 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v return; } } + { + using _t = void (RayTracer::*)(int ); + if (_t _q_method = &RayTracer::timeValueChanged; *reinterpret_cast<_t *>(_a[1]) == _q_method) { + *result = 8; + return; + } + } } } @@ -271,13 +288,13 @@ int RayTracer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 8) + if (_id < 9) qt_static_metacall(this, _c, _id, _a); - _id -= 8; + _id -= 9; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 8) + if (_id < 9) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 8; + _id -= 9; } return _id; } @@ -337,4 +354,11 @@ void RayTracer::cameraPositionChanged(glm::vec3 _t1) void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 7, _a); } + +// SIGNAL 8 +void RayTracer::timeValueChanged(int _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 8, _a); +} QT_WARNING_POP diff --git a/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp b/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp index 3d75784..584c51b 100644 --- a/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp +++ b/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp @@ -69,7 +69,7 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "updateRotationSlider", "onValChangeWSlider", "onValChangeWBox", - "updateCameraPosition" + "updateTimeValue" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { @@ -104,7 +104,7 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { char stringdata27[21]; char stringdata28[19]; char stringdata29[16]; - char stringdata30[21]; + char stringdata30[16]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len @@ -140,7 +140,7 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st 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(491, 15) // "updateTimeValue" }, "MainWindow", "onUploadFile", @@ -172,7 +172,7 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st "updateRotationSlider", "onValChangeWSlider", "onValChangeWBox", - "updateCameraPosition" + "updateTimeValue" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -340,7 +340,7 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { // method 'onValChangeWBox' QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<double, std::false_type>, - // method 'updateCameraPosition' + // method 'updateTimeValue' QtPrivate::TypeAndForceComplete<void, std::false_type> >, nullptr @@ -379,7 +379,7 @@ 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; + case 27: _t->updateTimeValue(); break; default: ; } } diff --git a/cmake-build-release/projects_ray_autogen/deps b/cmake-build-release/projects_ray_autogen/deps index 87f5f8a..08050b5 100644 --- a/cmake-build-release/projects_ray_autogen/deps +++ b/cmake-build-release/projects_ray_autogen/deps @@ -467,6 +467,8 @@ projects_ray_autogen/timestamp: \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/main.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/mainwindow.h \ + /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/physics/physics.h \ /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/raytracer/raytracer.h \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp \ @@ -486,76 +488,23 @@ projects_ray_autogen/timestamp: \ /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/vec4ops/vec4ops.cpp \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCXXCompiler.cmake.in \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCXXCompilerABI.cpp \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCXXInformation.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCommonLanguageInclude.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCompilerIdDetection.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeDetermineCXXCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeDetermineCompileFeatures.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeDetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeDetermineCompilerABI.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeDetermineCompilerId.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeDetermineSystem.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeFindBinUtils.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeFindDependencyMacro.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeGenericSystem.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeInitializeConfigs.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeLanguageInformation.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeParseImplicitIncludeInfo.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeParseImplicitLinkInfo.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeParseLibraryArchitecture.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeSystem.cmake.in \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeSystemSpecificInformation.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeSystemSpecificInitialize.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeTestCXXCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeTestCompilerCommon.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CheckCXXCompilerFlag.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CheckCXXSourceCompiles.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CheckIncludeFileCXX.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CheckLibraryExists.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/ADSP-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/ARMCC-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/ARMClang-DetermineCompiler.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/AppleClang-CXX.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/AppleClang-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Borland-DetermineCompiler.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/CMakeCommonCompilerMacros.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Clang-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Clang-DetermineCompilerInternal.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Clang.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Cray-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Embarcadero-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Fujitsu-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/GHS-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/GNU.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/HP-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/IAR-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Intel-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/MSVC-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/NVHPC-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/NVIDIA-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/PGI-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/PathScale-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/SCO-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/TI-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Tasking-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/Watcom-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/XL-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/FindOpenGL.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/FindPackageHandleStandardArgs.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/FindPackageMessage.cmake \ @@ -564,12 +513,10 @@ projects_ray_autogen/timestamp: \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Internal/CheckCompilerFlag.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Internal/CheckFlagCommonConfig.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Internal/CheckSourceCompiles.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Internal/FeatureTesting.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/MacroAddFileDependencies.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Platform/Apple-AppleClang-CXX.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Platform/Apple-Clang-CXX.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Platform/Apple-Clang.cmake \ - /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Platform/Darwin-Determine-CXX.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Platform/Darwin-Initialize.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Platform/Darwin.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/Platform/UnixPaths.cmake \ diff --git a/scenefiles-4d/five_shapes.json b/scenefiles-4d/five_shapes.json index 18245c5..c6c6645 100644 --- a/scenefiles-4d/five_shapes.json +++ b/scenefiles-4d/five_shapes.json @@ -8,7 +8,7 @@ "gravity": [0.0, -0.0098, 0.0, 0.0] }, "cameraData": { - "position": [-10.0, -10.0, -10.0, -10.0], + "position": [30.0, 30.0, 30.0, 30.0], "up": [0.0, 1.0, 0.0, 0.0], "heightAngle": 30.0, "focus": [0.0, 0.0, 0.0, 0.0], diff --git a/scenefiles-4d/sphere_collision.json b/scenefiles-4d/sphere_collision.json index 415ec08..8cfe904 100644 --- a/scenefiles-4d/sphere_collision.json +++ b/scenefiles-4d/sphere_collision.json @@ -33,9 +33,9 @@ { "groups": [ { - "translate": [0.0, 0.0, 0.0, 0.0], + "translate": [-1.0, 0.0, 0.0, 0.0], "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], - "scale": [1.0, 1.0, 1.0, 1.0], + "scale": [1.0, 2.0, 1.0, 1.0], "primitives": [ { "type": "sphere", diff --git a/src/.DS_Store b/src/.DS_Store Binary files differindex 663fe9e..5d99fdf 100644 --- a/src/.DS_Store +++ b/src/.DS_Store diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index 4f641e5..f2944a9 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -92,8 +92,6 @@ glm::vec4 RayTracer::getPixelFromRay( for (const RenderShapeData &shape : scene.getShapes()) { 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; bool isHit = false; glm::vec4 newIntersectionObj = findIntersection(pObject, dObject, shape, isHit); if (!isHit) // no hit @@ -156,142 +154,114 @@ void RayTracer::sceneChanged(QLabel* imageLabel) { // m_image = image; } -// void RayTracer::settingsChanged(QLabel* imageLabel) { -// if (settings.sceneFilePath.size() == 0) { -// // no scene loaded -// m_image.fill(Qt::black); -// imageLabel->setPixmap(QPixmap::fromImage(m_image)); -// m_imageData = reinterpret_cast<RGBA *>(m_image.bits()); -// return; -// } - -// int width = 576; -// int height = 432; - -// QImage image = QImage(width, height, QImage::Format_RGBX8888); -// image.fill(Qt::black); -// m_imageData = reinterpret_cast<RGBA *>(image.bits()); - -// RayTraceScene rtScene{ m_width, m_height, m_metaData, m_depth }; -// Camera camera = rtScene.getCamera(); -// if (m_controlPointIndex % 3 == 0) { -// m_controlPoints = camera.m_controlPoints; -// } - -// auto P1 = m_controlPoints[m_controlPointIndex]; -// auto P2 = m_controlPoints[m_controlPointIndex]; -// auto P3 = m_controlPoints[m_controlPointIndex]; -// auto P4 = m_controlPoints[m_controlPointIndex]; - -// glm::vec4 xa = getPt(P1, P2, settings.currentTime); -// glm::vec4 xb = getPt(P2, P3, settings.currentTime); -// glm::vec4 xc = getPt(P3, P4, settings.currentTime); - -// // Calculate points on the lines between the above points -// glm::vec4 xm = getPt(xa, xb, settings.currentTime); -// glm::vec4 xn = getPt(xb, xc, settings.currentTime); - -// // Calculate the final point on the Bezier curve -// glm::vec4 pointOnCurve = getPt(xm, xn, settings.currentTime); -// m_metaData.cameraData.pos = pointOnCurve; - -// settings.xy += 4.f; -// if (m_controlPointIndex % 1 == 0) { -// settings.xz += 8.f; -// } -// if (m_controlPointIndex % 3 == 0){ -// settings.yz += 8.f; -// } -// this->render(m_imageData, rtScene); - -// QImage flippedImage = image.mirrored(false, false); -// flippedImage = flippedImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); -// imageLabel->setPixmap(QPixmap::fromImage(flippedImage)); -// m_controlPointIndex++; + void RayTracer::settingsChanged(QLabel* imageLabel) { + if (settings.sceneFilePath.size() == 0) { + // no scene loaded + m_image.fill(Qt::black); + imageLabel->setPixmap(QPixmap::fromImage(m_image)); + m_imageData = reinterpret_cast<RGBA *>(m_image.bits()); + return; + } - -// // QTimer::singleShot(3500, this, [this, imageLabel]() { -// // // This code will be executed after a 2-second delay -// // emit rotationChanged(settings.rotation); -// // }); -// m_image = image; -// } - -void RayTracer::settingsChanged(QLabel* imageLabel) { - emit timeValueChanged(settings.currentTime); - - bool success = SceneParser::parse(settings.sceneFilePath, m_metaData); // FIXME: this is a hack to get the camera position - - if (!success) { - std::cerr << "Error loading scene: \"" << settings.sceneFilePath << "\"" << std::endl; - // return; - // render a blank image - QImage image = QImage(576, 432, QImage::Format_RGBX8888); - image.fill(Qt::black); - RGBA *data = reinterpret_cast<RGBA *>(image.bits()); - m_imageData = data; - imageLabel->setPixmap(QPixmap::fromImage(image)); - } - - // if (settings.sceneFilePath.size() == 0) { - // // no scene loaded - // m_image.fill(Qt::black); - // imageLabel->setPixmap(QPixmap::fromImage(m_image)); - // m_imageData = reinterpret_cast<RGBA *>(m_image.bits()); - // return; - // } + int width = 576; + int height = 432; - int width = 576; - int height = 432; + QImage image = QImage(width, height, QImage::Format_RGBX8888); + image.fill(Qt::black); + m_imageData = reinterpret_cast<RGBA *>(image.bits()); - QImage image = QImage(width, height, QImage::Format_RGBX8888); - image.fill(Qt::black); - RGBA *data = reinterpret_cast<RGBA *>(image.bits()); + RayTraceScene rtScene{ m_width, m_height, m_metaData, m_depth }; - RayTraceScene rtScene{ m_width, m_height, m_metaData, m_depth }; - Camera camera = rtScene.getCamera(); - if (settings.currentTime % 3 == 0) { - m_controlPoints = camera.m_controlPoints; - } + this->render(m_imageData, rtScene); - auto P1 = m_controlPoints[settings.currentTime]; - auto P2 = m_controlPoints[settings.currentTime]; - auto P3 = m_controlPoints[settings.currentTime]; - auto P4 = m_controlPoints[settings.currentTime]; - - // glm::vec4 xa = getPt(P1, P2, settings.currentTime); - // glm::vec4 xb = getPt(P2, P3, settings.currentTime); - // glm::vec4 xc = getPt(P3, P4, settings.currentTime); - - // // Calculate points on the lines between the above points - // glm::vec4 xm = getPt(xa, xb, settings.currentTime); - // glm::vec4 xn = getPt(xb, xc, settings.currentTime); - - // // Calculate the final point on the Bezier curve - // glm::vec4 pointOnCurve = getPt(xm, xn, settings.currentTime); - // m_metaData.cameraData.pos = pointOnCurve; - - settings.xy += 4.f; - if (m_controlPointIndex % 1 == 0) { - settings.xz += 8.f; - } - if (m_controlPointIndex % 3 == 0){ - settings.yz += 8.f; - } - this->render(data, rtScene); - - QImage flippedImage = image.mirrored(false, false); - flippedImage = flippedImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - imageLabel->setPixmap(QPixmap::fromImage(flippedImage)); - // m_controlPointIndex++; + QImage flippedImage = image.mirrored(false, false); + flippedImage = flippedImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + imageLabel->setPixmap(QPixmap::fromImage(flippedImage)); + m_controlPointIndex++; - // QTimer::singleShot(3500, this, [this, imageLabel]() { - // // This code will be executed after a 2-second delay - // emit rotationChanged(settings.rotation); - // }); - m_image = image; -} + // QTimer::singleShot(3500, this, [this, imageLabel]() { + // // This code will be executed after a 2-second delay + // emit rotationChanged(settings.rotation); + // }); + m_image = image; + } + +//void RayTracer::settingsChanged(QLabel* imageLabel) { +// emit timeValueChanged(settings.currentTime); +// +// bool success = SceneParser::parse(settings.sceneFilePath, m_metaData); // FIXME: this is a hack to get the camera position +// +// if (!success) { +// std::cerr << "Error loading scene: \"" << settings.sceneFilePath << "\"" << std::endl; +// // return; +// // render a blank image +// QImage image = QImage(576, 432, QImage::Format_RGBX8888); +// image.fill(Qt::black); +// RGBA *data = reinterpret_cast<RGBA *>(image.bits()); +// m_imageData = data; +// imageLabel->setPixmap(QPixmap::fromImage(image)); +// } +// +// // if (settings.sceneFilePath.size() == 0) { +// // // no scene loaded +// // m_image.fill(Qt::black); +// // imageLabel->setPixmap(QPixmap::fromImage(m_image)); +// // m_imageData = reinterpret_cast<RGBA *>(m_image.bits()); +// // return; +// // } +// +// int width = 576; +// int height = 432; +// +// QImage image = QImage(width, height, QImage::Format_RGBX8888); +// image.fill(Qt::black); +// RGBA *data = reinterpret_cast<RGBA *>(image.bits()); +// +// RayTraceScene rtScene{ m_width, m_height, m_metaData, m_depth }; +//// Camera camera = rtScene.getCamera(); +//// if (settings.currentTime % 3 == 0) { +//// m_controlPoints = camera.m_controlPoints; +//// } +//// +//// auto P1 = m_controlPoints[settings.currentTime]; +//// auto P2 = m_controlPoints[settings.currentTime]; +//// auto P3 = m_controlPoints[settings.currentTime]; +//// auto P4 = m_controlPoints[settings.currentTime]; +//// +//// // glm::vec4 xa = getPt(P1, P2, settings.currentTime); +//// // glm::vec4 xb = getPt(P2, P3, settings.currentTime); +//// // glm::vec4 xc = getPt(P3, P4, settings.currentTime); +//// +//// // // Calculate points on the lines between the above points +//// // glm::vec4 xm = getPt(xa, xb, settings.currentTime); +//// // glm::vec4 xn = getPt(xb, xc, settings.currentTime); +//// +//// // // Calculate the final point on the Bezier curve +//// // glm::vec4 pointOnCurve = getPt(xm, xn, settings.currentTime); +//// // m_metaData.cameraData.pos = pointOnCurve; +//// +//// settings.xy += 4.f; +//// if (m_controlPointIndex % 1 == 0) { +//// settings.xz += 8.f; +//// } +//// if (m_controlPointIndex % 3 == 0){ +//// settings.yz += 8.f; +//// } +// this->render(data, rtScene); +// +// QImage flippedImage = image.mirrored(false, false); +// flippedImage = flippedImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); +// imageLabel->setPixmap(QPixmap::fromImage(flippedImage)); +// // m_controlPointIndex++; +// +// +// // QTimer::singleShot(3500, this, [this, imageLabel]() { +// // // This code will be executed after a 2-second delay +// // emit rotationChanged(settings.rotation); +// // }); +// m_image = image; +//} void RayTracer::keyPressEvent(QKeyEvent *event) { m_keyMap[Qt::Key(event->key())] = true; |
