diff --git a/Step 3/cmake-build-release/.ninja_deps b/Step 3/cmake-build-release/.ninja_deps index 8f27e5a..9858040 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 0027d25..8c23a3e 100644 --- a/Step 3/cmake-build-release/.ninja_log +++ b/Step 3/cmake-build-release/.ninja_log @@ -69,3 +69,15 @@ 1 2698 1668560875724544946 CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o 11f0e227e9fda9ca 1 3094 1668560876120556890 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 641dce3f86933e2e 3094 3172 1668560876196559183 Step_3 f055ce2b85635598 +2 1964 1668566401025537861 CMakeFiles/Step_3.dir/src/engine/util/models.cpp.o 164394d360c43072 +3 2028 1668566401089539771 CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o ce988de97a5cb51d +2 2289 1668566401349547534 CMakeFiles/Step_3.dir/src/engine/world.cpp.o 6470df278966c4 +2 2366 1668566401425549802 CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o 11f0e227e9fda9ca +2 2923 1668566401981566405 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 641dce3f86933e2e +2923 3043 1668566402101569987 Step_3 f055ce2b85635598 +1 2496 1668566811137562153 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 641dce3f86933e2e +2496 2588 1668566811229564294 Step_3 f055ce2b85635598 +1 2491 1668566929524384233 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 641dce3f86933e2e +2492 2565 1668566929596385987 Step_3 f055ce2b85635598 +1 2498 1668566958325089586 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 641dce3f86933e2e +2498 2570 1668566958397091357 Step_3 f055ce2b85635598 diff --git a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/main.cpp.o b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/main.cpp.o index 81e5364..4a428d0 100644 Binary files a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/main.cpp.o and b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/main.cpp.o differ diff --git a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/world.cpp.o b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/world.cpp.o index 1fe0aea..d1714f5 100644 Binary files a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/world.cpp.o and b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/world.cpp.o differ diff --git a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o index 50ad88a..b937579 100644 Binary files a/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o and b/Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o differ diff --git a/Step 3/cmake-build-release/Step_3 b/Step 3/cmake-build-release/Step_3 index 4061e5e..aac1b59 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 ac03c72..5b6ea79 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 15 20:07 EST +Start testing: Nov 15 21:49 EST ---------------------------------------------------------- -End testing: Nov 15 20:07 EST +End testing: Nov 15 21:49 EST diff --git a/Step 3/cmake-build-release/imgui.ini b/Step 3/cmake-build-release/imgui.ini index 1a32e0c..43896e8 100644 --- a/Step 3/cmake-build-release/imgui.ini +++ b/Step 3/cmake-build-release/imgui.ini @@ -9,7 +9,7 @@ Size=550,680 Collapsed=1 [Window][Debug Menu] -Pos=-21,27 +Pos=45,46 Size=339,226 Collapsed=0 @@ -74,7 +74,7 @@ Size=324,211 Collapsed=0 [Window][BVH Data ] -Pos=1113,250 +Pos=1221,308 Size=522,476 Collapsed=0 diff --git a/Step 3/include/engine/math/bvh.h b/Step 3/include/engine/math/bvh.h index 36cd048..a07f1d6 100644 --- a/Step 3/include/engine/math/bvh.h +++ b/Step 3/include/engine/math/bvh.h @@ -80,7 +80,7 @@ namespace Raytracing { if (left != nullptr) leftHit = left->doesRayIntersect(r, min, ourHitData.tMax); if (right != nullptr) - rightHit = right->doesRayIntersect(r, min, leftHit.hit ? leftHit.data.tMin : ourHitData.tMax); + rightHit = right->doesRayIntersect(r, min, leftHit.hit ? leftHit.data.tMax : ourHitData.tMax); if (leftHit.data.tMax < rightHit.data.tMax) return leftHit;