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

CAreaOctTree: Make use of std::array where applicable

This commit is contained in:
Lioncash 2020-04-22 02:05:22 -04:00
parent f24559890a
commit 472e97aac0
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Runtime/Collision/CAreaOctTree.cpp
View File

@ -276,7 +276,7 @@ void CAreaOctTree::Node::LineTestExInternal(const zeus::CLine& line, const CMate
} else if (x20_nodeType == ETreeType::Branch) { } else if (x20_nodeType == ETreeType::Branch) {
if (GetChildFlags() == 0xA) // 2 leaves if (GetChildFlags() == 0xA) // 2 leaves
{ {
SRayResult tmpRes[2]; std::array<SRayResult, 2> tmpRes;
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
Node child = GetChild(i); Node child = GetChild(i);
float tf1 = lT; float tf1 = lT;
@ -308,17 +308,20 @@ void CAreaOctTree::Node::LineTestExInternal(const zeus::CLine& line, const CMate
zeus::CVector3f lowPoint = line.origin + lT * line.dir; zeus::CVector3f lowPoint = line.origin + lT * line.dir;
zeus::CVector3f highPoint = line.origin + hT * line.dir; zeus::CVector3f highPoint = line.origin + hT * line.dir;
int comps[] = {-1, -1, -1, 0}; std::array<int, 4> comps{-1, -1, -1, 0};
float compT[3]; std::array<float, 3> compT;
int numComps = 0; int numComps = 0;
for (int i = 0; i < 3; ++i) { for (size_t i = 0; i < compT.size(); ++i) {
if (lowPoint[i] >= center[i] || highPoint[i] <= center[i]) if (lowPoint[i] >= center[i] || highPoint[i] <= center[i]) {
if (highPoint[i] >= center[i] || lowPoint[i] <= center[i]) if (highPoint[i] >= center[i] || lowPoint[i] <= center[i]) {
continue; continue;
if (_close_enough(line.dir[i], 0.f, 0.000099999997f)) }
}
if (_close_enough(line.dir[i], 0.f, 0.000099999997f)) {
continue; continue;
comps[numComps++] = i; }
comps[numComps++] = static_cast<int>(i);
compT[i] = dirRecip[i] * (center[i] - line.origin[i]); compT[i] = dirRecip[i] * (center[i] - line.origin[i]);
} }