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

CMetroidAreaCollider: Make use of std::array where applicable

Browse Source 
Makes arrays strongly typed and allows eliminating some hardcoded array
sizes. We can also use it to make input data to some data types and
functions significantly more informative.

This also makes it easier for static analysis tools to track out of
bounds accesses if they ever occur.
This commit is contained in:
Lioncash
2020-04-06 04:52:56 -04:00
parent d708337e90
commit f0eadfe56c
5 changed files with 88 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Runtime/Collision/CMetroidAreaCollider.hpp
View File

@@ -1,5 +1,7 @@
#pragma once
#include <array>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Collision/CAreaOctTree.hpp"
@@ -17,7 +19,7 @@ class CMaterialList;
class CAABoxAreaCache {
friend class CMetroidAreaCollider;
const zeus::CAABox& x0_aabb;
const zeus::CPlane* x4_planes;
const std::array<zeus::CPlane, 6>& x4_planes;
const CMaterialFilter& x8_filter;
const CMaterialList& xc_material;
CCollisionInfoList& x10_collisionList;
@@ -25,7 +27,7 @@ class CAABoxAreaCache {
zeus::CVector3f x20_halfExtent;
public:
CAABoxAreaCache(const zeus::CAABox& aabb, const zeus::CPlane* pl, const CMaterialFilter& filter,
CAABoxAreaCache(const zeus::CAABox& aabb, const std::array<zeus::CPlane, 6>& pl, const CMaterialFilter& filter,
const CMaterialList& material, CCollisionInfoList& collisionList);
};
@@ -91,9 +93,9 @@ class CMetroidAreaCollider {
static u32 g_TrianglesProcessed;
static u32 g_DupTrianglesProcessed;
static u16 g_DupPrimitiveCheckCount;
static u16 g_DupVertexList[0x5000];
static u16 g_DupEdgeList[0xC000];
static u16 g_DupTriangleList[0x4000];
static std::array<u16, 0x5000> g_DupVertexList;
static std::array<u16, 0xC000> 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);
@@ -131,7 +133,8 @@ public:
};
static void BuildOctreeLeafCache(const CAreaOctTree::Node& root, const zeus::CAABox& aabb,
CMetroidAreaCollider::COctreeLeafCache& cache);
static bool ConvexPolyCollision(const zeus::CPlane* planes, const zeus::CVector3f* verts, zeus::CAABox& aabb);
static bool ConvexPolyCollision(const std::array<zeus::CPlane, 6>& planes, const zeus::CVector3f* verts,
zeus::CAABox& aabb);
static bool AABoxCollisionCheckBoolean_Cached(const COctreeLeafCache& leafCache, const zeus::CAABox& aabb,
const CMaterialFilter& filter);