AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CMetroidAreaCollider: Correct g_DupVertexList and g_DupEdgeList size

This commit is contained in:
Luke Street 2020-09-27 03:04:30 -04:00
parent cfe1507fc7
commit 9a7bceb637
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Collision/CMetroidAreaCollider.cpp
View File

@ -11,8 +11,8 @@ u32 CMetroidAreaCollider::g_RejectedByClip = 0;
u32 CMetroidAreaCollider::g_TrianglesProcessed = 0;
u32 CMetroidAreaCollider::g_DupTrianglesProcessed = 0;
u16 CMetroidAreaCollider::g_DupPrimitiveCheckCount = 0;
std::array<u16, 0x5000> CMetroidAreaCollider::g_DupVertexList{};
std::array<u16, 0xC000> CMetroidAreaCollider::g_DupEdgeList{};
std::array<u16, 0x2800> CMetroidAreaCollider::g_DupVertexList{};
std::array<u16, 0x6000> CMetroidAreaCollider::g_DupEdgeList{};
std::array<u16, 0x4000> CMetroidAreaCollider::g_DupTriangleList{};
CAABoxAreaCache::CAABoxAreaCache(const zeus::CAABox& aabb, const std::array<zeus::CPlane, 6>& pl,

4
Runtime/Collision/CMetroidAreaCollider.hpp
View File

@ -93,8 +93,8 @@ class CMetroidAreaCollider {
static u32 g_TrianglesProcessed;
static u32 g_DupTrianglesProcessed;
static u16 g_DupPrimitiveCheckCount;
static std::array<u16, 0x5000> g_DupVertexList;
static std::array<u16, 0xC000> g_DupEdgeList;
static std::array<u16, 0x2800> g_DupVertexList;
static std::array<u16, 0x6000> g_DupEdgeList;
static std::array<u16, 0x4000> g_DupTriangleList;
static bool AABoxCollisionCheckBoolean_Internal(const CAreaOctTree::Node& node, const CBooleanAABoxAreaCache& cache);
static bool AABoxCollisionCheck_Internal(const CAreaOctTree::Node& node, const CAABoxAreaCache& cache);