tri11paragon
/
COSC-3P93-Project
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

BVH is not fixed

main
Brett 2022-11-15 21:51:49 -05:00
parent d7ef170256
commit 711ddeef17
9 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Step 3/cmake-build-release/.ninja_deps
View File

Binary file not shown.

12
Step 3/cmake-build-release/.ninja_log
View File

@ -69,3 +69,15 @@
1 2698 1668560875724544946 CMakeFiles/Step_3.dir/src/engine/raytracing.cpp.o 11f0e227e9fda9ca 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 1 3094 1668560876120556890 CMakeFiles/Step_3.dir/src/engine/main.cpp.o 641dce3f86933e2e
3094 3172 1668560876196559183 Step_3 f055ce2b85635598 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

BIN
Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/main.cpp.o
View File

Binary file not shown.

BIN
Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/engine/world.cpp.o
View File

Binary file not shown.

BIN
Step 3/cmake-build-release/CMakeFiles/Step_3.dir/src/graphics/graphics.cpp.o
View File

Binary file not shown.

BIN
Step 3/cmake-build-release/Step_3
View File

Binary file not shown.

4
Step 3/cmake-build-release/Testing/Temporary/LastTest.log
View File

@ -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

4
Step 3/cmake-build-release/imgui.ini
View File

@ -9,7 +9,7 @@ Size=550,680
Collapsed=1 Collapsed=1
[Window][Debug Menu] [Window][Debug Menu]
Pos=-21,27 Pos=45,46
Size=339,226 Size=339,226
Collapsed=0 Collapsed=0
@ -74,7 +74,7 @@ Size=324,211
Collapsed=0 Collapsed=0
[Window][BVH Data ] [Window][BVH Data ]
Pos=1113,250 Pos=1221,308
Size=522,476 Size=522,476
Collapsed=0 Collapsed=0

2
Step 3/include/engine/math/bvh.h
View File

@ -80,7 +80,7 @@ namespace Raytracing {
if (left != nullptr) if (left != nullptr)
leftHit = left->doesRayIntersect(r, min, ourHitData.tMax); leftHit = left->doesRayIntersect(r, min, ourHitData.tMax);
if (right != nullptr) 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) if (leftHit.data.tMax < rightHit.data.tMax)
return leftHit; return leftHit;