diff options
| -rw-r--r-- | .idea/QtSettings.xml | 2 | ||||
| -rw-r--r-- | cmake-build-debug/.ninja_deps | bin | 250828 -> 314960 bytes | |||
| -rw-r--r-- | cmake-build-debug/.ninja_log | 31 | ||||
| -rw-r--r-- | cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 14 | ||||
| -rw-r--r-- | cmake-build-debug/Testing/Temporary/LastTest.log | 4 | ||||
| -rwxr-xr-x | cmake-build-debug/projects_ray | bin | 1748921 -> 1756297 bytes | |||
| -rw-r--r-- | cmake-build-release/.ninja_deps | bin | 375212 -> 486212 bytes | |||
| -rw-r--r-- | cmake-build-release/.ninja_log | 59 | ||||
| -rw-r--r-- | cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 124 | ||||
| -rw-r--r-- | cmake-build-release/Testing/Temporary/LastTest.log | 4 | ||||
| -rwxr-xr-x | cmake-build-release/projects_ray | bin | 351593 -> 351833 bytes | |||
| -rw-r--r-- | src/accelerate/myqtconcurrent.cpp | 49 | ||||
| -rw-r--r-- | src/camera/camera.cpp | 5 | ||||
| -rw-r--r-- | src/camera/camera.h | 12 |
14 files changed, 192 insertions, 112 deletions
diff --git a/.idea/QtSettings.xml b/.idea/QtSettings.xml index faa7b06..dd42746 100644 --- a/.idea/QtSettings.xml +++ b/.idea/QtSettings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="QtSettings"> - <option name="myCurrentProfile" value="Debug" /> + <option name="myCurrentProfile" value="Release" /> <option name="mySettingsPerProfile"> <map> <entry key="Debug"> diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps Binary files differindex adacbbe..afe4e66 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 4581354..16706eb 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -74,3 +74,34 @@ 7 34 1702451295273999693 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 37 1293 1702451296522610205 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc 1293 1408 1702451296646479261 projects_ray dac5017ee9a78855 +7 405 1702451980486409000 projects_ray_autogen/timestamp d580242d2b9854b3 +7 405 1702451980486409000 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +7 405 1702451980486409000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 +7 405 1702451980486409000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +405 784 1702451980868128435 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36 +406 1197 1702451981278784982 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b +406 1224 1702451981308399743 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c +406 1249 1702451981334007732 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a +405 1282 1702451981366452913 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd +405 1369 1702451981452700029 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df +405 1597 1702451981678718609 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3 +784 1602 1702451981686807738 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f +405 1744 1702451981826575785 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 +1197 1939 1702451982023115857 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec +1224 1962 1702451982047172405 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32 +1249 1980 1702451982065215690 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e +1282 1990 1702451982076266699 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898 +1369 2099 1702451982184293952 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a +1597 2320 1702451982405229785 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273 +1603 2365 1702451982450572587 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4 +1981 2638 1702451982723452076 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 502b39b3210366aa +1939 2676 1702451982761467220 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f +1962 2704 1702451982789058699 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o a8cce28f179d7603 +1744 3005 1702451983088469650 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc +3005 3117 1702451983204644282 projects_ray dac5017ee9a78855 +6 32 1702452320993272690 projects_ray_autogen/timestamp d580242d2b9854b3 +6 32 1702452320993272690 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +6 32 1702452320993272690 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 +6 32 1702452320993272690 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +35 1226 1702452322182712157 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc +1227 1337 1702452322296921341 projects_ray dac5017ee9a78855 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 f109c5d..7df54f8 100644 --- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,14 +1,14 @@ # Generated by CMake. Changes will be overwritten. -/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/aliasing/filter.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/settings.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h /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/4dvecops/vec4ops.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mmc:Q_OBJECT @@ -1720,15 +1720,15 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/texture/texture.cpp /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index fd0150a..88bec46 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 02:08 EST +Start testing: Dec 13 02:25 EST ---------------------------------------------------------- -End testing: Dec 13 02:08 EST +End testing: Dec 13 02:25 EST diff --git a/cmake-build-debug/projects_ray b/cmake-build-debug/projects_ray Binary files differindex 872dc91..a947143 100755 --- a/cmake-build-debug/projects_ray +++ b/cmake-build-debug/projects_ray diff --git a/cmake-build-release/.ninja_deps b/cmake-build-release/.ninja_deps Binary files differindex 9ebf0dc..3795333 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 517eafd..8968c6c 100644 --- a/cmake-build-release/.ninja_log +++ b/cmake-build-release/.ninja_log @@ -29,3 +29,62 @@ 424 1250 1702449493216958161 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 2007 2777 1702449494744944219 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b 6 413 1702450783479044000 projects_ray_autogen/timestamp 55fca76aac650d2f +7 37 1702451620435896085 projects_ray_autogen/timestamp 55fca76aac650d2f +7 37 1702451620435896085 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 37 1702451620435896085 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 37 1702451620435896085 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +40 1399 1702451621791849149 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1399 1523 1702451621921376701 projects_ray 45fbfe11691b47a4 +6 412 1702451939391778000 projects_ray_autogen/timestamp 55fca76aac650d2f +6 412 1702451939391778000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 412 1702451939391778000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +6 412 1702451939391778000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +414 1110 1702451940091575362 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6 +414 1170 1702451940153636470 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda +413 1213 1702451940196527649 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1 +414 1259 1702451940242362875 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 +413 1367 1702451940350959554 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba +413 1485 1702451940468829130 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c +413 1693 1702451940676439710 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 +6 33 1702451943459045623 projects_ray_autogen/timestamp 55fca76aac650d2f +6 33 1702451943459045623 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 33 1702451943459045623 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +6 33 1702451943459045623 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +37 699 1702451944121685745 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 +37 706 1702451944128482186 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 +37 712 1702451944135134042 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 +37 716 1702451944139225231 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 +37 718 1702451944141614019 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062 +36 722 1702451944145674792 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 +36 759 1702451944182171578 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +6 409 1702451967248888000 projects_ray_autogen/timestamp 55fca76aac650d2f +6 409 1702451967248888000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 409 1702451967248888000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +6 409 1702451967248888000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +410 857 1702451967700101879 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0 +410 1203 1702451968043672489 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6 +411 1269 1702451968101036439 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda +409 1350 1702451968184296925 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1 +411 1452 1702451968294549421 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 +410 1505 1702451968347842640 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba +857 1653 1702451968494503672 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +410 1717 1702451968559045111 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c +410 1878 1702451968719347900 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 +1203 1931 1702451968773961349 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 +1269 2000 1702451968842692563 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062 +1351 2045 1702451968887720776 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 +1452 2135 1702451968977829870 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 +1505 2195 1702451969036438382 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 +1653 2342 1702451969184886358 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 +1717 2474 1702451969317858048 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 +2045 2707 1702451969550779321 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e +1931 2719 1702451969562451340 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b +2000 2794 1702451969637881909 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8 +1878 3249 1702451970091892310 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +3249 3358 1702451970204198381 projects_ray 45fbfe11691b47a4 +6 33 1702452369238762000 projects_ray_autogen/timestamp 55fca76aac650d2f +6 33 1702452369238762000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 33 1702452369238762000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +6 33 1702452369238762000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +36 1360 1702452370562378093 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1360 1465 1702452370669676125 projects_ray 45fbfe11691b47a4 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..05a22d1 100644 --- a/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,10 +1,26 @@ # Generated by CMake. Changes will be overwritten. -/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/rgba.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h -/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/utils/scenefilereader.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/vec4ops/rotations4d.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/texture/texture.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/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/mainwindow.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.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/illuminate/illuminate.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/moc_predefs.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h @@ -457,6 +473,7 @@ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h @@ -507,6 +524,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h @@ -527,6 +545,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h @@ -599,21 +618,52 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h 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/raytracer/raytracescene.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp +/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/utils/scenefilereader.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.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/accelerate/bvh.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mmc:Q_OBJECT mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp @@ -1065,20 +1115,10 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h 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/utils/sceneparser.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h -/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/accelerate/myqthreads.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/vec4ops/vec4ops.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.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/raytracer/raytracescene.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/moc_predefs.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h @@ -1531,7 +1571,6 @@ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h @@ -1582,7 +1621,6 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h @@ -1603,7 +1641,6 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h @@ -1676,57 +1713,20 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h 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/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 -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/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/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/accelerate/kdtree.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log index 0d95d23..ae07a38 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 02:03 EST +Start testing: Dec 13 02:26 EST ---------------------------------------------------------- -End testing: Dec 13 02:03 EST +End testing: Dec 13 02:26 EST diff --git a/cmake-build-release/projects_ray b/cmake-build-release/projects_ray Binary files differindex 64dea30..d34b153 100755 --- a/cmake-build-release/projects_ray +++ b/cmake-build-release/projects_ray diff --git a/src/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp index bf99070..08248f4 100644 --- a/src/accelerate/myqtconcurrent.cpp +++ b/src/accelerate/myqtconcurrent.cpp @@ -7,8 +7,8 @@ #include "settings.h" struct pixelRoutineArgs { - glm::vec4 pCamera; - glm::vec4 dCamera; + glm::vec4 pWorld; + glm::vec4 dWorld; const RayTraceScene &scene; RayTracer *rt; }; @@ -44,7 +44,7 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) // } for (int imageRow = 0; imageRow < scene.height(); imageRow++) { for (int imageCol = 0; imageCol < scene.width(); imageCol++) { - // FIXME: for now, use height as depth + // FIXME: for now, use W slider ad depth int imageDepth = (int) ((settings.w + 100.f) * (5.f / 2.f)); // compute the ray float x = (imageCol - scene.width()/2.f) * viewplaneWidth / scene.width(); @@ -53,17 +53,14 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector()); glm::vec4 dWorld = Vec4Ops::transformDir4(glm::vec4(x, y, z, -1.0), camera.getViewMatrix()); - // get the pixel color - glm::vec4 pixelColor = getPixelFromRay(pWorld, dWorld, scene, 0); - // set the pixel color - int index = imageRow * scene.width() + imageCol; - imageData[index] = RGBA{ - (std::uint8_t) (pixelColor.r * 255.f), - (std::uint8_t) (pixelColor.g * 255.f), - (std::uint8_t) (pixelColor.b * 255.f), - (std::uint8_t) (pixelColor.a * 255.f) - }; + pixelRoutineArgs args{ + pWorld, + dWorld, + scene, + this + }; + l.append(args); } } QList<RGBA> pixels = QtConcurrent::blockingMapped(l, pixelRoutine); @@ -72,8 +69,12 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) // get the slice relating to z == 0 and set it into int the iamge data array // int currentSlice = settings.w + 100.f * (5.f / 2.f); + int index = 0; + for (RGBA p : pixels) { + imageData[index++] = p; + } - std::cout << " here " << std::endl; + std::cout << "done rendering" << std::endl; if (m_enableAntiAliasing) { @@ -84,27 +85,11 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) RGBA pixelRoutine(pixelRoutineArgs args) { - auto eyeCamera = args.pCamera; - auto pixelDirCamera = args.dCamera; + auto pWorld = args.pWorld; + auto dWorld = args.dWorld; auto scene = args.scene; auto rt = args.rt; - // convert camera space to world space - auto inv = scene.getCamera().getInverseViewMatrix(); - glm::vec4 pWorld = inv * eyeCamera; - glm::vec4 dWorld = glm::normalize(inv * pixelDirCamera); - - if (rt->m_enableDepthOfField) - { - // if we're doing depth of field, we need to shoot multiple rays, see camera.cpp - return RayTracer::toRGBA(rt->secondaryRays(pWorld, dWorld, scene)); - } - if (rt->m_enableSuperSample) - { - // if we're doing super sampling, we need to shoot multiple rays, see raytracer.cpp - return rt->superSample(eyeCamera, pixelDirCamera, scene); - } - // shoot ray! RGBA pixel = RayTracer::toRGBA(rt->getPixelFromRay(pWorld, dWorld, scene, 0)); return pixel; diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index 5097b6c..78ae483 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -32,6 +32,11 @@ glm::mat4 Camera::getInverseViewMatrix() const { return m_inverseViewMatrix; } +glm::vec4 Camera::getPos() const { + // Optional TODO: implement the getter or make your own design + return m_pos; +} + glm::vec4 Camera::getTranslationVector() const { return m_translationVector; } diff --git a/src/camera/camera.h b/src/camera/camera.h index a6e8c0a..08750fb 100644 --- a/src/camera/camera.h +++ b/src/camera/camera.h @@ -35,21 +35,21 @@ public: // You can ignore if you are not attempting to implement depth of field. float getAperture() const; - glm::vec3 getPos() const; + glm::vec4 getPos() const; float cameraDepth = -1.f; std::vector<glm::vec3> m_controlPoints; private: - glm::mat4 m_viewMatrix; - glm::mat4 m_inverseViewMatrix; + glm::mat4 m_viewMatrix{}; + glm::mat4 m_inverseViewMatrix{}; float m_heightAngle; - glm::vec3 m_pos; + glm::vec4 m_pos; float m_focalLength; float m_aperture; - glm::vec4 m_translationVector; - glm::vec4 m_inverseTranslationVector; + glm::vec4 m_translationVector{}; + glm::vec4 m_inverseTranslationVector{}; }; |