From 579511811efecb6899b15b3df33134244ce524c4 Mon Sep 17 00:00:00 2001 From: Brett Date: Sun, 23 Oct 2022 23:46:12 -0400 Subject: [PATCH] Working on mutlithreading, push fix for cmake --- .../inspectionProfiles/Project_Default.xml | 2 +- Step 3/.~lock.Dev Log Week of 2022-10-23.odt# | 1 + Step 3/CMakeLists.txt | 57 +- Step 3/Dev Log Week of 2022-10-23.odt | Bin 0 -> 107870 bytes .../reply/cache-v2-2bb68b2dc8a015f3db85.json | 1207 - .../reply/cache-v2-5fdf2e49722c528a78eb.json | 3323 + ...> cmakeFiles-v1-8856d3a45f872662a860.json} | 117 +- ...=> codemodel-v2-809b556b407ae400f134.json} | 4 +- .../index-2022-10-24T03-45-57-0953.json} | 12 +- ...get-Step_3-Debug-29ae124d8ad5641f7764.json | 331 + ...get-Step_3-Debug-cee5ff9881c99bfed4a1.json | 213 - Step 3/cmake-build-debug/.ninja_deps | Bin 33464 -> 38708 bytes Step 3/cmake-build-debug/.ninja_log | 32 +- .../cmake-build-debug/2022-10-18 17:51:27.png | Bin 89461 -> 0 bytes .../cmake-build-debug/2022-10-18 23:18:20.png | Bin 83074 -> 0 bytes .../cmake-build-debug/2022-10-23 14:49:14.png | Bin 0 -> 19928 bytes .../cmake-build-debug/2112-10-18 16:35:36.png | Bin 98860 -> 0 bytes ...:1666122466.1666122466418 52-633-19283.png | Bin 78489 -> 0 bytes ...:1666123679.1666123679781 52-633-19283.png | Bin 78489 -> 0 bytes Step 3/cmake-build-debug/CMakeCache.txt | 552 +- .../CMakeFiles/3.23.2/CMakeSystem.cmake | 8 +- .../CMakeFiles/CMakeOutput.log | 164 +- .../CMakeFiles/Step_2.dir/src/globals.cpp.o | 37280 ------- .../Step_2.dir/src/image/image.cpp.o | 70676 ------------ .../CMakeFiles/Step_2.dir/src/main.cpp.o | 52089 --------- .../Step_2.dir/src/math/colliders.cpp.o | 29946 ----- .../Step_2.dir/src/raytracing.cpp.o | 45997 -------- .../Step_2.dir/src/util/debug.cpp.o | 54436 --------- .../Step_2.dir/src/util/models.cpp.o | 73426 ------------- .../Step_2.dir/src/util/parser.cpp.o | 79864 -------------- .../CMakeFiles/Step_2.dir/src/world.cpp.o | 91457 ---------------- .../src/Step_2.dir/DependInfo.cmake | 27 - .../Step_3.dir/src/Step_2.dir/build.make | 238 - .../src/Step_2.dir/cmake_clean.cmake | 27 - .../src/Step_2.dir/src/image/image.cpp.o | Bin 124512 -> 0 bytes .../src/Step_2.dir/src/image/image.cpp.o.d | 307 - .../src/Step_2.dir/src/math/colliders.cpp.o | Bin 57504 -> 0 bytes .../Step_3.dir/src/{ => engine}/globals.cpp.o | Bin 372816 -> 372840 bytes .../src/{ => engine}/image/image.cpp.o | Bin 469968 -> 470000 bytes .../Step_3.dir/src/engine/main.cpp.o | Bin 0 -> 1312088 bytes .../src/{ => engine}/math/colliders.cpp.o | Bin 221880 -> 221936 bytes .../Step_3.dir/src/engine/raytracing.cpp.o | Bin 0 -> 576656 bytes .../src/{ => engine}/util/debug.cpp.o | Bin 541976 -> 542024 bytes .../src/{ => engine}/util/models.cpp.o | Bin 634880 -> 634952 bytes .../src/{ => engine}/util/parser.cpp.o | Bin 814880 -> 814896 bytes .../Step_3.dir/src/engine/world.cpp.o | Bin 0 -> 927992 bytes .../Step_3.dir/src/graphics/graphics.cpp.o | Bin 0 -> 229992 bytes .../Step_3.dir/src/graphics/input.cpp.o | Bin 0 -> 7408 bytes .../CMakeFiles/Step_3.dir/src/main.cpp.o | Bin 458272 -> 0 bytes .../Step_3.dir/src/raytracing.cpp.o | Bin 398024 -> 0 bytes .../CMakeFiles/Step_3.dir/src/world.cpp.o | Bin 885840 -> 0 bytes .../CMakeFiles/clion-environment.txt | Bin 117 -> 164 bytes .../CMakeFiles/clion-log.txt | 3 +- Step 3/cmake-build-debug/Step_2 | Bin 2002080 -> 0 bytes Step 3/cmake-build-debug/Step_3 | Bin 2002080 -> 2447512 bytes .../Testing/Temporary/LastTest.log | 4 +- Step 3/cmake-build-debug/build.ninja | 82 +- Step 3/cmake-build-debug/config.h | 3 + Step 3/cmake-build-debug/cube.obj | 47 - Step 3/cmake-build-debug/cubeflipped.obj | 47 - Step 3/cmake-build-debug/hello.bmp | Bin 786486 -> 0 bytes Step 3/cmake-build-debug/hello.jpg | Bin 13966 -> 0 bytes Step 3/cmake-build-debug/hello.png | Bin 8245 -> 0 bytes Step 3/cmake-build-debug/house.obj | 255 - Step 3/cmake-build-debug/spider.obj | 1244 - Step 3/cmake-build-debug/test.hdr | Bin 60361 -> 0 bytes Step 3/cmake-build-debug/test.png | Bin 60719 -> 0 bytes .../reply/cache-v2-88194160bcc8243deeea.json | 3395 + .../reply/cache-v2-a166217c1f8b06a41e88.json | 1171 - ...> cmakeFiles-v1-dd3ae7c60de5f194f384.json} | 117 +- ...=> codemodel-v2-e08f054f2c9a051dcb56.json} | 4 +- .../index-2022-10-24T03-45-57-0956.json} | 12 +- ...t-Step_3-Release-46f53ffdc78278c9a2e6.json | 190 - ...t-Step_3-Release-5e3e581373472e214a18.json | 308 + Step 3/cmake-build-release/.ninja_deps | Bin 43920 -> 31980 bytes Step 3/cmake-build-release/.ninja_log | 33 +- .../2022-10-23 14:51:50.png | Bin 0 -> 19863 bytes .../2022-10-23 14:56:10.png | Bin 0 -> 19925 bytes .../2022-10-23 14:57:58.png | Bin 0 -> 19871 bytes .../2022-10-23 14:59:17.png | Bin 0 -> 19913 bytes .../2022-10-23 15:0:21.png | Bin 0 -> 364952 bytes .../2022-10-23 15:0:38.png | Bin 0 -> 13615 bytes .../2022-10-23 15:10:50.png | Bin 0 -> 365468 bytes .../2022-10-23 15:13:6.png | Bin 0 -> 365202 bytes .../2022-10-23 15:14:37.png | Bin 0 -> 366459 bytes .../cmake-build-release/2022-10-23 15:5:8.png | Bin 0 -> 366420 bytes Step 3/cmake-build-release/CMakeCache.txt | 562 + .../CMakeFiles/3.23.2/CMakeSystem.cmake | 8 +- .../CMakeFiles/CMakeError.log | 162 + .../CMakeFiles/CMakeOutput.log | 138 +- .../Step_3.dir/src/{ => engine}/globals.cpp.o | Bin .../src/{ => engine}/image/image.cpp.o | Bin .../Step_3.dir/src/engine/main.cpp.o | Bin 0 -> 70208 bytes .../src/{ => engine}/math/colliders.cpp.o | Bin .../Step_3.dir/src/engine/raytracing.cpp.o | Bin 0 -> 45680 bytes .../src/{ => engine}/util/debug.cpp.o | Bin .../src/{ => engine}/util/models.cpp.o | Bin .../src/{ => engine}/util/parser.cpp.o | Bin .../Step_3.dir/src/{ => engine}/world.cpp.o | Bin .../Step_3.dir/src/graphics/graphics.cpp.o | Bin 0 -> 13840 bytes .../Step_3.dir/src/graphics/input.cpp.o | Bin 0 -> 1552 bytes .../Step_3.dir/src/graphics/shader.cpp.o | Bin 0 -> 808 bytes .../CMakeFiles/Step_3.dir/src/main.cpp.o | Bin 7824 -> 0 bytes .../Step_3.dir/src/raytracing.cpp.o | Bin 12152 -> 0 bytes .../CMakeFiles/clion-environment.txt | Bin 117 -> 164 bytes .../CMakeFiles/clion-log.txt | 3 +- Step 3/cmake-build-release/Step_3 | Bin 188496 -> 247240 bytes .../Testing/Temporary/LastTest.log | 4 +- Step 3/cmake-build-release/build.ninja | 82 +- Step 3/cmake-build-release/config.h | 3 + Step 3/include/{ => engine}/config.h.in | 3 + Step 3/include/{ => engine}/image/image.h | 4 +- .../{ => engine}/image/stb_image_write.h | 0 Step 3/include/{ => engine}/math/bvh.h | 4 +- Step 3/include/{ => engine}/math/colliders.h | 2 +- Step 3/include/{ => engine}/math/vectors.h | 231 +- Step 3/include/{ => engine}/raytracing.h | 39 +- Step 3/include/{ => engine}/types.h | 4 +- Step 3/include/{ => engine}/util/debug.h | 2 +- Step 3/include/{ => engine}/util/logging.h | 0 Step 3/include/{ => engine}/util/models.h | 8 +- Step 3/include/{ => engine}/util/parser.h | 2 +- Step 3/include/{ => engine}/util/std.h | 2 +- Step 3/include/{ => engine}/world.h | 10 +- Step 3/include/graphics/graphics.h | 57 + Step 3/include/graphics/input.h | 23 + Step 3/include/graphics/keys.h | 2047 + Step 3/include/graphics/shader.h | 61 + Step 3/src/{ => engine}/globals.cpp | 2 +- Step 3/src/{ => engine}/image/image.cpp | 4 +- Step 3/src/{ => engine}/main.cpp | 107 +- Step 3/src/{ => engine}/math/colliders.cpp | 2 +- Step 3/src/engine/raytracing.cpp | 145 + Step 3/src/{ => engine}/util/debug.cpp | 2 +- Step 3/src/{ => engine}/util/models.cpp | 2 +- Step 3/src/{ => engine}/util/parser.cpp | 2 +- Step 3/src/{ => engine}/world.cpp | 4 +- Step 3/src/graphics/graphics.cpp | 140 + Step 3/src/graphics/input.cpp | 7 + Step 3/src/graphics/shader.cpp | 232 + Step 3/src/raytracing.cpp | 69 - buildCurrent.sh | 7 + commit.sh | 5 + 143 files changed, 12350 insertions(+), 540549 deletions(-) create mode 100644 Step 3/.~lock.Dev Log Week of 2022-10-23.odt# create mode 100644 Step 3/Dev Log Week of 2022-10-23.odt delete mode 100644 Step 3/cmake-build-debug/.cmake/api/v1/reply/cache-v2-2bb68b2dc8a015f3db85.json create mode 100644 Step 3/cmake-build-debug/.cmake/api/v1/reply/cache-v2-5fdf2e49722c528a78eb.json rename Step 3/cmake-build-debug/.cmake/api/v1/reply/{cmakeFiles-v1-d0808988e4c424b7d583.json => cmakeFiles-v1-8856d3a45f872662a860.json} (51%) rename Step 3/cmake-build-debug/.cmake/api/v1/reply/{codemodel-v2-b49c8e21548565c9db0e.json => codemodel-v2-809b556b407ae400f134.json} (90%) rename Step 3/{cmake-build-release/.cmake/api/v1/reply/index-2022-10-20T21-57-19-0480.json => cmake-build-debug/.cmake/api/v1/reply/index-2022-10-24T03-45-57-0953.json} (81%) create mode 100644 Step 3/cmake-build-debug/.cmake/api/v1/reply/target-Step_3-Debug-29ae124d8ad5641f7764.json delete mode 100644 Step 3/cmake-build-debug/.cmake/api/v1/reply/target-Step_3-Debug-cee5ff9881c99bfed4a1.json delete mode 100644 Step 3/cmake-build-debug/2022-10-18 17:51:27.png delete mode 100644 Step 3/cmake-build-debug/2022-10-18 23:18:20.png create mode 100644 Step 3/cmake-build-debug/2022-10-23 14:49:14.png delete mode 100644 Step 3/cmake-build-debug/2112-10-18 16:35:36.png delete mode 100644 Step 3/cmake-build-debug/462811:27768707:1666122466.1666122466418 52-633-19283.png delete mode 100644 Step 3/cmake-build-debug/462812:27768727:1666123679.1666123679781 52-633-19283.png delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/globals.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/image/image.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/main.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/math/colliders.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/raytracing.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/util/debug.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/util/models.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/util/parser.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_2.dir/src/world.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/Step_2.dir/DependInfo.cmake delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/Step_2.dir/build.make delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/Step_2.dir/cmake_clean.cmake delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/Step_2.dir/src/image/image.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/Step_2.dir/src/image/image.cpp.o.d delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/Step_2.dir/src/math/colliders.cpp.o rename Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/{ => engine}/globals.cpp.o (93%) rename Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/{ => engine}/image/image.cpp.o (91%) create mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/engine/main.cpp.o rename Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/{ => engine}/math/colliders.cpp.o (89%) create mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o rename Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/{ => engine}/util/debug.cpp.o (92%) rename Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/{ => engine}/util/models.cpp.o (90%) rename Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/{ => engine}/util/parser.cpp.o (92%) create mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/engine/world.cpp.o create mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o create mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/graphics/input.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/main.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/raytracing.cpp.o delete mode 100644 Step 3/cmake-build-debug/CMakeFiles/Step_3.dir/src/world.cpp.o delete mode 100755 Step 3/cmake-build-debug/Step_2 delete mode 100644 Step 3/cmake-build-debug/cube.obj delete mode 100644 Step 3/cmake-build-debug/cubeflipped.obj delete mode 100644 Step 3/cmake-build-debug/hello.bmp delete mode 100644 Step 3/cmake-build-debug/hello.jpg delete mode 100644 Step 3/cmake-build-debug/hello.png delete mode 100644 Step 3/cmake-build-debug/house.obj delete mode 100755 Step 3/cmake-build-debug/spider.obj delete mode 100644 Step 3/cmake-build-debug/test.hdr delete mode 100644 Step 3/cmake-build-debug/test.png create mode 100644 Step 3/cmake-build-release/.cmake/api/v1/reply/cache-v2-88194160bcc8243deeea.json delete mode 100644 Step 3/cmake-build-release/.cmake/api/v1/reply/cache-v2-a166217c1f8b06a41e88.json rename Step 3/cmake-build-release/.cmake/api/v1/reply/{cmakeFiles-v1-9e280c6e5825c40a073e.json => cmakeFiles-v1-dd3ae7c60de5f194f384.json} (51%) rename Step 3/cmake-build-release/.cmake/api/v1/reply/{codemodel-v2-919f1268d2bcd49a002a.json => codemodel-v2-e08f054f2c9a051dcb56.json} (91%) rename Step 3/{cmake-build-debug/.cmake/api/v1/reply/index-2022-10-20T21-57-19-0479.json => cmake-build-release/.cmake/api/v1/reply/index-2022-10-24T03-45-57-0956.json} (81%) delete mode 100644 Step 3/cmake-build-release/.cmake/api/v1/reply/target-Step_3-Release-46f53ffdc78278c9a2e6.json create mode 100644 Step 3/cmake-build-release/.cmake/api/v1/reply/target-Step_3-Release-5e3e581373472e214a18.json create mode 100644 Step 3/cmake-build-release/2022-10-23 14:51:50.png create mode 100644 Step 3/cmake-build-release/2022-10-23 14:56:10.png create mode 100644 Step 3/cmake-build-release/2022-10-23 14:57:58.png create mode 100644 Step 3/cmake-build-release/2022-10-23 14:59:17.png create mode 100644 Step 3/cmake-build-release/2022-10-23 15:0:21.png create mode 100644 Step 3/cmake-build-release/2022-10-23 15:0:38.png create mode 100644 Step 3/cmake-build-release/2022-10-23 15:10:50.png create mode 100644 Step 3/cmake-build-release/2022-10-23 15:13:6.png create mode 100644 Step 3/cmake-build-release/2022-10-23 15:14:37.png create mode 100644 Step 3/cmake-build-release/2022-10-23 15:5:8.png create mode 100644 Step 3/cmake-build-release/CMakeFiles/CMakeError.log rename Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/{ => engine}/globals.cpp.o (100%) rename Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/{ => engine}/image/image.cpp.o (100%) create mode 100644 Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/main.cpp.o rename Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/{ => engine}/math/colliders.cpp.o (100%) create mode 100644 Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o rename Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/{ => engine}/util/debug.cpp.o (100%) rename Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/{ => engine}/util/models.cpp.o (100%) rename Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/{ => engine}/util/parser.cpp.o (100%) rename Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/{ => engine}/world.cpp.o (100%) create mode 100644 Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o create mode 100644 Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/input.cpp.o create mode 100644 Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/shader.cpp.o delete mode 100644 Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/main.cpp.o delete mode 100644 Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/raytracing.cpp.o rename Step 3/include/{ => engine}/config.h.in (88%) rename Step 3/include/{ => engine}/image/image.h (96%) rename Step 3/include/{ => engine}/image/stb_image_write.h (100%) rename Step 3/include/{ => engine}/math/bvh.h (99%) rename Step 3/include/{ => engine}/math/colliders.h (99%) rename Step 3/include/{ => engine}/math/vectors.h (69%) rename Step 3/include/{ => engine}/raytracing.h (75%) rename Step 3/include/{ => engine}/types.h (98%) rename Step 3/include/{ => engine}/util/debug.h (99%) rename Step 3/include/{ => engine}/util/logging.h (100%) rename Step 3/include/{ => engine}/util/models.h (96%) rename Step 3/include/{ => engine}/util/parser.h (98%) rename Step 3/include/{ => engine}/util/std.h (99%) rename Step 3/include/{ => engine}/world.h (97%) create mode 100644 Step 3/include/graphics/graphics.h create mode 100644 Step 3/include/graphics/input.h create mode 100644 Step 3/include/graphics/keys.h create mode 100644 Step 3/include/graphics/shader.h rename Step 3/src/{ => engine}/globals.cpp (87%) rename Step 3/src/{ => engine}/image/image.cpp (98%) rename Step 3/src/{ => engine}/main.cpp (64%) rename Step 3/src/{ => engine}/math/colliders.cpp (99%) create mode 100644 Step 3/src/engine/raytracing.cpp rename Step 3/src/{ => engine}/util/debug.cpp (98%) rename Step 3/src/{ => engine}/util/models.cpp (98%) rename Step 3/src/{ => engine}/util/parser.cpp (99%) rename Step 3/src/{ => engine}/world.cpp (99%) create mode 100644 Step 3/src/graphics/graphics.cpp create mode 100644 Step 3/src/graphics/input.cpp create mode 100644 Step 3/src/graphics/shader.cpp delete mode 100644 Step 3/src/raytracing.cpp create mode 100644 buildCurrent.sh create mode 100755 commit.sh diff --git a/Step 3/.idea/inspectionProfiles/Project_Default.xml b/Step 3/.idea/inspectionProfiles/Project_Default.xml index a788d94..6aceefb 100644 --- a/Step 3/.idea/inspectionProfiles/Project_Default.xml +++ b/Step 3/.idea/inspectionProfiles/Project_Default.xml @@ -7,7 +7,7 @@ -