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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Collision/CMetroidAreaCollider.cpp
View File

@@ -212,7 +212,7 @@ bool CMetroidAreaCollider::ConvexPolyCollision(const zeus::CPlane* planes, const
otherVec.clear();
bool inFrontOf = planes[i].pointToPlaneDist(vec.front()) >= 0.f;
for (int j = 0; j < vec.size(); ++j) {
for (size_t j = 0; j < vec.size(); ++j) {
const zeus::CVector3f& b = vec[(j + 1) % vec.size()];
if (inFrontOf)
otherVec.push_back(vec[j]);
@@ -915,9 +915,9 @@ void CMetroidAreaCollider::ResetInternalCounters() {
g_TrianglesProcessed = 0;
g_DupTrianglesProcessed = 0;
if (g_DupPrimitiveCheckCount == 0xffff) {
memset(g_DupVertexList, 0, 0x5000);
memset(g_DupEdgeList, 0, 0xC000);
memset(g_DupTriangleList, 0, 0x8000);
std::fill(std::begin(g_DupVertexList), std::end(g_DupVertexList), 0);
std::fill(std::begin(g_DupEdgeList), std::end(g_DupEdgeList), 0);
std::fill(std::begin(g_DupTriangleList), std::end(g_DupTriangleList), 0);
g_DupPrimitiveCheckCount += 1;
}
g_DupPrimitiveCheckCount += 1;