diff options
| -rw-r--r-- | cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d0d3fa287e29188e0354.json (renamed from cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d8c16986ac54f14e6ad2.json) | 2 | ||||
| -rw-r--r-- | cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-30-06-0529.json (renamed from cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-16-15-0499.json) | 4 | ||||
| -rw-r--r-- | cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-0c31da326cb0080f0750.json (renamed from cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-435ebb35886eb992308e.json) | 2 | ||||
| -rw-r--r-- | cmake-build-debug/.ninja_deps | bin | 190512 -> 174300 bytes | |||
| -rw-r--r-- | cmake-build-debug/.ninja_log | 54 | ||||
| -rw-r--r-- | cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json | 2 | ||||
| -rw-r--r-- | cmake-build-debug/Testing/Temporary/LastTest.log | 4 | ||||
| -rw-r--r-- | cmake-build-debug/build.ninja | 8 | ||||
| -rw-r--r-- | src/4dvecops/transform4d.cpp | 16 | ||||
| -rw-r--r-- | src/4dvecops/vec4ops.h | 5 |
10 files changed, 48 insertions, 49 deletions
diff --git a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d8c16986ac54f14e6ad2.json b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d0d3fa287e29188e0354.json index 234c68a..a00a375 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d8c16986ac54f14e6ad2.json +++ b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d0d3fa287e29188e0354.json @@ -59,7 +59,7 @@ { "directoryIndex" : 0, "id" : "projects_ray::@6890427a1f51a3e7e1df", - "jsonFile" : "target-projects_ray-Debug-435ebb35886eb992308e.json", + "jsonFile" : "target-projects_ray-Debug-0c31da326cb0080f0750.json", "name" : "projects_ray", "projectIndex" : 0 }, diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-16-15-0499.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-30-06-0529.json index 752320c..e6a9128 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-16-15-0499.json +++ b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T19-30-06-0529.json @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-d8c16986ac54f14e6ad2.json", + "jsonFile" : "codemodel-v2-d0d3fa287e29188e0354.json", "kind" : "codemodel", "version" : { @@ -86,7 +86,7 @@ }, "codemodel-v2" : { - "jsonFile" : "codemodel-v2-d8c16986ac54f14e6ad2.json", + "jsonFile" : "codemodel-v2-d0d3fa287e29188e0354.json", "kind" : "codemodel", "version" : { diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-435ebb35886eb992308e.json b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-0c31da326cb0080f0750.json index 3ae76e6..bcc468c 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-435ebb35886eb992308e.json +++ b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-0c31da326cb0080f0750.json @@ -905,7 +905,7 @@ { "backtrace" : 1, "compileGroupIndex" : 0, - "path" : "src/4dvecops/vec4operations.cpp", + "path" : "src/4dvecops/vec4ops.cpp", "sourceGroupIndex" : 0 }, { diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps Binary files differindex d347892..e937cad 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 374ec09..674598c 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -1,44 +1,32 @@ # ninja log v5 -0 168 1702062975490968165 build.ninja 34bb77e754b05480 -5 30 1702062340090774698 projects_ray_autogen/timestamp d580242d2b9854b3 -34 269 1702062340326491140 CMakeFiles/projects_ray.dir/src/settings.cpp.o 169e2abc4ff9cc00 -5 30 1702062340090774698 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 -5 30 1702062340090774698 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 -5 30 1702062340090774698 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 -405 1189 1702062341245532123 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d7c5f490abfda5be -34 404 1702062340461232090 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o a64c381fddacd090 -1 163 1702062975490968165 build.ninja 34bb77e754b05480 -5 388 1702062975885356000 projects_ray_autogen/timestamp d580242d2b9854b3 -5 388 1702062975885356000 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 -5 388 1702062975885356000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 -5 388 1702062975885356000 /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 +1 163 1702063806513858336 build.ninja 34bb77e754b05480 +37 1002 1702063495670965252 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 41959d435611c983 +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 /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 -388 1150 1702062976649649343 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e +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 +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 -389 1194 1702062976692855035 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273 390 1215 1702062976713930192 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f +7 34 1702063494707727424 projects_ray_autogen/timestamp d580242d2b9854b3 +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 -389 1705 1702062977200217227 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc -1150 1837 1702062977336494519 CMakeFiles/projects_ray.dir/src/4dvecops/transform4d.cpp.o edbb1aa44772a316 -1129 1843 1702062977342546570 CMakeFiles/projects_ray.dir/src/4dvecops/rotations4d.cpp.o ce6e3c7f960de866 -1153 1904 1702062977403040871 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32 +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 -1194 1944 1702062977443687058 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec -1220 1963 1702062977461615794 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a -1215 1995 1702062977494482428 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f -1963 2190 1702062977691669565 CMakeFiles/projects_ray.dir/src/settings.cpp.o 7c89207347735849 -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 +1944 2276 1702062977776055279 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36 +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 +388 1150 1702062976649649343 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e 1904 2623 1702062978121755687 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b +389 1705 1702062977200217227 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc 1843 2626 1702062978126233527 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c -1995 2884 1702062978382551338 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df 2277 3074 1702062978573573842 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd -1934 3161 1702062978659402142 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 2190 3283 1702062978781768457 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3 -7 34 1702063494707727424 projects_ray_autogen/timestamp d580242d2b9854b3 -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 -7 34 1702063494707727424 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 -37 1002 1702063495670965252 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 41959d435611c983 -1002 1148 1702063495820276807 projects_ray 69591c53d0e17f8e 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 9acceb5..8aa0f76 100644 --- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json +++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json @@ -559,7 +559,7 @@ null ], [ - "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4operations.cpp", + "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.cpp", "MU", null ], diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 84b844b..06ce0b3 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:24 EST +Start testing: Dec 08 14:30 EST ---------------------------------------------------------- -End testing: Dec 08 14:24 EST +End testing: Dec 08 14:30 EST diff --git a/cmake-build-debug/build.ninja b/cmake-build-debug/build.ninja index 85377a1..5f75f72 100644 --- a/cmake-build-debug/build.ninja +++ b/cmake-build-debug/build.ninja @@ -225,9 +225,9 @@ 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/vec4operations.cpp.o: CXX_COMPILER__projects_ray_unscanned_Debug /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4operations.cpp || cmake_object_order_depends_target_projects_ray +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 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/vec4operations.cpp.o.d + DEP_FILE = CMakeFiles/projects_ray.dir/src/4dvecops/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 @@ -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/vec4operations.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/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 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/moc /Users/sotech117/Qt/6.5.2/macos/./libexec/uic +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 ############################################# diff --git a/src/4dvecops/transform4d.cpp b/src/4dvecops/transform4d.cpp index 91f0d8c..5cc51f3 100644 --- a/src/4dvecops/transform4d.cpp +++ b/src/4dvecops/transform4d.cpp @@ -1,12 +1,18 @@ -#include "raytracer/raytracer.h" +#include "vec4ops.h" // this is used to transform a 4d point by a 4d matrix and its associated translation // this is motivated by the fact that glm does not support 5d matrices, so we cannot define a mat5 to encapsulate both the rotation and translation in one matrix // therefore, we break the 5d transformation into a 4d rotation and a 4d translation -glm::vec4 transformPoint4(glm::vec4 point4, glm::mat4 transformDirectionMatrix, glm::vec4 translationPointVector) { - // do the translation first - point4 -= translationPointVector; - // do the rotation and scaling +glm::vec4 Vec4Ops::transformPoint4(glm::vec4 point4, glm::mat4 transformDirectionMatrix, glm::vec4 translationPointVector) { + // do the translation then direction point4 = transformDirectionMatrix * point4; + point4 += translationPointVector; + return point4; +} + +glm::vec4 Vec4Ops::inverseTransformPoint4(glm::vec4 point4, glm::mat4 inverseTransformDirectionMatrix, glm::vec4 inverseTranslationPointVector) { + // do the direction then translation + point4 += inverseTranslationPointVector; + point4 = inverseTranslationPointVector * point4; return point4; }
\ No newline at end of file diff --git a/src/4dvecops/vec4ops.h b/src/4dvecops/vec4ops.h index 48d9139..09c7605 100644 --- a/src/4dvecops/vec4ops.h +++ b/src/4dvecops/vec4ops.h @@ -21,6 +21,11 @@ public: static glm::mat4 getRotationMatrix4YW(float angleRadians); static glm::mat4 getRotationMatrix4ZW(float angleRadians); + + glm::vec4 transformPoint4(glm::vec4 point4, glm::mat4 transformDirectionMatrix, glm::vec4 translationPointVector); + + glm::vec4 inverseTransformPoint4(glm::vec4 point4, glm::mat4 inverseTransformDirectionMatrix, + glm::vec4 inverseTranslationPointVector); }; #endif //PROJECTS_RAY_VEC4OPS_H |