diff options
| -rw-r--r-- | cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-0cd8fea12d6b4dd04e04.json (renamed from cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d0d3fa287e29188e0354.json) | 2 | ||||
| -rw-r--r-- | cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T20-03-25-0518.json (renamed from cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-30-06-0529.json) | 4 | ||||
| -rw-r--r-- | cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-59e38b50932a7f88906c.json (renamed from cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-0c31da326cb0080f0750.json) | 8 | ||||
| -rw-r--r-- | cmake-build-debug/.ninja_deps | bin | 174300 -> 168256 bytes | |||
| -rw-r--r-- | cmake-build-debug/.ninja_log | 10 | ||||
| -rw-r--r-- | cmake-build-debug/CMakeFiles/clion-Debug-log.txt | 2 | ||||
| -rw-r--r-- | cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json | 42 | ||||
| -rw-r--r-- | cmake-build-debug/Testing/Temporary/LastTest.log | 4 | ||||
| -rw-r--r-- | cmake-build-debug/build.ninja | 22 | ||||
| -rw-r--r-- | src/raytracer/raytracer.cpp | 5 |
10 files changed, 49 insertions, 50 deletions
diff --git a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d0d3fa287e29188e0354.json b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-0cd8fea12d6b4dd04e04.json index a00a375..6ac7ee4 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d0d3fa287e29188e0354.json +++ b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-0cd8fea12d6b4dd04e04.json @@ -59,7 +59,7 @@ { "directoryIndex" : 0, "id" : "projects_ray::@6890427a1f51a3e7e1df", - "jsonFile" : "target-projects_ray-Debug-0c31da326cb0080f0750.json", + "jsonFile" : "target-projects_ray-Debug-59e38b50932a7f88906c.json", "name" : "projects_ray", "projectIndex" : 0 }, diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-30-06-0529.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T20-03-25-0518.json index e6a9128..39e028e 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-30-06-0529.json +++ b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T20-03-25-0518.json @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-d0d3fa287e29188e0354.json", + "jsonFile" : "codemodel-v2-0cd8fea12d6b4dd04e04.json", "kind" : "codemodel", "version" : { @@ -86,7 +86,7 @@ }, "codemodel-v2" : { - "jsonFile" : "codemodel-v2-d0d3fa287e29188e0354.json", + "jsonFile" : "codemodel-v2-0cd8fea12d6b4dd04e04.json", "kind" : "codemodel", "version" : { diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-0c31da326cb0080f0750.json b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-59e38b50932a7f88906c.json index bcc468c..391a421 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-0c31da326cb0080f0750.json +++ b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-59e38b50932a7f88906c.json @@ -905,24 +905,24 @@ { "backtrace" : 1, "compileGroupIndex" : 0, - "path" : "src/4dvecops/vec4ops.cpp", + "path" : "src/vec4ops/vec4ops.cpp", "sourceGroupIndex" : 0 }, { "backtrace" : 1, "compileGroupIndex" : 0, - "path" : "src/4dvecops/rotations4d.cpp", + "path" : "src/vec4ops/rotations4d.cpp", "sourceGroupIndex" : 0 }, { "backtrace" : 1, "compileGroupIndex" : 0, - "path" : "src/4dvecops/transform4d.cpp", + "path" : "src/vec4ops/transform4d.cpp", "sourceGroupIndex" : 0 }, { "backtrace" : 1, - "path" : "src/4dvecops/vec4ops.h", + "path" : "src/vec4ops/vec4ops.h", "sourceGroupIndex" : 1 }, { diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps Binary files differindex e937cad..16d6d26 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 674598c..d85601a 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -1,14 +1,14 @@ # ninja log v5 -1 163 1702063806513858336 build.ninja 34bb77e754b05480 37 1002 1702063495670965252 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 41959d435611c983 +1 163 1702065805502556826 build.ninja 34bb77e754b05480 1129 1843 1702062977342546570 CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o ce6e3c7f960de866 1220 1963 1702062977461615794 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a -7 34 1702063494707727424 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 1153 1904 1702062977403040871 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32 +7 34 1702063494707727424 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 7 34 1702063494707727424 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 389 1129 1702062976626800433 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a -7 34 1702063494707727424 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 389 1124 1702062976621998218 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898 +7 34 1702063494707727424 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 1215 1995 1702062977494482428 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f 1002 1148 1702063495820276807 projects_ray 69591c53d0e17f8e 389 1153 1702062976653549225 CMakeFiles/projects_ray.dir/src/4dvecops/vec4operations.cpp.o d05a5fd3c2f1f4c4 @@ -17,10 +17,10 @@ 389 1194 1702062976692855035 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273 1194 1944 1702062977443687058 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec 389 1220 1702062976719809368 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4 -1995 2884 1702062978382551338 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df 1124 1934 1702062977432980500 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o a8cce28f179d7603 -1706 2503 1702062978000706958 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a +1995 2884 1702062978382551338 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df 1944 2276 1702062977776055279 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36 +1706 2503 1702062978000706958 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a 1963 2190 1702062977691669565 CMakeFiles/projects_ray.dir/src/settings.cpp.o 7c89207347735849 1934 3161 1702062978659402142 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 1150 1837 1702062977336494519 CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o edbb1aa44772a316 diff --git a/cmake-build-debug/CMakeFiles/clion-Debug-log.txt b/cmake-build-debug/CMakeFiles/clion-Debug-log.txt index 6682aea..a4f4c26 100644 --- a/cmake-build-debug/CMakeFiles/clion-Debug-log.txt +++ b/cmake-build-debug/CMakeFiles/clion-Debug-log.txt @@ -1,4 +1,4 @@ "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/bin/cmake" -DCMAKE_BUILD_TYPE=Debug "-DCMAKE_MAKE_PROGRAM=/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/ninja/mac/ninja" -DCMAKE_PREFIX_PATH=/Users/sotech117/Qt/6.5.2/macos/lib/cmake -G Ninja -S /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230 -B /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug --- Configuring done (0.1s) +-- Configuring done (0.2s) -- Generating done (0.0s) -- Build files have been written to: /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug diff --git a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json index 8aa0f76..790d2b7 100644 --- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json +++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json @@ -392,12 +392,6 @@ "HEADERS" : [ [ - "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h", - "MU", - "SDN2X6DTVW/moc_vec4ops.cpp", - null - ], - [ "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h", "MU", "IKADTU3N3M/moc_bvh.cpp", @@ -468,6 +462,12 @@ "MU", "VSCBVMNR7M/moc_sceneparser.cpp", null + ], + [ + "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h", + "MU", + "YL3NGBB5K6/moc_vec4ops.cpp", + null ] ], "HEADER_EXTENSIONS" : [ "h", "hh", "h++", "hm", "hpp", "hxx", "in", "txx" ], @@ -549,21 +549,6 @@ "SOURCES" : [ [ - "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/rotations4d.cpp", - "MU", - null - ], - [ - "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp", - "MU", - null - ], - [ - "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.cpp", - "MU", - null - ], - [ "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp", "MU", null @@ -667,6 +652,21 @@ "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp", "MU", null + ], + [ + "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp", + "MU", + null + ], + [ + "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp", + "MU", + null + ], + [ + "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp", + "MU", + null ] ], "UIC_OPTIONS" : [], diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 06ce0b3..831e9e8 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 08 14:30 EST +Start testing: Dec 08 15:03 EST ---------------------------------------------------------- -End testing: Dec 08 14:30 EST +End testing: Dec 08 15:03 EST diff --git a/cmake-build-debug/build.ninja b/cmake-build-debug/build.ninja index 5f75f72..121c63d 100644 --- a/cmake-build-debug/build.ninja +++ b/cmake-build-debug/build.ninja @@ -225,29 +225,29 @@ build CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o: CXX_COMPILER__projec OBJECT_DIR = CMakeFiles/projects_ray.dir OBJECT_FILE_DIR = CMakeFiles/projects_ray.dir/src/accelerate -build CMakeFiles/projects_ray.dir/src/4dvecops/vec4ops.cpp.o: CXX_COMPILER__projects_ray_unscanned_Debug /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.cpp || cmake_object_order_depends_target_projects_ray +build CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o: CXX_COMPILER__projects_ray_unscanned_Debug /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp || cmake_object_order_depends_target_projects_ray DEFINES = -DGLM_FORCE_SWIZZLE -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGLWIDGETS_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB - DEP_FILE = CMakeFiles/projects_ray.dir/src/4dvecops/vec4ops.cpp.o.d + DEP_FILE = CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o.d FLAGS = -Wno-deprecated-volatile -g -std=gnu++20 -arch arm64 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk -fcolor-diagnostics INCLUDES = -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230 -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/include -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Headers -iframework /Users/sotech117/Qt/6.5.2/macos/lib -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/mkspecs/macx-clang -isystem /Users/sotech117/Qt/6.5.2/macos/include -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Headers OBJECT_DIR = CMakeFiles/projects_ray.dir - OBJECT_FILE_DIR = CMakeFiles/projects_ray.dir/src/4dvecops + OBJECT_FILE_DIR = CMakeFiles/projects_ray.dir/src/vec4ops -build CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o: CXX_COMPILER__projects_ray_unscanned_Debug /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/rotations4d.cpp || cmake_object_order_depends_target_projects_ray +build CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o: CXX_COMPILER__projects_ray_unscanned_Debug /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp || cmake_object_order_depends_target_projects_ray DEFINES = -DGLM_FORCE_SWIZZLE -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGLWIDGETS_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB - DEP_FILE = CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o.d + DEP_FILE = CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o.d FLAGS = -Wno-deprecated-volatile -g -std=gnu++20 -arch arm64 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk -fcolor-diagnostics INCLUDES = -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230 -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/include -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Headers -iframework /Users/sotech117/Qt/6.5.2/macos/lib -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/mkspecs/macx-clang -isystem /Users/sotech117/Qt/6.5.2/macos/include -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Headers OBJECT_DIR = CMakeFiles/projects_ray.dir - OBJECT_FILE_DIR = CMakeFiles/projects_ray.dir/src/4dvecops + OBJECT_FILE_DIR = CMakeFiles/projects_ray.dir/src/vec4ops -build CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o: CXX_COMPILER__projects_ray_unscanned_Debug /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp || cmake_object_order_depends_target_projects_ray +build CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o: CXX_COMPILER__projects_ray_unscanned_Debug /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp || cmake_object_order_depends_target_projects_ray DEFINES = -DGLM_FORCE_SWIZZLE -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_OPENGLWIDGETS_LIB -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB - DEP_FILE = CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o.d + DEP_FILE = CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o.d FLAGS = -Wno-deprecated-volatile -g -std=gnu++20 -arch arm64 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk -fcolor-diagnostics INCLUDES = -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230 -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/include -I/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Headers -iframework /Users/sotech117/Qt/6.5.2/macos/lib -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/mkspecs/macx-clang -isystem /Users/sotech117/Qt/6.5.2/macos/include -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Headers -isystem /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Headers OBJECT_DIR = CMakeFiles/projects_ray.dir - OBJECT_FILE_DIR = CMakeFiles/projects_ray.dir/src/4dvecops + OBJECT_FILE_DIR = CMakeFiles/projects_ray.dir/src/vec4ops # ============================================================================= @@ -257,7 +257,7 @@ build CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o: CXX_COMPILER__ ############################################# # Link the executable projects_ray -build projects_ray: CXX_EXECUTABLE_LINKER__projects_ray_Debug CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o CMakeFiles/projects_ray.dir/src/main.cpp.o CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o CMakeFiles/projects_ray.dir/src/settings.cpp.o CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o CMakeFiles/projects_ray.dir/src/4dvecops/vec4ops.cpp.o CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o | /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore || projects_ray_autogen projects_ray_autogen_timestamp_deps +build projects_ray: CXX_EXECUTABLE_LINKER__projects_ray_Debug CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o CMakeFiles/projects_ray.dir/src/main.cpp.o CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o CMakeFiles/projects_ray.dir/src/settings.cpp.o CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o | /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore || projects_ray_autogen projects_ray_autogen_timestamp_deps FLAGS = -Wno-deprecated-volatile -g -arch arm64 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk LINK_LIBRARIES = -Wl,-rpath,/Users/sotech117/Qt/6.5.2/macos/lib /Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent /Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets /Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL /Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui /Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore -framework IOKit -framework DiskArbitration -Xlinker -framework -Xlinker OpenGL -Xlinker -framework -Xlinker AGL -framework AppKit -framework ImageIO -framework Metal LINK_PATH = -F/Users/sotech117/Qt/6.5.2/macos/lib @@ -358,7 +358,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/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index 6b33150..2904e18 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -42,9 +42,8 @@ void RayTracer::render(RGBA *imageData, const RayTraceScene &scene) { float z = (imageDepth - scene.height()/2.f) * viewplaneHeight / scene.height(); float camera4dDepth = 1; - glm::vec4 pCamera = - glm::vec4 pWorld = Vec4Ops::transformPoint4(camera.getvec4(x, y, z, camera4dDepth); - glm::vec4 dWorld = glm::vec4(0.f, 0.f, -1.f, 0.f); + glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector()); + glm::vec4 dWorld = glm::vec4(0.f, 0.f, 0.f, -1.f); // get the pixel color glm::vec4 pixelColor = getPixelFromRay(pWorld, dWorld, scene, 0); |