diff --git a/Step 2/.idea/inspectionProfiles/Project_Default.xml b/Step 2/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..9838f63 --- /dev/null +++ b/Step 2/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/Step 2/.idea/vcs.xml b/Step 2/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/Step 2/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Step 2/cmake-build-debug/.cmake/api/v1/reply/cache-v2-7a0e407e1bb1cb87495f.json b/Step 2/cmake-build-debug/.cmake/api/v1/reply/cache-v2-c39cc30768b0c1ff9c71.json similarity index 99% rename from Step 2/cmake-build-debug/.cmake/api/v1/reply/cache-v2-7a0e407e1bb1cb87495f.json rename to Step 2/cmake-build-debug/.cmake/api/v1/reply/cache-v2-c39cc30768b0c1ff9c71.json index 3a4a5a6..4861121 100644 --- a/Step 2/cmake-build-debug/.cmake/api/v1/reply/cache-v2-7a0e407e1bb1cb87495f.json +++ b/Step 2/cmake-build-debug/.cmake/api/v1/reply/cache-v2-c39cc30768b0c1ff9c71.json @@ -139,10 +139,10 @@ }, { "name" : "HELPSTRING", - "value" : "CXX compiler" + "value" : "No help, variable specified on the command line." } ], - "type" : "STRING", + "type" : "UNINITIALIZED", "value" : "/usr/bin/g++-12" }, { @@ -267,10 +267,10 @@ }, { "name" : "HELPSTRING", - "value" : "C compiler" + "value" : "No help, variable specified on the command line." } ], - "type" : "STRING", + "type" : "UNINITIALIZED", "value" : "/usr/bin/gcc-12" }, { diff --git a/Step 2/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-8dc76fa5dc48254ad2c3.json b/Step 2/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-8dc76fa5dc48254ad2c3.json new file mode 100644 index 0000000..5ecb086 --- /dev/null +++ b/Step 2/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-8dc76fa5dc48254ad2c3.json @@ -0,0 +1,136 @@ +{ + "inputs" : + [ + { + "path" : "CMakeLists.txt" + }, + { + "isGenerated" : true, + "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeSystem.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInitialize.cmake" + }, + { + "isGenerated" : true, + "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeCCompiler.cmake" + }, + { + "isGenerated" : true, + "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeCXXCompiler.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeGenericSystem.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeInitializeConfigs.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/UnixPaths.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/CMakeCommonCompilerMacros.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-C.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-CXX.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake" + }, + { + "isCMake" : true, + "isExternal" : true, + "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake" + } + ], + "kind" : "cmakeFiles", + "paths" : + { + "build" : "/home/laptop/Documents/Brock/CS 3P93/Project/Step 2/cmake-build-debug", + "source" : "/home/laptop/Documents/Brock/CS 3P93/Project/Step 2" + }, + "version" : + { + "major" : 1, + "minor" : 0 + } +} diff --git a/Step 2/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-ba9d17f0a97a92b246a1.json b/Step 2/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-ba9d17f0a97a92b246a1.json deleted file mode 100644 index 6429500..0000000 --- a/Step 2/cmake-build-debug/.cmake/api/v1/reply/cmakeFiles-v1-ba9d17f0a97a92b246a1.json +++ /dev/null @@ -1,739 +0,0 @@ -{ - "inputs" : - [ - { - "path" : "CMakeLists.txt" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineSystem.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystem.cmake.in" - }, - { - "isGenerated" : true, - "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeSystem.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInitialize.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerId.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCompilerIdDetection.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ADSP-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMCC-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMClang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/AppleClang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Borland-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Bruce-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Compaq-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Cray-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GHS-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/HP-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IAR-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Intel-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/LCC-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/MSVC-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVHPC-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVIDIA-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PGI-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PathScale-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SCO-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SDCC-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SunPro-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/TI-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Watcom-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XL-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XLClang-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/zOS-C-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeFindBinUtils.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-FindBinUtils.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCCompiler.cmake.in" - }, - { - "isGenerated" : true, - "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeCCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCXXCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-Determine-CXX.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerId.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCompilerIdDetection.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ADSP-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMCC-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMClang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/AppleClang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Borland-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Cray-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GHS-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/HP-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IAR-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Intel-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/MSVC-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVHPC-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVIDIA-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PGI-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PathScale-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SCO-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/TI-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Watcom-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XL-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeFindBinUtils.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-FindBinUtils.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXCompiler.cmake.in" - }, - { - "isGenerated" : true, - "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeCXXCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeGenericSystem.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeInitializeConfigs.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/UnixPaths.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/CMakeCommonCompilerMacros.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-C.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCompilerCommon.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerABI.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitIncludeInfo.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitLinkInfo.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseLibraryArchitecture.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCompilerCommon.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCCompilerABI.c" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompileFeatures.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Internal/FeatureTesting.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCCompiler.cmake.in" - }, - { - "isGenerated" : true, - "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeCCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-CXX.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCXXCompiler.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCompilerCommon.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerABI.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitIncludeInfo.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitLinkInfo.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseLibraryArchitecture.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCompilerCommon.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXCompilerABI.cpp" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompileFeatures.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Internal/FeatureTesting.cmake" - }, - { - "isCMake" : true, - "isExternal" : true, - "path" : "/home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXCompiler.cmake.in" - }, - { - "isGenerated" : true, - "path" : "cmake-build-debug/CMakeFiles/3.23.2/CMakeCXXCompiler.cmake" - } - ], - "kind" : "cmakeFiles", - "paths" : - { - "build" : "/home/laptop/Documents/Brock/CS 3P93/Project/Step 2/cmake-build-debug", - "source" : "/home/laptop/Documents/Brock/CS 3P93/Project/Step 2" - }, - "version" : - { - "major" : 1, - "minor" : 0 - } -} diff --git a/Step 2/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-60a20e3fc613853f6471.json b/Step 2/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-cabf2e3315e20a1ab3fa.json similarity index 93% rename from Step 2/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-60a20e3fc613853f6471.json rename to Step 2/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-cabf2e3315e20a1ab3fa.json index 0bbc867..eedc597 100644 --- a/Step 2/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-60a20e3fc613853f6471.json +++ b/Step 2/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-cabf2e3315e20a1ab3fa.json @@ -39,7 +39,7 @@ { "directoryIndex" : 0, "id" : "Step_2::@6890427a1f51a3e7e1df", - "jsonFile" : "target-Step_2-Debug-a8a58cab24aba4e50953.json", + "jsonFile" : "target-Step_2-Debug-3f84fdb332366d32e0ca.json", "name" : "Step_2", "projectIndex" : 0 } diff --git a/Step 2/cmake-build-debug/.cmake/api/v1/reply/index-2022-10-14T19-20-28-0369.json b/Step 2/cmake-build-debug/.cmake/api/v1/reply/index-2022-10-15T02-22-25-0362.json similarity index 82% rename from Step 2/cmake-build-debug/.cmake/api/v1/reply/index-2022-10-14T19-20-28-0369.json rename to Step 2/cmake-build-debug/.cmake/api/v1/reply/index-2022-10-15T02-22-25-0362.json index 221febb..f1a3943 100644 --- a/Step 2/cmake-build-debug/.cmake/api/v1/reply/index-2022-10-14T19-20-28-0369.json +++ b/Step 2/cmake-build-debug/.cmake/api/v1/reply/index-2022-10-15T02-22-25-0362.json @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-60a20e3fc613853f6471.json", + "jsonFile" : "codemodel-v2-cabf2e3315e20a1ab3fa.json", "kind" : "codemodel", "version" : { @@ -35,7 +35,7 @@ } }, { - "jsonFile" : "cache-v2-7a0e407e1bb1cb87495f.json", + "jsonFile" : "cache-v2-c39cc30768b0c1ff9c71.json", "kind" : "cache", "version" : { @@ -44,7 +44,7 @@ } }, { - "jsonFile" : "cmakeFiles-v1-ba9d17f0a97a92b246a1.json", + "jsonFile" : "cmakeFiles-v1-8dc76fa5dc48254ad2c3.json", "kind" : "cmakeFiles", "version" : { @@ -66,7 +66,7 @@ { "cache-v2" : { - "jsonFile" : "cache-v2-7a0e407e1bb1cb87495f.json", + "jsonFile" : "cache-v2-c39cc30768b0c1ff9c71.json", "kind" : "cache", "version" : { @@ -76,7 +76,7 @@ }, "cmakeFiles-v1" : { - "jsonFile" : "cmakeFiles-v1-ba9d17f0a97a92b246a1.json", + "jsonFile" : "cmakeFiles-v1-8dc76fa5dc48254ad2c3.json", "kind" : "cmakeFiles", "version" : { @@ -86,7 +86,7 @@ }, "codemodel-v2" : { - "jsonFile" : "codemodel-v2-60a20e3fc613853f6471.json", + "jsonFile" : "codemodel-v2-cabf2e3315e20a1ab3fa.json", "kind" : "codemodel", "version" : { diff --git a/Step 2/cmake-build-debug/.cmake/api/v1/reply/target-Step_2-Debug-a8a58cab24aba4e50953.json b/Step 2/cmake-build-debug/.cmake/api/v1/reply/target-Step_2-Debug-3f84fdb332366d32e0ca.json similarity index 91% rename from Step 2/cmake-build-debug/.cmake/api/v1/reply/target-Step_2-Debug-a8a58cab24aba4e50953.json rename to Step 2/cmake-build-debug/.cmake/api/v1/reply/target-Step_2-Debug-3f84fdb332366d32e0ca.json index 9a3e7f1..f63b9f6 100644 --- a/Step 2/cmake-build-debug/.cmake/api/v1/reply/target-Step_2-Debug-a8a58cab24aba4e50953.json +++ b/Step 2/cmake-build-debug/.cmake/api/v1/reply/target-Step_2-Debug-3f84fdb332366d32e0ca.json @@ -67,7 +67,8 @@ "sourceIndexes" : [ 0, - 1 + 1, + 2 ] } ], @@ -101,12 +102,19 @@ "sourceIndexes" : [ 0, - 1 + 1, + 2 ] } ], "sources" : [ + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/image/image.cpp", + "sourceGroupIndex" : 0 + }, { "backtrace" : 1, "compileGroupIndex" : 0, diff --git a/Step 2/cmake-build-debug/.ninja_deps b/Step 2/cmake-build-debug/.ninja_deps index dff93b2..2391201 100644 Binary files a/Step 2/cmake-build-debug/.ninja_deps and b/Step 2/cmake-build-debug/.ninja_deps differ diff --git a/Step 2/cmake-build-debug/.ninja_log b/Step 2/cmake-build-debug/.ninja_log index 0412951..8971623 100644 --- a/Step 2/cmake-build-debug/.ninja_log +++ b/Step 2/cmake-build-debug/.ninja_log @@ -1,5 +1,4 @@ # ninja log v5 -0 1090 1665775232556390933 CMakeFiles/Step_2.dir/src/main.cpp.o e9fdde60b585ad94 -1 1889 1665775308008645573 CMakeFiles/Step_2.dir/src/main.cpp.o e9fdde60b585ad94 -0 817 1665775328896715588 CMakeFiles/Step_2.dir/src/util/parser.cpp.o 7789d7d281320d24 -817 913 1665775328992715910 Step_2 113c55c20a0bd7bc +1 1209 1665785962773135775 CMakeFiles/Step_2.dir/src/main.cpp.o e9fdde60b585ad94 +1 1482 1665785963045137348 CMakeFiles/Step_2.dir/src/util/parser.cpp.o 7789d7d281320d24 +1482 1591 1665785963153137973 Step_2 113c55c20a0bd7bc diff --git a/Step 2/cmake-build-debug/CMakeCache.txt b/Step 2/cmake-build-debug/CMakeCache.txt index a26145a..9b295f3 100644 --- a/Step 2/cmake-build-debug/CMakeCache.txt +++ b/Step 2/cmake-build-debug/CMakeCache.txt @@ -24,8 +24,8 @@ CMAKE_AR:FILEPATH=/usr/bin/ar // MinSizeRel ... CMAKE_BUILD_TYPE:STRING=Debug -//CXX compiler -CMAKE_CXX_COMPILER:STRING=/usr/bin/g++-12 +//No help, variable specified on the command line. +CMAKE_CXX_COMPILER:UNINITIALIZED=/usr/bin/g++-12 //A wrapper around 'ar' adding the appropriate '--plugin' option // for the GCC compiler @@ -50,8 +50,8 @@ CMAKE_CXX_FLAGS_RELEASE:STRING=-O3 -DNDEBUG //Flags used by the CXX compiler during RELWITHDEBINFO builds. CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG -//C compiler -CMAKE_C_COMPILER:STRING=/usr/bin/gcc-12 +//No help, variable specified on the command line. +CMAKE_C_COMPILER:UNINITIALIZED=/usr/bin/gcc-12 //A wrapper around 'ar' adding the appropriate '--plugin' option // for the GCC compiler diff --git a/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/main.cpp.o b/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/main.cpp.o index 191c331..dc3aac8 100644 Binary files a/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/main.cpp.o and b/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/main.cpp.o differ diff --git a/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/util/parser.cpp.o b/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/util/parser.cpp.o index 3a908ba..c336c04 100644 Binary files a/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/util/parser.cpp.o and b/Step 2/cmake-build-debug/CMakeFiles/Step_2.dir/src/util/parser.cpp.o differ diff --git a/Step 2/cmake-build-debug/CMakeFiles/clion-log.txt b/Step 2/cmake-build-debug/CMakeFiles/clion-log.txt index 5540e13..f007332 100644 --- a/Step 2/cmake-build-debug/CMakeFiles/clion-log.txt +++ b/Step 2/cmake-build-debug/CMakeFiles/clion-log.txt @@ -1,16 +1,4 @@ /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/bin/cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_MAKE_PROGRAM=/home/laptop/Documents/clion/clion-2021.3.3/bin/ninja/linux/ninja -DCMAKE_C_COMPILER=/usr/bin/gcc-12 -DCMAKE_CXX_COMPILER=/usr/bin/g++-12 -G Ninja -S "/home/laptop/Documents/Brock/CS 3P93/Project/Step 2" -B "/home/laptop/Documents/Brock/CS 3P93/Project/Step 2/cmake-build-debug" --- The C compiler identification is GNU 12.1.0 --- The CXX compiler identification is GNU 12.1.0 --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Check for working C compiler: /usr/bin/gcc-12 - skipped --- Detecting C compile features --- Detecting C compile features - done --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Check for working CXX compiler: /usr/bin/g++-12 - skipped --- Detecting CXX compile features --- Detecting CXX compile features - done -- Configuring done -- Generating done -- Build files have been written to: /home/laptop/Documents/Brock/CS 3P93/Project/Step 2/cmake-build-debug diff --git a/Step 2/cmake-build-debug/Step_2 b/Step 2/cmake-build-debug/Step_2 index 3b5eb38..37ad81d 100755 Binary files a/Step 2/cmake-build-debug/Step_2 and b/Step 2/cmake-build-debug/Step_2 differ diff --git a/Step 2/cmake-build-debug/Testing/Temporary/LastTest.log b/Step 2/cmake-build-debug/Testing/Temporary/LastTest.log index 8f44d17..c296365 100644 --- a/Step 2/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/Step 2/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Oct 14 15:22 EDT +Start testing: Oct 14 22:22 EDT ---------------------------------------------------------- -End testing: Oct 14 15:22 EDT +End testing: Oct 14 22:22 EDT diff --git a/Step 2/cmake-build-debug/build.ninja b/Step 2/cmake-build-debug/build.ninja index 5862223..8cc64ac 100644 --- a/Step 2/cmake-build-debug/build.ninja +++ b/Step 2/cmake-build-debug/build.ninja @@ -49,14 +49,19 @@ cmake_ninja_workdir = /home/laptop/Documents/Brock/CS$ 3P93/Project/Step$ 2/cmak build cmake_object_order_depends_target_Step_2: phony || CMakeFiles/Step_2.dir +build CMakeFiles/Step_2.dir/src/image/image.cpp.o: CXX_COMPILER__Step_2_Debug /home/laptop/Documents/Brock/CS$ 3P93/Project/Step$ 2/src/image/image.cpp || cmake_object_order_depends_target_Step_2 + DEP_FILE = CMakeFiles/Step_2.dir/src/image/image.cpp.o.d + FLAGS = -g -std=gnu++20 + INCLUDES = -I"/home/laptop/Documents/Brock/CS 3P93/Project/Step 2/include" + OBJECT_DIR = CMakeFiles/Step_2.dir + OBJECT_FILE_DIR = CMakeFiles/Step_2.dir/src/image + build CMakeFiles/Step_2.dir/src/main.cpp.o: CXX_COMPILER__Step_2_Debug /home/laptop/Documents/Brock/CS$ 3P93/Project/Step$ 2/src/main.cpp || cmake_object_order_depends_target_Step_2 DEP_FILE = CMakeFiles/Step_2.dir/src/main.cpp.o.d FLAGS = -g -std=gnu++20 INCLUDES = -I"/home/laptop/Documents/Brock/CS 3P93/Project/Step 2/include" OBJECT_DIR = CMakeFiles/Step_2.dir OBJECT_FILE_DIR = CMakeFiles/Step_2.dir/src - TARGET_COMPILE_PDB = CMakeFiles/Step_2.dir/ - TARGET_PDB = Step_2.pdb build CMakeFiles/Step_2.dir/src/util/parser.cpp.o: CXX_COMPILER__Step_2_Debug /home/laptop/Documents/Brock/CS$ 3P93/Project/Step$ 2/src/util/parser.cpp || cmake_object_order_depends_target_Step_2 DEP_FILE = CMakeFiles/Step_2.dir/src/util/parser.cpp.o.d @@ -64,8 +69,6 @@ build CMakeFiles/Step_2.dir/src/util/parser.cpp.o: CXX_COMPILER__Step_2_Debug /h INCLUDES = -I"/home/laptop/Documents/Brock/CS 3P93/Project/Step 2/include" OBJECT_DIR = CMakeFiles/Step_2.dir OBJECT_FILE_DIR = CMakeFiles/Step_2.dir/src/util - TARGET_COMPILE_PDB = CMakeFiles/Step_2.dir/ - TARGET_PDB = Step_2.pdb # ============================================================================= @@ -75,14 +78,13 @@ build CMakeFiles/Step_2.dir/src/util/parser.cpp.o: CXX_COMPILER__Step_2_Debug /h ############################################# # Link the executable Step_2 -build Step_2: CXX_EXECUTABLE_LINKER__Step_2_Debug CMakeFiles/Step_2.dir/src/main.cpp.o CMakeFiles/Step_2.dir/src/util/parser.cpp.o +build Step_2: CXX_EXECUTABLE_LINKER__Step_2_Debug CMakeFiles/Step_2.dir/src/image/image.cpp.o CMakeFiles/Step_2.dir/src/main.cpp.o CMakeFiles/Step_2.dir/src/util/parser.cpp.o FLAGS = -g OBJECT_DIR = CMakeFiles/Step_2.dir POST_BUILD = : PRE_LINK = : - TARGET_COMPILE_PDB = CMakeFiles/Step_2.dir/ TARGET_FILE = Step_2 - TARGET_PDB = Step_2.pdb + TARGET_PDB = Step_2.dbg ############################################# @@ -128,14 +130,14 @@ build all: phony Step_2 ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ../CMakeLists.txt /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCCompiler.cmake.in /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCCompilerABI.c /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXCompiler.cmake.in /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXCompilerABI.cpp /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCompilerIdDetection.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCXXCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompileFeatures.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerABI.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerId.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineSystem.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeFindBinUtils.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeGenericSystem.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeInitializeConfigs.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitIncludeInfo.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitLinkInfo.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseLibraryArchitecture.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystem.cmake.in /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInitialize.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCXXCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCompilerCommon.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ADSP-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMCC-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMClang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/AppleClang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Borland-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Bruce-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompilerInternal.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Compaq-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Cray-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Embarcadero-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Fujitsu-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GHS-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-FindBinUtils.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/HP-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/HP-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IAR-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Intel-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/LCC-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/MSVC-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVHPC-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVIDIA-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PGI-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PathScale-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SCO-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SDCC-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SunPro-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/TI-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Watcom-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XL-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XL-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XLClang-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/zOS-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Internal/FeatureTesting.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-Determine-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.23.2/CMakeCCompiler.cmake CMakeFiles/3.23.2/CMakeCXXCompiler.cmake CMakeFiles/3.23.2/CMakeSystem.cmake +build build.ninja: RERUN_CMAKE | ../CMakeLists.txt /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeGenericSystem.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeInitializeConfigs.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInitialize.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.23.2/CMakeCCompiler.cmake CMakeFiles/3.23.2/CMakeCXXCompiler.cmake CMakeFiles/3.23.2/CMakeSystem.cmake pool = console ############################################# # A missing CMake input file is not an error. -build ../CMakeLists.txt /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCCompiler.cmake.in /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCCompilerABI.c /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXCompiler.cmake.in /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXCompilerABI.cpp /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCompilerIdDetection.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCXXCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompileFeatures.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerABI.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineCompilerId.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeDetermineSystem.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeFindBinUtils.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeGenericSystem.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeInitializeConfigs.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitIncludeInfo.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseImplicitLinkInfo.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeParseLibraryArchitecture.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystem.cmake.in /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInitialize.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCXXCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeTestCompilerCommon.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ADSP-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMCC-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/ARMClang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/AppleClang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Borland-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Bruce-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Clang-DetermineCompilerInternal.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Compaq-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Cray-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Embarcadero-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Fujitsu-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GHS-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-FindBinUtils.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/HP-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/HP-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IAR-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Intel-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/LCC-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/MSVC-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVHPC-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/NVIDIA-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PGI-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/PathScale-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SCO-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SDCC-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SunPro-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/TI-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/Watcom-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XL-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XL-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XLClang-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/zOS-C-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Internal/FeatureTesting.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-Determine-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.23.2/CMakeCCompiler.cmake CMakeFiles/3.23.2/CMakeCXXCompiler.cmake CMakeFiles/3.23.2/CMakeSystem.cmake: phony +build ../CMakeLists.txt /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCXXInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeCommonLanguageInclude.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeGenericSystem.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeInitializeConfigs.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeLanguageInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInformation.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/CMakeSystemSpecificInitialize.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/CMakeCommonCompilerMacros.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Compiler/GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-C.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU-CXX.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux-GNU.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/Linux.cmake /home/laptop/Documents/clion/clion-2021.3.3/bin/cmake/linux/share/cmake-3.23/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.23.2/CMakeCCompiler.cmake CMakeFiles/3.23.2/CMakeCXXCompiler.cmake CMakeFiles/3.23.2/CMakeSystem.cmake: phony ############################################# diff --git a/Step 2/include/image/image.h b/Step 2/include/image/image.h new file mode 100644 index 0000000..eb3b399 --- /dev/null +++ b/Step 2/include/image/image.h @@ -0,0 +1,47 @@ +/* + * Created by Brett Terpstra 6920201 on 14/10/22. + * Copyright (c) Brett Terpstra 2022 All Rights Reserved + */ + +#ifndef STEP_2_IMAGE_H +#define STEP_2_IMAGE_H + +#include "util/std.h" +#include "math/vectors.h" + +namespace Raytracing { + + class Image{ + private: + int width; + int height; + vec4* pixelData; + public: + Image(int width, int height); + Image(const Image& image); + + inline void setPixelColor(int x, int y, const vec4& color){ + pixelData[x * width + y] = color; + } + inline vec4 getPixelColor(int x, int y){ + return pixelData[x * width + y]; + } + int getPixelR(int x, int y); + int getPixelG(int x, int y); + int getPixelB(int x, int y); + int getPixelA(int x, int y); + + [[nodiscard]] inline int getWidth() const {return width;} + [[nodiscard]] inline int getHeight() const {return height;} + + ~Image(); + }; + + class ImageOutput { + private: + + }; + +} + +#endif //STEP_2_IMAGE_H diff --git a/Step 2/include/math/vectors.h b/Step 2/include/math/vectors.h new file mode 100644 index 0000000..17b9f11 --- /dev/null +++ b/Step 2/include/math/vectors.h @@ -0,0 +1,141 @@ +/* + * Created by Brett Terpstra 6920201 on 14/10/22. + * Copyright (c) Brett Terpstra 2022 All Rights Reserved + */ + +#ifndef STEP_2_VECTORS_H +#define STEP_2_VECTORS_H + +#include +#include "util/std.h" + +namespace Raytracing { + + // when running on the CPU it's fine to be a double + // if your CPU is older (32bit) and has issues with doubles, consider changing it to a float + // but if we move to the GPU it has to be a float. + // since GPUs generally are far more optimized for floats + typedef double PRECISION_TYPE; + + class vec4 { + private: + union xType {PRECISION_TYPE x; PRECISION_TYPE r; }; + union yType {PRECISION_TYPE y; PRECISION_TYPE g; }; + union zType {PRECISION_TYPE z; PRECISION_TYPE b; }; + union wType {PRECISION_TYPE w; PRECISION_TYPE a; }; + struct valueType {xType v1; yType v2; zType v3; wType v4;}; + public: + // isn't much of a reason to do it this way + // beyond I wanted an explicit immutable vector type of length 4 + // that could be used as both x,y,z + w? and rgba + // it's unlikely that we'll need to use the w component + // but it helps better line up with the GPU + // and floating point units (especially on GPUs) tend to be aligned to 4*sizeof(float) + const valueType value; + + vec4(): value{0,0,0,0} {} + vec4(PRECISION_TYPE x, PRECISION_TYPE y, PRECISION_TYPE z): value{x,y,z,0} {} + vec4(PRECISION_TYPE x, PRECISION_TYPE y, PRECISION_TYPE z, PRECISION_TYPE w): value{x,y,z,w} {} + vec4(const vec4& vec): value{vec.x(), vec.y(), vec.z(), vec.w()} {} + vec4 operator=(const vec4& other) { return {other.x(), other.y(), other.z(), other.w()}; } + + // I remember reading somewhere that if you can make it constant you should (Helps with -o flags?) + // I'm still a little new to C++. TODO: compare compiler output + // this is my second major project in it (the first being my java game engine i ported to c++) + // since value is constant it's unlikely we actually need to + const inline PRECISION_TYPE x() const {return value.v1.x;} + const inline PRECISION_TYPE y() const {return value.v2.y;} + const inline PRECISION_TYPE z() const {return value.v3.z;} + const inline PRECISION_TYPE w() const {return value.v4.w;} + + const inline PRECISION_TYPE r() const {return value.v1.r;} + const inline PRECISION_TYPE g() const {return value.v2.g;} + const inline PRECISION_TYPE b() const {return value.v3.b;} + const inline PRECISION_TYPE a() const {return value.v4.a;} + + // negation operator + const vec4 operator-() const { return vec4(-x(), -y(), -z(), -w()); } + + const inline PRECISION_TYPE magnitude() const { + return sqrt(length_squared()); + } + + const inline PRECISION_TYPE length_squared() const { + return x() * x() + y() * y() + z() * z() + w() * w(); + } + + // returns the unit-vector. + const inline vec4 normalize(){ + PRECISION_TYPE mag = magnitude(); + return vec4(x() / mag, y() / mag, z() / mag, w() / mag); + } + + // add operator before the vec returns the magnitude + PRECISION_TYPE operator+() const { + return magnitude(); + } + + // preforms the dot product of left * right + static inline const PRECISION_TYPE dot(const vec4& left, const vec4& right) { + return left.x() * right.x() + + left.y() * right.y() + + left.z() * right.z() + + left.w() * right.w(); + } + + // preforms the cross product of left X right + // since a general solution to the cross product doesn't exist in 4d + // we are going to ignore the w. + static inline const vec4 cross(const vec4& left, const vec4& right) { + return vec4(left.y() * right.z() - left.z() * right.y(), + left.z() * right.x() - left.x() * right.z(), + left.x() * right.y() - left.y() * right.x()); + } + + }; + +// Utility Functions + + // useful for printing out the vector to stdout + inline std::ostream& operator<<(std::ostream& out, const vec4& v) { + return out << "vec4{" << v.x() << ", " << v.y() << ", " << v.z() << ", " << v.w() << "} "; + } + + // adds the two vectors left and right + inline const vec4 operator+(const vec4& left, const vec4& right) { + return vec4(left.x() + right.x(), left.y() + right.y(), left.z() + right.z(), left.w() + right.w()); + } + + // subtracts the right vector from the left. + inline const vec4 operator-(const vec4& left, const vec4& right) { + return vec4(left.x() - right.x(), left.y() - right.y(), left.z() - right.z(), left.w() - right.w()); + } + + // multiples the left with the right + inline const vec4 operator*(const vec4& left, const vec4& right) { + return vec4(left.x() * right.x(), left.y() * right.y(), left.z() * right.z(), left.w() * right.w()); + } + + // multiplies the const c with each element in the vector v + inline const vec4 operator*(const PRECISION_TYPE c, const vec4& v) { + return vec4(c * v.x(), c * v.y(), c * v.z(), c * v.w()); + } + + // same as above but for right sided constants + inline const vec4 operator*(const vec4& v, PRECISION_TYPE c) { + return c * v; + } + + // divides the vector by the constant c + inline const vec4 operator/(const vec4& v, PRECISION_TYPE c) { + return vec4(v.x() / c, v.y() / c, v.z() / c, v.w() / c); + } + + // divides the constant by the magnitude of the vector + inline const PRECISION_TYPE operator/(PRECISION_TYPE c, const vec4& v) { + return c / +v; + } + +} + +#endif //STEP_2_VECTORS_H diff --git a/Step 2/include/util/parser.h b/Step 2/include/util/parser.h index 4e0f3ee..6178039 100644 --- a/Step 2/include/util/parser.h +++ b/Step 2/include/util/parser.h @@ -19,14 +19,29 @@ namespace Raytracing { class Parser { private: std::unordered_map raw_values; - std::unordered_map> parsedValues; + std::unordered_map defaultValues; + std::vector descriptions; public: Parser(); - void addOption(std::string option, std::string description); - bool hasOption(std::string option); - std::string getOptionValue(std::string option); + // Adds an option (or options) with default values. + // default value defaults to an empty string and will not be added + // useful if you want to add a description to the help menu. + void addOption(const std::string& option, const std::string& description, const std::string& defaultValue = ""); + void addOption(const std::vector& options, const std::string& description, const std::string& defaultValue = ""); + // returns true if the option provided is different from the default option. + bool hasOptionChanged(const std::string& option); + // checks if the option has been provided to the parser + bool hasOption(const std::string& option); + // check if any of the options exist, only use for checking options that lead to the same path + // as this will return true at first option. + bool hasOption(const std::vector& options); + // does not check to see if the option exists. + std::string getOptionValue(const std::string& option); + // parse the options from args int parse(char** args, int argc); + void printDifferenceInInfo(); + void printAllInInfo(); }; } diff --git a/Step 2/include/util/std.h b/Step 2/include/util/std.h index 1f64427..b183f0e 100644 --- a/Step 2/include/util/std.h +++ b/Step 2/include/util/std.h @@ -18,6 +18,9 @@ #include #include "util/logging.h" #include +#include +#include +#include /** * defines @@ -30,5 +33,52 @@ /** * classes */ +namespace Raytracing { + class String { + public: + // taken from https://stackoverflow.com/questions/216823/how-to-trim-an-stdstring + // would've preferred to use boost lib but instructions said to avoid external libs + // trim from start (in place) + static inline std::string& ltrim(std::string &s) { + s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) { + return !std::isspace(ch); + })); + return s; + } + + // trim from end (in place) + static inline std::string& rtrim(std::string &s) { + s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) { + return !std::isspace(ch); + }).base(), s.end()); + return s; + } + + // trim from both ends (in place) + static inline std::string& trim(std::string &s) { + ltrim(s); + rtrim(s); + return s; + } + + // trim from start (copying) + static inline std::string ltrim_copy(std::string s) { + ltrim(s); + return s; + } + + // trim from end (copying) + static inline std::string rtrim_copy(std::string s) { + rtrim(s); + return s; + } + + // trim from both ends (copying) + static inline std::string trim_copy(std::string s) { + trim(s); + return s; + } + }; +} #endif //STEP_2_STD_H diff --git a/Step 2/src/image/image.cpp b/Step 2/src/image/image.cpp new file mode 100644 index 0000000..64583ab --- /dev/null +++ b/Step 2/src/image/image.cpp @@ -0,0 +1,43 @@ +/* + * Created by Brett Terpstra 6920201 on 14/10/22. + * Copyright (c) Brett Terpstra 2022 All Rights Reserved + */ +#include "image/image.h" + +namespace Raytracing { + + Image::Image(int width, int height): width(width), height(height) { + pixelData = new vec4[width * height]; + } + + Image::Image(const Image &image): width(image.width), height(image.height) { + pixelData = new vec4[image.width * image.height]; + for (int i = 0; i < image.width; i++){ + for (int j = 0; j < image.height; j++){ + this->setPixelColor(i, j, image.pixelData[i * image.width + j]); + } + } + } + + int Image::getPixelR(int x, int y) { + // values are stored as a floating point number [0, 1) + // but most formats want an int [0, 255] + return (int) (255.999 * getPixelColor(x, y).r()); + } + + int Image::getPixelG(int x, int y) { + return (int) (255.999 * getPixelColor(x, y).g()); + } + + int Image::getPixelB(int x, int y) { + return (int) (255.999 * getPixelColor(x, y).b()); + } + + int Image::getPixelA(int x, int y) { + return (int) (255.999 * getPixelColor(x, y).a()); + } + + Image::~Image() { + delete[](pixelData); + } +} \ No newline at end of file diff --git a/Step 2/src/main.cpp b/Step 2/src/main.cpp index 651509c..7221406 100644 --- a/Step 2/src/main.cpp +++ b/Step 2/src/main.cpp @@ -2,14 +2,38 @@ #include "util/parser.h" int main(int argc, char** args) { + // not a feature full parser but it'll work for what I need. Raytracing::Parser parser; + parser.addOption("--single", "Enable Single Thread\n\tUse a single thread for ray tracing\n", "true"); + // not implemented yet + parser.addOption("--multi", "Enable Multi-threading\n" + "\tUse multiple threads for ray tracing,\n" + "\tYou can set the max threads using -t or --threads\n"); + parser.addOption({{"-t"}, {"--threads"}}, "Max Usable Threads\n" + "\tSet the max threads the ray tracer will attempt to use.\n" + "\tDefaults to all cores of your cpu.\n", "0"); + // not implemented yet + parser.addOption({{"--gui"}, {"-g"}}, "Enable GLFW GUI\n" + "\tWill create a GUI using GLFW and display the image there.\n" + "\tRequires the you compile with GLFW enabled. Will do nothing otherwise\n"); + // not implemented yet + parser.addOption({{"--gpu"}, {"-c"}}, "Enables GPU Compute\n" + "\tRequires the --gui/-g flag enabled,\n" + "\tWill use OpenGL compute shaders to render the image\n"); + parser.addOption("--output", "Output Directory\n" + "\tSet the output directory for the rendered image. Defaults to the local directory.\n", "./"); + parser.addOption("--format", "Output Format\n" + "\tSets the output format to PPM, PNG, or JPEG. Currently only PPM is supported.", "PPM"); + // if the parser returns non-zero then it wants us to stop execution // likely due to a help function being called. if (parser.parse(args, argc)) return 0; - tlog << "Hello, World!" << std::endl; + tlog << "Parsing complete! Starting raytracer with options:" << std::endl; + // not perfect (contains duplicates) but good enough. + parser.printAllInInfo(); return 0; } diff --git a/Step 2/src/util/parser.cpp b/Step 2/src/util/parser.cpp index a3a2fa6..cd9d977 100644 --- a/Step 2/src/util/parser.cpp +++ b/Step 2/src/util/parser.cpp @@ -3,26 +3,113 @@ * Copyright (c) Brett Terpstra 2022 All Rights Reserved */ #include "util/parser.h" +#include namespace Raytracing { Parser::Parser() { - + // only to add the description (very annoying we have to have double {}!) + addOption({{"--help"}, {"-h"}}, "Show this help menu!"); } - void Parser::addOption(std::string option, std::string description) { - - } - - bool Parser::hasOption(std::string option) { - return false; - } - - std::string Parser::getOptionValue(std::string option) { - return "std::string()"; + std::string Parser::getOptionValue(const std::string& option) { + return raw_values.contains(option) ? raw_values.at(option) : defaultValues.at(option); } int Parser::parse(char **args, int argc) { - return 0; + // first arg is always the command path + // which we don't care about. + for (int i = 1; i < argc; i++) { + std::string option = std::string(args[i]); + std::string value = "true"; + // we only want to get the value if it was actually provided. + if (i + 1 < argc) { + value = std::string(args[i + 1]); + // must make sure we don't skip over valuable parasble options! + if (!value.starts_with("-")) { + // we must add to the value of i since we don't want to try and parse values. + i++; + } else // if it does start with -, it's an option, we need to reset to true. + value = "true"; + } + // if values are provided to us with -- or - we simply don't care about them! + if (option.starts_with("-")) + raw_values.insert(std::pair(option, value)); + else + throw std::runtime_error("Unfortunately an invalid argument was provided! {" + option + "}"); + } + if (hasOption({{"--help"}, {"-h"}})){ + std::cout << "Raytracer help information:" << std::endl; + for (const auto& d : descriptions){ + std::cout << d; + } + return true; + } + return false; } + + void Parser::addOption(const std::string& option, const std::string& description, const std::string& defaultValue) { + // we only want to add if the default value isn't empty, + // since we might want to use the option as a single optional flag and not a value. + if (!Raytracing::String::trim_copy(defaultValue).empty()) + defaultValues.insert(std::pair(option, defaultValue)); + descriptions.emplace_back(option + " :" + description); + } + + bool Parser::hasOptionChanged(const std::string& option) { + return raw_values.contains(option) && defaultValues.contains(option) && raw_values.at(option) != defaultValues.at(option); + } + + void Parser::addOption(const std::vector& options, const std::string &description, const std::string &defaultValue) { + // add option like normal + for (const auto& option : options){ + if (!Raytracing::String::trim_copy(defaultValue).empty()) + defaultValues.insert(std::pair(option, defaultValue)); + } + // but improve the description for multi-option + std::stringstream desStr; + + // add all the options to the description, seperated by "," + for (int i = 0; i < options.size(); i++){ + desStr << options[i]; + if (i != options.size()-1) + desStr << ", "; + } + desStr << " :"; + desStr << description; + + descriptions.emplace_back(desStr.str()); + } + + bool Parser::hasOption(const std::string &option) { + return raw_values.contains(option); + } + + bool Parser::hasOption(const std::vector &options) { + for (const auto& option : options) + if (hasOption(option)) + return true; + return false; + } + + void Parser::printAllInInfo() { + // print all with default values + for (const auto& opt : defaultValues){ + ilog << opt.first << ": " << (raw_values.contains(opt.first) ? raw_values.at(opt.first) : opt.second) << " (default: " << opt.second << ")" << std::endl; + } + // then just print all the ones which don't have but where provided + for (const auto& opt : raw_values){ + if (!defaultValues.contains(opt.first)) + ilog << "With: " << opt.first; + } + } + + void Parser::printDifferenceInInfo() { + for (const auto& opt : raw_values){ + if (defaultValues.contains(opt.first)) + if (opt.second == defaultValues.at(opt.first)) + ilog << opt.first << ": " << opt.second << " (default: " << defaultValues.at(opt.first) << ")" << std::endl; + } + } + }