AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-12-09 19:30:01 -10:00
parent 5e03278eff
commit 8901ac2150
16 changed files with 179 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Collision/CAreaOctTree.cpp
View File

@@ -17,6 +17,8 @@ static bool BoxLineTest(const zeus::CAABox& aabb, const zeus::CLine& line, float
const float* aabbMax = &aabb.max.x;
const float* lorigin = &line.origin.x;
const float* ldir = &line.dir.x;
lT = -FLT_MAX;
hT = FLT_MAX;
for (int i=0 ; i<3 ; ++i)
{
@@ -27,16 +29,16 @@ static bool BoxLineTest(const zeus::CAABox& aabb, const zeus::CLine& line, float
if (*ldir < 0.f)
{
if (*aabbMax - *lorigin < lT * *ldir)
lT = *aabbMax - *lorigin * 1.f / *ldir;
lT = (*aabbMax - *lorigin) * 1.f / *ldir;
if (*aabbMin - *lorigin > hT * *ldir)
hT = *aabbMin - *lorigin * 1.f / *ldir;
hT = (*aabbMin - *lorigin) * 1.f / *ldir;
}
else
{
if (*aabbMin - *lorigin > lT * *ldir)
lT = *aabbMin - *lorigin * 1.f / *ldir;
lT = (*aabbMin - *lorigin) * 1.f / *ldir;
if (*aabbMax - *lorigin < hT * *ldir)
hT = *aabbMax - *lorigin * 1.f / *ldir;
hT = (*aabbMax - *lorigin) * 1.f / *ldir;
}
++aabbMin;