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

Implement CCollidableOBBTree

Browse Source
This commit is contained in:
Jack Andersen
2017-07-02 17:34:19 -10:00
parent 704e1b110a
commit 0cfefd22a1
12 changed files with 1067 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Collision/CMetroidAreaCollider.cpp
View File

@@ -820,14 +820,14 @@ bool CMetroidAreaCollider::MovingAABoxCollisionCheck_Cached(const COctreeLeafCac
for (int k=0 ; k<3 ; ++k)
{
u16 vertIdx = vertIndices[k];
zeus::CVector3f point = node.GetOwner().GetVert(vertIdx);
zeus::CVector3f vtx = node.GetOwner().GetVert(vertIdx);
if (g_DupPrimitiveCheckCount != g_DupVertexList[vertIdx])
{
g_DupVertexList[vertIdx] = g_DupPrimitiveCheckCount;
if (movedAABB.pointInside(point))
if (movedAABB.pointInside(vtx))
{
d = dOut;
if (MovingAABoxCollisionCheck_TriVertexBox(point, aabb, dir, d,
if (MovingAABoxCollisionCheck_TriVertexBox(vtx, aabb, dir, d,
normal, point) && d < dOut)
{
CMaterialList vertMat(node.GetOwner().GetVertMaterial(vertIdx));