diff --git a/Step 3/cmake-build-release/.ninja_deps b/Step 3/cmake-build-release/.ninja_deps index 4fb335f..1907999 100644 Binary files a/Step 3/cmake-build-release/.ninja_deps and b/Step 3/cmake-build-release/.ninja_deps differ diff --git a/Step 3/cmake-build-release/.ninja_log b/Step 3/cmake-build-release/.ninja_log index f8ee46a..33a94f1 100644 --- a/Step 3/cmake-build-release/.ninja_log +++ b/Step 3/cmake-build-release/.ninja_log @@ -48,3 +48,7 @@ 2 1714 1667783529037241417 CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o 66d57ca8c497053f 2 2081 1667783529405251409 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 1ece1ef4ff463d7b 2081 2148 1667783529473253256 Step_3 f055ce2b85635598 +1 1400 1667858649624647232 CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o b114408b56d0322d +1 2246 1667858650468670173 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 1ece1ef4ff463d7b +1 7206 1667858655428804980 CMakeFiles/Step_3.dir/src/engine/image/image.cpp.o 194bb23af2286607 +7207 7312 1667858655536807916 Step_3 f055ce2b85635598 diff --git a/Step 3/cmake-build-release/2022-11-7 10:38:23.png b/Step 3/cmake-build-release/2022-11-7 10:38:23.png new file mode 100644 index 0000000..28c9131 Binary files /dev/null and b/Step 3/cmake-build-release/2022-11-7 10:38:23.png differ diff --git a/Step 3/cmake-build-release/2022-11-7 17:4:21.png b/Step 3/cmake-build-release/2022-11-7 17:4:21.png new file mode 100644 index 0000000..76b3c54 Binary files /dev/null and b/Step 3/cmake-build-release/2022-11-7 17:4:21.png differ diff --git a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/image/image.cpp.o b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/image/image.cpp.o index 45556be..907869a 100644 Binary files a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/image/image.cpp.o and b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/image/image.cpp.o differ diff --git a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o index 7a2bbc0..7df60f0 100644 Binary files a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o and b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/gl/gl.cpp.o differ diff --git a/Step 3/cmake-build-release/Step_3 b/Step 3/cmake-build-release/Step_3 index 19f993f..ca18553 100755 Binary files a/Step 3/cmake-build-release/Step_3 and b/Step 3/cmake-build-release/Step_3 differ diff --git a/Step 3/cmake-build-release/Testing/Temporary/LastTest.log b/Step 3/cmake-build-release/Testing/Temporary/LastTest.log index 77fd504..a15f752 100644 --- a/Step 3/cmake-build-release/Testing/Temporary/LastTest.log +++ b/Step 3/cmake-build-release/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Nov 06 20:12 EST +Start testing: Nov 07 17:04 EST ---------------------------------------------------------- -End testing: Nov 06 20:12 EST +End testing: Nov 07 17:04 EST diff --git a/Step 3/src/engine/image/image.cpp b/Step 3/src/engine/image/image.cpp index 06c5f89..b556b6c 100644 --- a/Step 3/src/engine/image/image.cpp +++ b/Step 3/src/engine/image/image.cpp @@ -7,6 +7,7 @@ #include #define STB_IMAGE_WRITE_IMPLEMENTATION #include "engine/image/stb_image_write.h" +#define STB_IMAGE_IMPLEMENTATION #include "engine/image/stb_image.h" #define STB_IMAGE_RESIZE_IMPLEMENTATION #include "engine/image/stb_image_resize.h" diff --git a/Step 3/src/engine/main.cpp b/Step 3/src/engine/main.cpp index a0a0633..717f66b 100644 --- a/Step 3/src/engine/main.cpp +++ b/Step 3/src/engine/main.cpp @@ -244,7 +244,9 @@ int main(int argc, char** args) { delete(haltExecution); delete(haltRaytracing); delete(pauseRaytracing); - deleteQuad(); + #ifdef COMPILE_GUI + deleteQuad(); + #endif for (auto& p : Raytracing::profiles) delete(p.second); diff --git a/Step 3/src/graphics/gl/gl.cpp b/Step 3/src/graphics/gl/gl.cpp index b94cb73..5e0aca6 100644 --- a/Step 3/src/graphics/gl/gl.cpp +++ b/Step 3/src/graphics/gl/gl.cpp @@ -5,7 +5,6 @@ #include #include -#define STB_IMAGE_IMPLEMENTATION #include "engine/image/stb_image.h" #ifndef USE_GLFW