From df15d0f234f464f53cfb2480f31a901f9df51ba7 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Fri, 8 Dec 2023 13:58:54 -0500 Subject: cleaup sceneparser.cpp file --- CMakeLists.txt | 1 + .../reply/codemodel-v2-bacf5e2e80ef1d2e1af1.json | 94 -- .../reply/codemodel-v2-d8c16986ac54f14e6ad2.json | 94 ++ .../v1/reply/index-2023-12-08T18-02-24-0883.json | 108 --- .../v1/reply/index-2023-12-08T18-39-18-0017.json | 108 +++ ...et-projects_ray-Debug-435ebb35886eb992308e.json | 942 +++++++++++++++++++++ ...et-projects_ray-Debug-81d0b664d25bd1619433.json | 942 --------------------- .../projects_ray_autogen.dir/AutogenInfo.json | 4 +- cmake-build-debug/Testing/Temporary/LastTest.log | 4 +- cmake-build-debug/build.ninja | 2 +- src/4dvecops/rotations4d.cpp | 28 +- src/4dvecops/vec4ops.h | 26 + src/raytracer/raytracer.h | 3 +- src/utils/sceneparser.cpp | 58 +- src/utils/sceneparser.h | 6 + 15 files changed, 1239 insertions(+), 1181 deletions(-) delete mode 100644 cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-bacf5e2e80ef1d2e1af1.json create mode 100644 cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d8c16986ac54f14e6ad2.json delete mode 100644 cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-02-24-0883.json create mode 100644 cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-39-18-0017.json create mode 100644 cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-435ebb35886eb992308e.json delete mode 100644 cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-81d0b664d25bd1619433.json create mode 100644 src/4dvecops/vec4ops.h diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b2471..3af6982 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,7 @@ add_executable(${PROJECT_NAME} src/4dvecops/vec4operations.cpp src/4dvecops/rotations4d.cpp src/4dvecops/transform4d.cpp + src/4dvecops/vec4ops.h ) # GLM: this creates its library and allows you to `#include "glm/..."` diff --git a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-bacf5e2e80ef1d2e1af1.json b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-bacf5e2e80ef1d2e1af1.json deleted file mode 100644 index f24fa75..0000000 --- a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-bacf5e2e80ef1d2e1af1.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "configurations" : - [ - { - "directories" : - [ - { - "build" : ".", - "childIndexes" : - [ - 1 - ], - "jsonFile" : "directory-.-Debug-f5ebdc15457944623624.json", - "minimumCMakeVersion" : - { - "string" : "3.16" - }, - "projectIndex" : 0, - "source" : ".", - "targetIndexes" : - [ - 0, - 1, - 2 - ] - }, - { - "build" : "glm", - "jsonFile" : "directory-glm-Debug-2bef2a2728e6bac3f360.json", - "minimumCMakeVersion" : - { - "string" : "3.16" - }, - "parentIndex" : 0, - "projectIndex" : 0, - "source" : "glm" - } - ], - "name" : "Debug", - "projects" : - [ - { - "directoryIndexes" : - [ - 0, - 1 - ], - "name" : "projects_ray", - "targetIndexes" : - [ - 0, - 1, - 2 - ] - } - ], - "targets" : - [ - { - "directoryIndex" : 0, - "id" : "projects_ray::@6890427a1f51a3e7e1df", - "jsonFile" : "target-projects_ray-Debug-81d0b664d25bd1619433.json", - "name" : "projects_ray", - "projectIndex" : 0 - }, - { - "directoryIndex" : 0, - "id" : "projects_ray_autogen::@6890427a1f51a3e7e1df", - "jsonFile" : "target-projects_ray_autogen-Debug-e02ef12cced0b8364953.json", - "name" : "projects_ray_autogen", - "projectIndex" : 0 - }, - { - "directoryIndex" : 0, - "id" : "projects_ray_autogen_timestamp_deps::@6890427a1f51a3e7e1df", - "jsonFile" : "target-projects_ray_autogen_timestamp_deps-Debug-55dec22dd9da92fe9f6e.json", - "name" : "projects_ray_autogen_timestamp_deps", - "projectIndex" : 0 - } - ] - } - ], - "kind" : "codemodel", - "paths" : - { - "build" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug", - "source" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230" - }, - "version" : - { - "major" : 2, - "minor" : 5 - } -} diff --git a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d8c16986ac54f14e6ad2.json b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d8c16986ac54f14e6ad2.json new file mode 100644 index 0000000..234c68a --- /dev/null +++ b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-d8c16986ac54f14e6ad2.json @@ -0,0 +1,94 @@ +{ + "configurations" : + [ + { + "directories" : + [ + { + "build" : ".", + "childIndexes" : + [ + 1 + ], + "jsonFile" : "directory-.-Debug-f5ebdc15457944623624.json", + "minimumCMakeVersion" : + { + "string" : "3.16" + }, + "projectIndex" : 0, + "source" : ".", + "targetIndexes" : + [ + 0, + 1, + 2 + ] + }, + { + "build" : "glm", + "jsonFile" : "directory-glm-Debug-2bef2a2728e6bac3f360.json", + "minimumCMakeVersion" : + { + "string" : "3.16" + }, + "parentIndex" : 0, + "projectIndex" : 0, + "source" : "glm" + } + ], + "name" : "Debug", + "projects" : + [ + { + "directoryIndexes" : + [ + 0, + 1 + ], + "name" : "projects_ray", + "targetIndexes" : + [ + 0, + 1, + 2 + ] + } + ], + "targets" : + [ + { + "directoryIndex" : 0, + "id" : "projects_ray::@6890427a1f51a3e7e1df", + "jsonFile" : "target-projects_ray-Debug-435ebb35886eb992308e.json", + "name" : "projects_ray", + "projectIndex" : 0 + }, + { + "directoryIndex" : 0, + "id" : "projects_ray_autogen::@6890427a1f51a3e7e1df", + "jsonFile" : "target-projects_ray_autogen-Debug-e02ef12cced0b8364953.json", + "name" : "projects_ray_autogen", + "projectIndex" : 0 + }, + { + "directoryIndex" : 0, + "id" : "projects_ray_autogen_timestamp_deps::@6890427a1f51a3e7e1df", + "jsonFile" : "target-projects_ray_autogen_timestamp_deps-Debug-55dec22dd9da92fe9f6e.json", + "name" : "projects_ray_autogen_timestamp_deps", + "projectIndex" : 0 + } + ] + } + ], + "kind" : "codemodel", + "paths" : + { + "build" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug", + "source" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230" + }, + "version" : + { + "major" : 2, + "minor" : 5 + } +} diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-02-24-0883.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-02-24-0883.json deleted file mode 100644 index d1fbb20..0000000 --- a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-02-24-0883.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "cmake" : - { - "generator" : - { - "multiConfig" : false, - "name" : "Ninja" - }, - "paths" : - { - "cmake" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/bin/cmake", - "cpack" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/bin/cpack", - "ctest" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/bin/ctest", - "root" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26" - }, - "version" : - { - "isDirty" : false, - "major" : 3, - "minor" : 26, - "patch" : 4, - "string" : "3.26.4", - "suffix" : "" - } - }, - "objects" : - [ - { - "jsonFile" : "codemodel-v2-bacf5e2e80ef1d2e1af1.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 5 - } - }, - { - "jsonFile" : "cache-v2-14565ebda493f470ac4d.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - { - "jsonFile" : "cmakeFiles-v1-544cfdd119240b345b7d.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - }, - { - "jsonFile" : "toolchains-v1-577ea0f3a8aa7156cbd5.json", - "kind" : "toolchains", - "version" : - { - "major" : 1, - "minor" : 0 - } - } - ], - "reply" : - { - "cache-v2" : - { - "jsonFile" : "cache-v2-14565ebda493f470ac4d.json", - "kind" : "cache", - "version" : - { - "major" : 2, - "minor" : 0 - } - }, - "cmakeFiles-v1" : - { - "jsonFile" : "cmakeFiles-v1-544cfdd119240b345b7d.json", - "kind" : "cmakeFiles", - "version" : - { - "major" : 1, - "minor" : 0 - } - }, - "codemodel-v2" : - { - "jsonFile" : "codemodel-v2-bacf5e2e80ef1d2e1af1.json", - "kind" : "codemodel", - "version" : - { - "major" : 2, - "minor" : 5 - } - }, - "toolchains-v1" : - { - "jsonFile" : "toolchains-v1-577ea0f3a8aa7156cbd5.json", - "kind" : "toolchains", - "version" : - { - "major" : 1, - "minor" : 0 - } - } - } -} diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-39-18-0017.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-39-18-0017.json new file mode 100644 index 0000000..752320c --- /dev/null +++ b/cmake-build-debug/.cmake/api/v1/reply/index-2023-12-08T18-39-18-0017.json @@ -0,0 +1,108 @@ +{ + "cmake" : + { + "generator" : + { + "multiConfig" : false, + "name" : "Ninja" + }, + "paths" : + { + "cmake" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/bin/cmake", + "cpack" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/bin/cpack", + "ctest" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/bin/ctest", + "root" : "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26" + }, + "version" : + { + "isDirty" : false, + "major" : 3, + "minor" : 26, + "patch" : 4, + "string" : "3.26.4", + "suffix" : "" + } + }, + "objects" : + [ + { + "jsonFile" : "codemodel-v2-d8c16986ac54f14e6ad2.json", + "kind" : "codemodel", + "version" : + { + "major" : 2, + "minor" : 5 + } + }, + { + "jsonFile" : "cache-v2-14565ebda493f470ac4d.json", + "kind" : "cache", + "version" : + { + "major" : 2, + "minor" : 0 + } + }, + { + "jsonFile" : "cmakeFiles-v1-544cfdd119240b345b7d.json", + "kind" : "cmakeFiles", + "version" : + { + "major" : 1, + "minor" : 0 + } + }, + { + "jsonFile" : "toolchains-v1-577ea0f3a8aa7156cbd5.json", + "kind" : "toolchains", + "version" : + { + "major" : 1, + "minor" : 0 + } + } + ], + "reply" : + { + "cache-v2" : + { + "jsonFile" : "cache-v2-14565ebda493f470ac4d.json", + "kind" : "cache", + "version" : + { + "major" : 2, + "minor" : 0 + } + }, + "cmakeFiles-v1" : + { + "jsonFile" : "cmakeFiles-v1-544cfdd119240b345b7d.json", + "kind" : "cmakeFiles", + "version" : + { + "major" : 1, + "minor" : 0 + } + }, + "codemodel-v2" : + { + "jsonFile" : "codemodel-v2-d8c16986ac54f14e6ad2.json", + "kind" : "codemodel", + "version" : + { + "major" : 2, + "minor" : 5 + } + }, + "toolchains-v1" : + { + "jsonFile" : "toolchains-v1-577ea0f3a8aa7156cbd5.json", + "kind" : "toolchains", + "version" : + { + "major" : 1, + "minor" : 0 + } + } + } +} 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-435ebb35886eb992308e.json new file mode 100644 index 0000000..3ae76e6 --- /dev/null +++ b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-435ebb35886eb992308e.json @@ -0,0 +1,942 @@ +{ + "artifacts" : + [ + { + "path" : "projects_ray" + } + ], + "backtrace" : 1, + "backtraceGraph" : + { + "commands" : + [ + "add_executable", + "set_target_properties", + "include", + "find_package", + "find_dependency", + "_qt_internal_find_qt_dependencies", + "add_definitions", + "target_link_libraries", + "include_directories" + ], + "files" : + [ + "CMakeLists.txt", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Concurrent/Qt6ConcurrentVersionlessTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Concurrent/Qt6ConcurrentConfig.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6/Qt6Config.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Xml/Qt6XmlConfig.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsVersionlessTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsConfig.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Widgets/Qt6WidgetsVersionlessTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Widgets/Qt6WidgetsConfig.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Gui/Qt6GuiVersionlessTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Gui/Qt6GuiConfig.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Core/Qt6CoreVersionlessTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Core/Qt6CoreConfig.cmake", + "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeFindDependencyMacro.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6/QtPublicDependencyHelpers.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Concurrent/Qt6ConcurrentDependencies.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Core/Qt6CoreTargets.cmake", + "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Gui/Qt6GuiTargets.cmake" + ], + "nodes" : + [ + { + "file" : 0 + }, + { + "command" : 0, + "file" : 0, + "line" : 30, + "parent" : 0 + }, + { + "command" : 3, + "file" : 0, + "line" : 17, + "parent" : 0 + }, + { + "file" : 3, + "parent" : 2 + }, + { + "command" : 3, + "file" : 3, + "line" : 157, + "parent" : 3 + }, + { + "file" : 2, + "parent" : 4 + }, + { + "command" : 2, + "file" : 2, + "line" : 55, + "parent" : 5 + }, + { + "file" : 1, + "parent" : 6 + }, + { + "command" : 1, + "file" : 1, + "line" : 61, + "parent" : 7 + }, + { + "command" : 3, + "file" : 0, + "line" : 20, + "parent" : 0 + }, + { + "file" : 3, + "parent" : 9 + }, + { + "command" : 3, + "file" : 3, + "line" : 157, + "parent" : 10 + }, + { + "file" : 5, + "parent" : 11 + }, + { + "command" : 2, + "file" : 5, + "line" : 55, + "parent" : 12 + }, + { + "file" : 4, + "parent" : 13 + }, + { + "command" : 1, + "file" : 4, + "line" : 61, + "parent" : 14 + }, + { + "command" : 3, + "file" : 0, + "line" : 22, + "parent" : 0 + }, + { + "file" : 3, + "parent" : 16 + }, + { + "command" : 3, + "file" : 3, + "line" : 157, + "parent" : 17 + }, + { + "file" : 7, + "parent" : 18 + }, + { + "command" : 2, + "file" : 7, + "line" : 55, + "parent" : 19 + }, + { + "file" : 6, + "parent" : 20 + }, + { + "command" : 1, + "file" : 6, + "line" : 61, + "parent" : 21 + }, + { + "command" : 3, + "file" : 0, + "line" : 21, + "parent" : 0 + }, + { + "file" : 3, + "parent" : 23 + }, + { + "command" : 3, + "file" : 3, + "line" : 157, + "parent" : 24 + }, + { + "file" : 9, + "parent" : 25 + }, + { + "command" : 2, + "file" : 9, + "line" : 55, + "parent" : 26 + }, + { + "file" : 8, + "parent" : 27 + }, + { + "command" : 1, + "file" : 8, + "line" : 61, + "parent" : 28 + }, + { + "command" : 2, + "file" : 7, + "line" : 52, + "parent" : 19 + }, + { + "file" : 10, + "parent" : 30 + }, + { + "command" : 1, + "file" : 10, + "line" : 62, + "parent" : 31 + }, + { + "command" : 3, + "file" : 0, + "line" : 19, + "parent" : 0 + }, + { + "file" : 3, + "parent" : 33 + }, + { + "command" : 3, + "file" : 3, + "line" : 157, + "parent" : 34 + }, + { + "file" : 12, + "parent" : 35 + }, + { + "command" : 2, + "file" : 12, + "line" : 55, + "parent" : 36 + }, + { + "file" : 11, + "parent" : 37 + }, + { + "command" : 1, + "file" : 11, + "line" : 61, + "parent" : 38 + }, + { + "command" : 2, + "file" : 2, + "line" : 40, + "parent" : 5 + }, + { + "file" : 17, + "parent" : 40 + }, + { + "command" : 5, + "file" : 17, + "line" : 39, + "parent" : 41 + }, + { + "command" : 4, + "file" : 16, + "line" : 111, + "parent" : 42 + }, + { + "command" : 3, + "file" : 15, + "line" : 76, + "parent" : 43 + }, + { + "file" : 14, + "parent" : 44 + }, + { + "command" : 2, + "file" : 14, + "line" : 55, + "parent" : 45 + }, + { + "file" : 13, + "parent" : 46 + }, + { + "command" : 1, + "file" : 13, + "line" : 61, + "parent" : 47 + }, + { + "command" : 2, + "file" : 14, + "line" : 52, + "parent" : 45 + }, + { + "file" : 18, + "parent" : 49 + }, + { + "command" : 1, + "file" : 18, + "line" : 62, + "parent" : 50 + }, + { + "command" : 2, + "file" : 12, + "line" : 52, + "parent" : 36 + }, + { + "file" : 19, + "parent" : 52 + }, + { + "command" : 1, + "file" : 19, + "line" : 62, + "parent" : 53 + }, + { + "command" : 6, + "file" : 0, + "line" : 27, + "parent" : 0 + }, + { + "command" : 7, + "file" : 0, + "line" : 75, + "parent" : 0 + }, + { + "command" : 8, + "file" : 0, + "line" : 25, + "parent" : 0 + } + ] + }, + "compileGroups" : + [ + { + "compileCommandFragments" : + [ + { + "fragment" : "-Wno-deprecated-volatile -g -std=gnu++20 -arch arm64 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk -fcolor-diagnostics" + } + ], + "defines" : + [ + { + "backtrace" : 55, + "define" : "GLM_FORCE_SWIZZLE" + }, + { + "backtrace" : 56, + "define" : "QT_CONCURRENT_LIB" + }, + { + "backtrace" : 56, + "define" : "QT_CORE_LIB" + }, + { + "backtrace" : 56, + "define" : "QT_GUI_LIB" + }, + { + "backtrace" : 56, + "define" : "QT_OPENGLWIDGETS_LIB" + }, + { + "backtrace" : 56, + "define" : "QT_OPENGL_LIB" + }, + { + "backtrace" : 56, + "define" : "QT_WIDGETS_LIB" + }, + { + "backtrace" : 56, + "define" : "QT_XML_LIB" + } + ], + "includes" : + [ + { + "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug" + }, + { + "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230" + }, + { + "backtrace" : 0, + "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/include" + }, + { + "backtrace" : 57, + "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Headers" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Headers" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/mkspecs/macx-clang" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/include" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Headers" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Headers" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Headers" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Headers" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Headers" + }, + { + "backtrace" : 56, + "isSystem" : true, + "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework" + } + ], + "language" : "CXX", + "languageStandard" : + { + "backtraces" : + [ + 56, + 56 + ], + "standard" : "20" + }, + "sourceIndexes" : + [ + 0, + 1, + 2, + 5, + 6, + 7, + 8, + 9, + 10, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 32, + 34, + 35, + 36 + ] + } + ], + "dependencies" : + [ + { + "id" : "projects_ray_autogen_timestamp_deps::@6890427a1f51a3e7e1df" + }, + { + "backtrace" : 0, + "id" : "projects_ray_autogen::@6890427a1f51a3e7e1df" + } + ], + "id" : "projects_ray::@6890427a1f51a3e7e1df", + "link" : + { + "commandFragments" : + [ + { + "fragment" : "-Wno-deprecated-volatile -g", + "role" : "flags" + }, + { + "fragment" : "", + "role" : "flags" + }, + { + "fragment" : "-F/Users/sotech117/Qt/6.5.2/macos/lib", + "role" : "frameworkPath" + }, + { + "fragment" : "-Wl,-rpath,/Users/sotech117/Qt/6.5.2/macos/lib", + "role" : "libraries" + }, + { + "backtrace" : 8, + "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent", + "role" : "libraries" + }, + { + "backtrace" : 15, + "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml", + "role" : "libraries" + }, + { + "backtrace" : 22, + "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets", + "role" : "libraries" + }, + { + "backtrace" : 29, + "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets", + "role" : "libraries" + }, + { + "backtrace" : 32, + "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL", + "role" : "libraries" + }, + { + "backtrace" : 39, + "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui", + "role" : "libraries" + }, + { + "backtrace" : 48, + "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore", + "role" : "libraries" + }, + { + "backtrace" : 51, + "fragment" : "-framework IOKit", + "role" : "libraries" + }, + { + "backtrace" : 51, + "fragment" : "-framework DiskArbitration", + "role" : "libraries" + }, + { + "fragment" : "-Xlinker -framework -Xlinker OpenGL", + "role" : "libraries" + }, + { + "fragment" : "-Xlinker -framework -Xlinker AGL", + "role" : "libraries" + }, + { + "backtrace" : 54, + "fragment" : "-framework AppKit", + "role" : "libraries" + }, + { + "backtrace" : 54, + "fragment" : "-framework ImageIO", + "role" : "libraries" + }, + { + "backtrace" : 54, + "fragment" : "-framework Metal", + "role" : "libraries" + } + ], + "language" : "CXX" + }, + "name" : "projects_ray", + "nameOnDisk" : "projects_ray", + "paths" : + { + "build" : ".", + "source" : "." + }, + "sourceGroups" : + [ + { + "name" : "Source Files", + "sourceIndexes" : + [ + 0, + 1, + 2, + 5, + 6, + 7, + 8, + 9, + 10, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 32, + 34, + 35, + 36 + ] + }, + { + "name" : "Header Files", + "sourceIndexes" : + [ + 3, + 4, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 31, + 33, + 37 + ] + }, + { + "name" : "", + "sourceIndexes" : + [ + 38 + ] + }, + { + "name" : "CMake Rules", + "sourceIndexes" : + [ + 39 + ] + } + ], + "sources" : + [ + { + "backtrace" : 0, + "compileGroupIndex" : 0, + "isGenerated" : true, + "path" : "cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/main.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/mainwindow.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "src/mainwindow.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/settings.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/settings.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/camera/camera.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/raytracer/raytracer.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/raytracer/raytracescene.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/utils/scenefilereader.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/utils/sceneparser.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "src/camera/camera.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/raytracer/raytracer.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/raytracer/raytracescene.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/utils/rgba.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/utils/scenedata.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/utils/scenefilereader.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/utils/aspectratiowidget/aspectratiowidget.hpp", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "path" : "src/utils/sceneparser.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/intersect/intersect.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/illuminate/illuminate.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/illuminate/shadow.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/illuminate/reflect.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/texture/texture.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/intersect/normals.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/utils/raytracerutils.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/aliasing/supersample.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/aliasing/filter.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/accelerate/myqthreads.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/accelerate/myqtconcurrent.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/accelerate/kdtree.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "src/accelerate/kdtree.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/accelerate/bvh.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "src/accelerate/bvh.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/4dvecops/vec4operations.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/4dvecops/rotations4d.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/4dvecops/transform4d.cpp", + "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "path" : "src/4dvecops/vec4ops.h", + "sourceGroupIndex" : 1 + }, + { + "backtrace" : 0, + "isGenerated" : true, + "path" : "cmake-build-debug/projects_ray_autogen/timestamp", + "sourceGroupIndex" : 2 + }, + { + "backtrace" : 0, + "isGenerated" : true, + "path" : "cmake-build-debug/projects_ray_autogen/timestamp.rule", + "sourceGroupIndex" : 3 + } + ], + "type" : "EXECUTABLE" +} diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-81d0b664d25bd1619433.json b/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-81d0b664d25bd1619433.json deleted file mode 100644 index fe0f381..0000000 --- a/cmake-build-debug/.cmake/api/v1/reply/target-projects_ray-Debug-81d0b664d25bd1619433.json +++ /dev/null @@ -1,942 +0,0 @@ -{ - "artifacts" : - [ - { - "path" : "projects_ray" - } - ], - "backtrace" : 1, - "backtraceGraph" : - { - "commands" : - [ - "add_executable", - "set_target_properties", - "include", - "find_package", - "find_dependency", - "_qt_internal_find_qt_dependencies", - "add_definitions", - "target_link_libraries", - "include_directories" - ], - "files" : - [ - "CMakeLists.txt", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Concurrent/Qt6ConcurrentVersionlessTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Concurrent/Qt6ConcurrentConfig.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6/Qt6Config.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Xml/Qt6XmlConfig.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsVersionlessTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsConfig.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Widgets/Qt6WidgetsVersionlessTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Widgets/Qt6WidgetsConfig.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6OpenGLWidgets/Qt6OpenGLWidgetsTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Gui/Qt6GuiVersionlessTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Gui/Qt6GuiConfig.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Core/Qt6CoreVersionlessTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Core/Qt6CoreConfig.cmake", - "/Users/sotech117/Library/Application Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeFindDependencyMacro.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6/QtPublicDependencyHelpers.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Concurrent/Qt6ConcurrentDependencies.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Core/Qt6CoreTargets.cmake", - "/Users/sotech117/Qt/6.5.2/macos/lib/cmake/Qt6Gui/Qt6GuiTargets.cmake" - ], - "nodes" : - [ - { - "file" : 0 - }, - { - "command" : 0, - "file" : 0, - "line" : 30, - "parent" : 0 - }, - { - "command" : 3, - "file" : 0, - "line" : 17, - "parent" : 0 - }, - { - "file" : 3, - "parent" : 2 - }, - { - "command" : 3, - "file" : 3, - "line" : 157, - "parent" : 3 - }, - { - "file" : 2, - "parent" : 4 - }, - { - "command" : 2, - "file" : 2, - "line" : 55, - "parent" : 5 - }, - { - "file" : 1, - "parent" : 6 - }, - { - "command" : 1, - "file" : 1, - "line" : 61, - "parent" : 7 - }, - { - "command" : 3, - "file" : 0, - "line" : 20, - "parent" : 0 - }, - { - "file" : 3, - "parent" : 9 - }, - { - "command" : 3, - "file" : 3, - "line" : 157, - "parent" : 10 - }, - { - "file" : 5, - "parent" : 11 - }, - { - "command" : 2, - "file" : 5, - "line" : 55, - "parent" : 12 - }, - { - "file" : 4, - "parent" : 13 - }, - { - "command" : 1, - "file" : 4, - "line" : 61, - "parent" : 14 - }, - { - "command" : 3, - "file" : 0, - "line" : 22, - "parent" : 0 - }, - { - "file" : 3, - "parent" : 16 - }, - { - "command" : 3, - "file" : 3, - "line" : 157, - "parent" : 17 - }, - { - "file" : 7, - "parent" : 18 - }, - { - "command" : 2, - "file" : 7, - "line" : 55, - "parent" : 19 - }, - { - "file" : 6, - "parent" : 20 - }, - { - "command" : 1, - "file" : 6, - "line" : 61, - "parent" : 21 - }, - { - "command" : 3, - "file" : 0, - "line" : 21, - "parent" : 0 - }, - { - "file" : 3, - "parent" : 23 - }, - { - "command" : 3, - "file" : 3, - "line" : 157, - "parent" : 24 - }, - { - "file" : 9, - "parent" : 25 - }, - { - "command" : 2, - "file" : 9, - "line" : 55, - "parent" : 26 - }, - { - "file" : 8, - "parent" : 27 - }, - { - "command" : 1, - "file" : 8, - "line" : 61, - "parent" : 28 - }, - { - "command" : 2, - "file" : 7, - "line" : 52, - "parent" : 19 - }, - { - "file" : 10, - "parent" : 30 - }, - { - "command" : 1, - "file" : 10, - "line" : 62, - "parent" : 31 - }, - { - "command" : 3, - "file" : 0, - "line" : 19, - "parent" : 0 - }, - { - "file" : 3, - "parent" : 33 - }, - { - "command" : 3, - "file" : 3, - "line" : 157, - "parent" : 34 - }, - { - "file" : 12, - "parent" : 35 - }, - { - "command" : 2, - "file" : 12, - "line" : 55, - "parent" : 36 - }, - { - "file" : 11, - "parent" : 37 - }, - { - "command" : 1, - "file" : 11, - "line" : 61, - "parent" : 38 - }, - { - "command" : 2, - "file" : 2, - "line" : 40, - "parent" : 5 - }, - { - "file" : 17, - "parent" : 40 - }, - { - "command" : 5, - "file" : 17, - "line" : 39, - "parent" : 41 - }, - { - "command" : 4, - "file" : 16, - "line" : 111, - "parent" : 42 - }, - { - "command" : 3, - "file" : 15, - "line" : 76, - "parent" : 43 - }, - { - "file" : 14, - "parent" : 44 - }, - { - "command" : 2, - "file" : 14, - "line" : 55, - "parent" : 45 - }, - { - "file" : 13, - "parent" : 46 - }, - { - "command" : 1, - "file" : 13, - "line" : 61, - "parent" : 47 - }, - { - "command" : 2, - "file" : 14, - "line" : 52, - "parent" : 45 - }, - { - "file" : 18, - "parent" : 49 - }, - { - "command" : 1, - "file" : 18, - "line" : 62, - "parent" : 50 - }, - { - "command" : 2, - "file" : 12, - "line" : 52, - "parent" : 36 - }, - { - "file" : 19, - "parent" : 52 - }, - { - "command" : 1, - "file" : 19, - "line" : 62, - "parent" : 53 - }, - { - "command" : 6, - "file" : 0, - "line" : 27, - "parent" : 0 - }, - { - "command" : 7, - "file" : 0, - "line" : 75, - "parent" : 0 - }, - { - "command" : 8, - "file" : 0, - "line" : 25, - "parent" : 0 - } - ] - }, - "compileGroups" : - [ - { - "compileCommandFragments" : - [ - { - "fragment" : "-Wno-deprecated-volatile -g -std=gnu++20 -arch arm64 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk -fcolor-diagnostics" - } - ], - "defines" : - [ - { - "backtrace" : 55, - "define" : "GLM_FORCE_SWIZZLE" - }, - { - "backtrace" : 56, - "define" : "QT_CONCURRENT_LIB" - }, - { - "backtrace" : 56, - "define" : "QT_CORE_LIB" - }, - { - "backtrace" : 56, - "define" : "QT_GUI_LIB" - }, - { - "backtrace" : 56, - "define" : "QT_OPENGLWIDGETS_LIB" - }, - { - "backtrace" : 56, - "define" : "QT_OPENGL_LIB" - }, - { - "backtrace" : 56, - "define" : "QT_WIDGETS_LIB" - }, - { - "backtrace" : 56, - "define" : "QT_XML_LIB" - } - ], - "includes" : - [ - { - "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug" - }, - { - "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230" - }, - { - "backtrace" : 0, - "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/include" - }, - { - "backtrace" : 57, - "path" : "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Headers" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Headers" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/mkspecs/macx-clang" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/include" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Headers" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Headers" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Headers" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Headers" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Headers" - }, - { - "backtrace" : 56, - "isSystem" : true, - "path" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework" - } - ], - "language" : "CXX", - "languageStandard" : - { - "backtraces" : - [ - 56, - 56 - ], - "standard" : "20" - }, - "sourceIndexes" : - [ - 0, - 1, - 2, - 5, - 6, - 7, - 8, - 9, - 10, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 32, - 34, - 35, - 36 - ] - } - ], - "dependencies" : - [ - { - "backtrace" : 0, - "id" : "projects_ray_autogen::@6890427a1f51a3e7e1df" - }, - { - "id" : "projects_ray_autogen_timestamp_deps::@6890427a1f51a3e7e1df" - } - ], - "id" : "projects_ray::@6890427a1f51a3e7e1df", - "link" : - { - "commandFragments" : - [ - { - "fragment" : "-Wno-deprecated-volatile -g", - "role" : "flags" - }, - { - "fragment" : "", - "role" : "flags" - }, - { - "fragment" : "-F/Users/sotech117/Qt/6.5.2/macos/lib", - "role" : "frameworkPath" - }, - { - "fragment" : "-Wl,-rpath,/Users/sotech117/Qt/6.5.2/macos/lib", - "role" : "libraries" - }, - { - "backtrace" : 8, - "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtConcurrent.framework/Versions/A/QtConcurrent", - "role" : "libraries" - }, - { - "backtrace" : 15, - "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtXml.framework/Versions/A/QtXml", - "role" : "libraries" - }, - { - "backtrace" : 22, - "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/QtOpenGLWidgets", - "role" : "libraries" - }, - { - "backtrace" : 29, - "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/QtWidgets", - "role" : "libraries" - }, - { - "backtrace" : 32, - "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGL.framework/Versions/A/QtOpenGL", - "role" : "libraries" - }, - { - "backtrace" : 39, - "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/QtGui", - "role" : "libraries" - }, - { - "backtrace" : 48, - "fragment" : "/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/QtCore", - "role" : "libraries" - }, - { - "backtrace" : 51, - "fragment" : "-framework IOKit", - "role" : "libraries" - }, - { - "backtrace" : 51, - "fragment" : "-framework DiskArbitration", - "role" : "libraries" - }, - { - "fragment" : "-Xlinker -framework -Xlinker OpenGL", - "role" : "libraries" - }, - { - "fragment" : "-Xlinker -framework -Xlinker AGL", - "role" : "libraries" - }, - { - "backtrace" : 54, - "fragment" : "-framework AppKit", - "role" : "libraries" - }, - { - "backtrace" : 54, - "fragment" : "-framework ImageIO", - "role" : "libraries" - }, - { - "backtrace" : 54, - "fragment" : "-framework Metal", - "role" : "libraries" - } - ], - "language" : "CXX" - }, - "name" : "projects_ray", - "nameOnDisk" : "projects_ray", - "paths" : - { - "build" : ".", - "source" : "." - }, - "sourceGroups" : - [ - { - "name" : "Source Files", - "sourceIndexes" : - [ - 0, - 1, - 2, - 5, - 6, - 7, - 8, - 9, - 10, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 32, - 34, - 35, - 36 - ] - }, - { - "name" : "Header Files", - "sourceIndexes" : - [ - 3, - 4, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 31, - 33, - 37 - ] - }, - { - "name" : "", - "sourceIndexes" : - [ - 38 - ] - }, - { - "name" : "CMake Rules", - "sourceIndexes" : - [ - 39 - ] - } - ], - "sources" : - [ - { - "backtrace" : 0, - "compileGroupIndex" : 0, - "isGenerated" : true, - "path" : "cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/main.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/mainwindow.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "path" : "src/mainwindow.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/settings.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/settings.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/camera/camera.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/raytracer/raytracer.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/raytracer/raytracescene.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/utils/scenefilereader.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/utils/sceneparser.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "path" : "src/camera/camera.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/raytracer/raytracer.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/raytracer/raytracescene.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/utils/rgba.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/utils/scenedata.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/utils/scenefilereader.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/utils/aspectratiowidget/aspectratiowidget.hpp", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "path" : "src/utils/sceneparser.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/intersect/intersect.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/illuminate/illuminate.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/illuminate/shadow.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/illuminate/reflect.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/texture/texture.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/intersect/normals.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/utils/raytracerutils.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/aliasing/supersample.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/aliasing/filter.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/accelerate/myqthreads.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/accelerate/myqtconcurrent.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/accelerate/kdtree.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "path" : "src/accelerate/kdtree.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/accelerate/bvh.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "path" : "src/accelerate/bvh.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/4dvecops/vec4operations.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/4dvecops/rotations4d.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "compileGroupIndex" : 0, - "path" : "src/4dvecops/transform4d.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 1, - "path" : "src/4dvecops/transform4d.h", - "sourceGroupIndex" : 1 - }, - { - "backtrace" : 0, - "isGenerated" : true, - "path" : "cmake-build-debug/projects_ray_autogen/timestamp", - "sourceGroupIndex" : 2 - }, - { - "backtrace" : 0, - "isGenerated" : true, - "path" : "cmake-build-debug/projects_ray_autogen/timestamp.rule", - "sourceGroupIndex" : 3 - } - ], - "type" : "EXECUTABLE" -} 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 bf8fbd3..9acceb5 100644 --- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json +++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/AutogenInfo.json @@ -392,9 +392,9 @@ "HEADERS" : [ [ - "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.h", + "/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h", "MU", - "SDN2X6DTVW/moc_transform4d.cpp", + "SDN2X6DTVW/moc_vec4ops.cpp", null ], [ diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index b8aa3dd..0c30d59 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 13:02 EST +Start testing: Dec 08 13:39 EST ---------------------------------------------------------- -End testing: Dec 08 13:02 EST +End testing: Dec 08 13:39 EST diff --git a/cmake-build-debug/build.ninja b/cmake-build-debug/build.ninja index 5304fab..85377a1 100644 --- a/cmake-build-debug/build.ninja +++ b/cmake-build-debug/build.ninja @@ -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/4dvecops/rotations4d.cpp b/src/4dvecops/rotations4d.cpp index 62746eb..4943c7f 100644 --- a/src/4dvecops/rotations4d.cpp +++ b/src/4dvecops/rotations4d.cpp @@ -1,6 +1,7 @@ #include "raytracer/raytracer.h" +#include "4dvecops/vec4ops.h" -glm::mat4 getRotationMatrix4XY( +glm::mat4 Vec4Ops::getRotationMatrix4XY( float angleRadians) { glm::mat4 result; result[0][0] = cos(angleRadians); @@ -12,7 +13,7 @@ glm::mat4 getRotationMatrix4XY( return result; } -glm::mat4 getRotationMatrix4YZ( +glm::mat4 Vec4Ops::getRotationMatrix4YZ( float angleRadians) { glm::mat4 result; result[1][1] = cos(angleRadians); @@ -24,7 +25,7 @@ glm::mat4 getRotationMatrix4YZ( return result; } -glm::mat4 getRotationMatrix4ZX( +glm::mat4 Vec4Ops::getRotationMatrix4ZX( float angleRadians) { glm::mat4 result; result[2][2] = cos(angleRadians); @@ -36,7 +37,7 @@ glm::mat4 getRotationMatrix4ZX( return result; } -glm::mat4 getRotationMatrix4XW( +glm::mat4 Vec4Ops::getRotationMatrix4XW( float angleRadians) { glm::mat4 result; result[0][0] = cos(angleRadians); @@ -48,7 +49,7 @@ glm::mat4 getRotationMatrix4XW( return result; } -glm::mat4 getRotationMatrix4YW( +glm::mat4 Vec4Ops::getRotationMatrix4YW( float angleRadians) { glm::mat4 result; result[1][1] = cos(angleRadians); @@ -60,7 +61,7 @@ glm::mat4 getRotationMatrix4YW( return result; } -glm::mat4 getRotationMatrix4ZW( +glm::mat4 Vec4Ops::getRotationMatrix4ZW( float angleRadians) { glm::mat4 result; result[2][2] = cos(angleRadians); @@ -70,19 +71,4 @@ glm::mat4 getRotationMatrix4ZW( result[0][0] = 1; result[1][1] = 1; return result; -} - -glm::mat4 RayTracer::getRotationMatrix4( - float angleRadiansXY, - float angleRadiansYZ, - float angleRadiansZX, - float angleRadiansXW, - float angleRadiansYW, - float angleRadiansZW) { - return getRotationMatrix4XY(angleRadiansXY) * - getRotationMatrix4YZ(angleRadiansYZ) * - getRotationMatrix4ZX(angleRadiansZX) * - getRotationMatrix4XW(angleRadiansXW) * - getRotationMatrix4YW(angleRadiansYW) * - getRotationMatrix4ZW(angleRadiansZW); } \ No newline at end of file diff --git a/src/4dvecops/vec4ops.h b/src/4dvecops/vec4ops.h new file mode 100644 index 0000000..48d9139 --- /dev/null +++ b/src/4dvecops/vec4ops.h @@ -0,0 +1,26 @@ +// +// Created by Michael Foiani on 12/8/23. +// + +#ifndef PROJECTS_RAY_VEC4OPS_H +#define PROJECTS_RAY_VEC4OPS_H + +#include + +class Vec4Ops { +public: + + static glm::mat4 getRotationMatrix4XY(float angleRadians); + + static glm::mat4 getRotationMatrix4YZ(float angleRadians); + + static glm::mat4 getRotationMatrix4ZX(float angleRadians); + + static glm::mat4 getRotationMatrix4XW(float angleRadians); + + static glm::mat4 getRotationMatrix4YW(float angleRadians); + + static glm::mat4 getRotationMatrix4ZW(float angleRadians); +}; + +#endif //PROJECTS_RAY_VEC4OPS_H diff --git a/src/raytracer/raytracer.h b/src/raytracer/raytracer.h index 4bdca6f..4df9200 100644 --- a/src/raytracer/raytracer.h +++ b/src/raytracer/raytracer.h @@ -165,8 +165,7 @@ public: void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; - glm::mat4 getRotationMatrix4(float angleRadiansXY, float angleRadiansYZ, float angleRadiansZX, float angleRadiansXW, - float angleRadiansYW, float angleRadiansZW); + glm::mat4 getRotationMatrix4(float angle, glm::vec3 axis3, glm::vec3 axisW); signals: void xyRotationChanged(float value); void xzRotationChanged(float value); diff --git a/src/utils/sceneparser.cpp b/src/utils/sceneparser.cpp index 991dcfd..12f83bc 100644 --- a/src/utils/sceneparser.cpp +++ b/src/utils/sceneparser.cpp @@ -1,5 +1,6 @@ #include "sceneparser.h" #include "scenefilereader.h" +#include "4dvecops/vec4ops.h" #include #include #include @@ -39,16 +40,13 @@ void initTree(SceneNode* currentNode, std::vector *shapes, std: switch (t->type) { case TransformationType::TRANSFORMATION_TRANSLATE: - currentCTM *= glm::translate(glm::vec3(t->translate)); - currentTranslation4d *= glm::vec4(t->translate); // TODO + SceneParser::translate4(currentTranslation4d, t->translate); break; case TransformationType::TRANSFORMATION_SCALE: - currentCTM *= glm::scale(glm::vec3(t->scale)); - currentTranslation4d *= glm::vec4(t->scale); // TODO + SceneParser::scale4(currentTranslation4d, t->scale); break; case TransformationType::TRANSFORMATION_ROTATE: - currentCTM *= glm::rotate(t->angle, glm::vec3(t->rotate[0], t->rotate[1], t->rotate[2])); - // TODO: 4d rotation + currentCTM *= SceneParser::getRotationMatrix4(t->angle, t->rotate3, t->rotateW); break; case TransformationType::TRANSFORMATION_MATRIX: currentCTM *= glm::mat4(t->matrix); @@ -68,7 +66,7 @@ void initTree(SceneNode* currentNode, std::vector *shapes, std: ctm: currentCTM, translation4d: currentTranslation4d, inverseCTM: glm::inverse(currentCTM), - inverseTranslation4d: glm::inverse(currentTranslation4d) + inverseTranslation4d: -currentTranslation4d, }; shapes->push_back(rsd); } @@ -114,7 +112,7 @@ void initTree(SceneNode* currentNode, std::vector *shapes, std: } for (auto child : currentNode->children) { - initTree(child, shapes, lights, currentCTM); + initTree(child, shapes, lights, currentCTM, currentTranslation4d); } } @@ -139,8 +137,50 @@ bool SceneParser::parse(std::string filepath, RenderData &renderData) { renderData.shapes.clear(); renderData.lights.clear(); auto currentCTM = glm::mat4(1.0f); + auto currentTranslation4d = glm::vec4(0.0f); - initTree(root, &renderData.shapes, &renderData.lights, currentCTM); + initTree(root, &renderData.shapes, &renderData.lights, currentCTM, currentTranslation4d); return true; } + +glm::mat4 SceneParser::getRotationMatrix4( + float angle, + glm::vec3 axis3, + glm::vec3 axisW) { + // start with the normal rotation from the normal 3d axes + if (axis3.x > 0) + return Vec4Ops::getRotationMatrix4XY(angle); + else if (axis3.y > 0) + return Vec4Ops::getRotationMatrix4YZ(angle); + else if (axis3.z > 0) + return Vec4Ops::getRotationMatrix4ZX(angle); + else if (axisW.x > 0) + return Vec4Ops::getRotationMatrix4XW(angle); + else if (axisW.y > 0) + return Vec4Ops::getRotationMatrix4YW(angle); + else if (axisW.z > 0) + return Vec4Ops::getRotationMatrix4ZW(angle); + else + throw std::runtime_error("invalid axis"); +} + +void SceneParser::translate4( + glm::vec4 &v1, + glm::vec4 v2 + ) { + v1.x += v2.x; + v1.y += v2.y; + v1.z += v2.z; + v1.w += v2.w; +} + +void SceneParser::scale4( + glm::vec4 &v1, + glm::vec4 v2 + ) { + v1.x *= v2.x; + v1.y *= v2.y; + v1.z *= v2.z; + v1.w *= v2.w; +} \ No newline at end of file diff --git a/src/utils/sceneparser.h b/src/utils/sceneparser.h index 8155ca8..fa8a2ac 100644 --- a/src/utils/sceneparser.h +++ b/src/utils/sceneparser.h @@ -30,4 +30,10 @@ public: // @param renderData On return, this will contain the metadata of the loaded scene. // @return A boolean value indicating whether the parse was successful. static bool parse(std::string filepath, RenderData &renderData); + + static glm::mat4 getRotationMatrix4(float angle, glm::vec3 axis3, glm::vec3 axisW); + + static void translate4(glm::vec4 &v1, glm::vec4 v2); + + static void scale4(glm::vec4 &v1, glm::vec4 v2); }; -- cgit v1.2.3-70-g09d2