diff options
| -rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps | bin | 2218752 -> 2433944 bytes | |||
| -rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log | 127 | ||||
| -rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx | bin | 24982 -> 24876 bytes | |||
| -rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 2 | ||||
| -rwxr-xr-x | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray | bin | 367984 -> 368064 bytes | |||
| -rw-r--r-- | src/mainwindow.cpp | 15 | ||||
| -rw-r--r-- | src/raytracer/raytracer.cpp | 54 | ||||
| -rw-r--r-- | src/raytracer/raytracer.h | 1 |
8 files changed, 110 insertions, 89 deletions
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps Binary files differindex 7bbf227..6746e72 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log index 767b535..4d2685d 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log @@ -1,86 +1,51 @@ # ninja log v5 -1442 11333 1702502080261897670 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -7373 11955 1702502080895124963 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -14529 14975 1702502083913028186 projects_ray cae90fddb8ce24a -1444 7785 1702502076706246748 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -4137 9638 1702502078572682560 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -7785 10644 1702502079568768108 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 -25 1440 1702502070364219000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -4997 10377 1702502079309285897 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -133 4986 1702496984352747028 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o fb1aaa91c9ad0758 -1441 10260 1702502079190011027 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -1442 8607 1702502077537074931 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -7389 14529 1702502083470206839 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -1441 9183 1702502078111367353 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -8607 10464 1702502079398877485 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 9cafd52c1d615711 -7745 12512 1702502081454465406 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -7938 12177 1702502081118646465 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e -1445 7373 1702502076293422448 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -7369 12285 1702502081226970973 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -1447 7548 1702502076479699068 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -1446 7368 1702502076298566107 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -1445 7389 1702502076320362321 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -25 1440 1702502070364219000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -25 1440 1702502070364219000 projects_ray_autogen/timestamp 596afd61accb21ff -7548 12384 1702502081324628833 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -1442 4996 1702502073932406730 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 -1443 8722 1702502077634388661 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd -1441 4136 1702502073070914922 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e -25 1440 1702502070364219000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -1444 7744 1702502076671039056 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -3 644 1702496979342877780 build.ninja d13bedc3f8269e08 +1391 7696 1702504678413327956 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a 7970 16478 1702496995857081328 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 4d14ff80692ac6b3 -1440 7938 1702502076858533560 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -41 1416 1702503055426635000 projects_ray_autogen/timestamp 596afd61accb21ff -41 1416 1702503055426635000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -41 1416 1702503055426635000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -41 1416 1702503055426635000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +3 644 1702496979342877780 build.ninja d13bedc3f8269e08 +1393 7504 1702504678216624344 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b +1419 9619 1702503063633632587 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd 1417 4370 1702503058390240459 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e +26 177 1702509040047535606 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff 1418 5287 1702503059300395795 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 -1421 7900 1702503061897932338 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -1420 7904 1702503061897551890 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -1420 7930 1702503061941045593 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -1422 8367 1702503062377210780 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -1419 8464 1702503062470776194 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -1419 8535 1702503062531372618 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -1416 8739 1702503062737692408 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -1418 9518 1702503063528101124 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -1419 9619 1702503063633632587 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd -4370 10731 1702503064751048045 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -1417 11249 1702503065257238717 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -5287 11315 1702503065333784637 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed +7209 10938 1702504681667685041 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 +26 177 1702509040047535606 projects_ray_autogen/timestamp 596afd61accb21ff +26 177 1702509040047535606 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +1394 7209 1702504677923826764 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 +1394 7311 1702504678011112209 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 +1395 7400 1702504678116026472 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 +1397 7785 1702504678496703370 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 +1394 7259 1702504677968677157 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 +7312 10661 1702504681388895946 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e +144 3770 1702505476267948365 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +7260 11054 1702504681784341053 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 +8607 10464 1702502079398877485 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 9cafd52c1d615711 +7046 13103 1702504683830839255 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc +1392 8194 1702504678912214854 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de +1392 9362 1702504680081352528 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +156 2061 1702504626504805509 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o fb1aaa91c9ad0758 +1396 7045 1702504677759124308 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed +26 177 1702509040047535606 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff 8535 11505 1702503065530125532 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 -1418 12142 1702503066152084623 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -7905 12619 1702503066643491947 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -8739 12892 1702503066912153573 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e -7900 12990 1702503067016107946 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -8367 13158 1702503067185765064 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -8464 13274 1702503067302212123 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -7931 15245 1702503069270843271 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -29 1203 1702503137114049000 projects_ray_autogen/timestamp 596afd61accb21ff -29 1203 1702503137114049000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -29 1203 1702503137114049000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -29 1203 1702503137114049000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -1203 4793 1702503140720509418 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -1204 5497 1702503141425276473 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -1204 6105 1702503142030087394 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -1204 6749 1702503142677037948 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -6749 7183 1702503143108017882 projects_ray cae90fddb8ce24a -25 131 1702503230850786211 projects_ray_autogen/timestamp 596afd61accb21ff -25 131 1702503230850786211 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -25 131 1702503230850786211 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -25 131 1702503230850786211 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -141 3661 1702503234366648933 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -3661 4217 1702503234909838916 projects_ray cae90fddb8ce24a -25 151 1702503377940814912 projects_ray_autogen/timestamp 596afd61accb21ff -25 151 1702503377940814912 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -25 151 1702503377940814912 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -25 151 1702503377940814912 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -164 3623 1702503381400279783 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -3623 4141 1702503381915840291 projects_ray cae90fddb8ce24a -23 138 1702503499779212795 projects_ray_autogen/timestamp 596afd61accb21ff -23 138 1702503499779212795 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -23 138 1702503499779212795 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -23 138 1702503499779212795 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -148 3878 1702503503505907724 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -3878 4391 1702503504005217089 projects_ray cae90fddb8ce24a +1393 7573 1702504678284101694 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 +6686 7332 1702509047173344602 projects_ray cae90fddb8ce24a +1395 6960 1702504677673844934 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 +6960 10519 1702504681247487606 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd +189 6686 1702509046535035215 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +24 141 1702509106979737281 projects_ray_autogen/timestamp 596afd61accb21ff +24 141 1702509106979737281 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +24 141 1702509106979737281 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +24 141 1702509106979737281 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +152 6158 1702509112974869958 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +6158 6795 1702509113597525050 projects_ray cae90fddb8ce24a +26 139 1702509170398238491 projects_ray_autogen/timestamp 596afd61accb21ff +26 139 1702509170398238491 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +26 139 1702509170398238491 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +26 139 1702509170398238491 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +150 6440 1702509176676204315 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +6440 7230 1702509177452928341 projects_ray cae90fddb8ce24a +33 150 1702509252043880754 projects_ray_autogen/timestamp 596afd61accb21ff +33 150 1702509252043880754 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +33 150 1702509252043880754 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +33 150 1702509252043880754 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +160 4820 1702509256701364963 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +4821 5230 1702509257103180620 projects_ray cae90fddb8ce24a diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx Binary files differindex adcdbe4..5ba1d56 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index d9d8111..4258689 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,8 +1,8 @@ # Generated by CMake. Changes will be overwritten. /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.cpp -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/camera/camera.cpp /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/physics/physics.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.h /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray Binary files differindex 0316272..e5dac49 100755 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8895742..9fe2c92 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -51,12 +51,12 @@ void MainWindow::initialize() { w_label->setFont(font); currTimeLabel = new QLabel(); // Current Time label - currTimeLabel->setText("Curr Time: 0"); + currTimeLabel->setText("Curr Time: 0 Max Time:"); currTimeLabel->setFont(font); - QLabel *max_time_label = new QLabel(); // Max Time label - max_time_label->setText("Max Time:"); - max_time_label->setFont(font); + // QLabel *max_time_label = new QLabel(); // Max Time label + // max_time_label->setText("Max Time:"); + // max_time_label->setFont(font); // Create file uploader for scene file @@ -258,7 +258,7 @@ void MainWindow::initialize() { vLayout->addWidget(uploadFile); - vLayout->addWidget(saveImage); + // vLayout->addWidget(saveImage); vLayout->addWidget(xy_label); vLayout->addWidget(xyLayout); vLayout->addWidget(xz_label); @@ -276,7 +276,7 @@ void MainWindow::initialize() { vLayout->addWidget(w_label); vLayout->addWidget(wLayout); vLayout->addWidget(currTimeLabel); - vLayout->addWidget(max_time_label); + // vLayout->addWidget(max_time_label); vLayout->addWidget(maxTimeGroupBox); vLayout->addWidget(bulkRender); @@ -619,7 +619,8 @@ void MainWindow::updateRotationSlider(float value) { // } void MainWindow::updateTimeValue() { - currTimeLabel->setText("Curr Time: " + QString::number(settings.currentTime)); + currTimeLabel->setText("Curr Time: " + QString::number(settings.currentTime) + " Max Time:"); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::updateZSlider(double value) { diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index 6c3c77a..c0592c2 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -11,6 +11,8 @@ #include <QTimerEvent> #include "vec4ops/vec4ops.h" #include "physics/physics.h" +#include <glm/glm.hpp> +#include <glm/gtc/matrix_transform.hpp> // Include this header for glm::rotate // RayTracer::RayTracer(const Config &config) : m_config(config) {} RayTracer::RayTracer(QWidget *parent) : QWidget(parent) { @@ -51,6 +53,58 @@ void RayTracer::render(RGBA *imageData, const RayTraceScene &scene) { saveViewportImage(filePath); if (settings.currentTime < settings.maxTime) { // still more to render // render the next frame + if (m_enableCameraBezier) { + Camera camera = scene.getCamera(); + if (settings.currentTime % 4 == 0) { + m_controlPoints = camera.m_controlPoints; + } + + auto time = (settings.currentTime % 60)/60.f; + + auto P1 = m_controlPoints[0]; + auto P2 = m_controlPoints[1]; + auto P3 = m_controlPoints[2]; + auto P4 = m_controlPoints[3]; + + glm::vec4 xa = getPt(P1, P2, time); + glm::vec4 xb = getPt(P2, P3, time); + glm::vec4 xc = getPt(P3, P4, time); + + // Calculate points on the lines between the above points + glm::vec4 xm = getPt(xa, xb, time); + glm::vec4 xn = getPt(xb, xc, time); + + // Calculate the final point on the Bezier curve + glm::vec4 pointOnCurve = getPt(xm, xn, time); + std::cout << "point on curve: " << pointOnCurve.x << ", " << pointOnCurve.y << ", " << pointOnCurve.z << ", " << pointOnCurve.w << std::endl; + std::cout << "camera pos" << m_metaData.cameraData.pos.x << ", " << m_metaData.cameraData.pos.y << ", " << m_metaData.cameraData.pos.z << ", " << m_metaData.cameraData.pos.w << std::endl; + + // rotate the camera about the origin + glm::vec4 cameraPos = m_metaData.cameraData.pos; + glm::vec4 cameraPosRotated = glm::rotate(glm::mat4(1.f), glm::radians(10.0f), glm::vec3(0.f, 1.f, 0.f)) * glm::vec4(cameraPos.x, cameraPos.y, 0.f, 1.f); + + if (settings.currentTime % 2 == 0) { + cameraPosRotated = glm::rotate(glm::mat4(1.f), glm::radians(2.0f), glm::vec3(1.f, 0.f, 0.f)) * cameraPosRotated; + } + cameraPosRotated = glm::rotate(glm::mat4(1.f), glm::radians(-3.0f), glm::vec3(1.f, 0.f, 0.f)) * cameraPosRotated; + + // if (settings.currentTime % 3 == 0) { + // cameraPosRotated = glm::rotate(glm::mat4(1.f), glm::radians(4.0f), glm::vec3(0.f, 0.f, 1.f)) * cameraPosRotated; + // } + // cameraPosRotated = glm::rotate(glm::mat4(1.f), glm::radians(-2.0f), glm::vec3(0.f, 0.f, 1.f)) * cameraPosRotated; + + m_metaData.cameraData.pos = glm::vec4(cameraPosRotated.x, cameraPosRotated.y, cameraPos.z, 1.f); + // m_metaData.cameraData.pos = glm::vec4(pointOnCurve.x, pointOnCurve.y, pointOnCurve.z, 1.f); + + settings.xy += 4.f; + // if (m_controlPointIndex % 1 == 0) { + // settings.xz += 8.f; + // } + // if (m_controlPointIndex % 3 == 0){ + // settings.yz += 8.f; + // } + + } settings.currentTime++; // settings.w++; diff --git a/src/raytracer/raytracer.h b/src/raytracer/raytracer.h index d783289..7118840 100644 --- a/src/raytracer/raytracer.h +++ b/src/raytracer/raytracer.h @@ -155,6 +155,7 @@ public: bool m_enableAntiAliasing = false; bool m_enableDepthOfField = false; bool m_enableSuperSample = false; + bool m_enableCameraBezier = true; void sceneChanged(QLabel* imageLabel); void settingsChanged(QLabel* imageLabel); |