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

Octree generation fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-12-01 19:50:05 -10:00
parent 7cd3e8f502
commit 357b001cac
14 changed files with 518 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/Collision/CAreaOctTree.cpp
View File

@@ -478,13 +478,13 @@ CAreaOctTree::Node CAreaOctTree::Node::GetChild(int idx) const
if (type == ETreeType::Branch)
{
zeus::CAABox pos, neg, res;
x0_aabb.splitZ(pos, neg);
x0_aabb.splitZ(neg, pos);
if (idx & 4)
{
pos.splitY(pos, neg);
zeus::CAABox(pos).splitY(neg, pos);
if (idx & 2)
{
pos.splitX(pos, neg);
zeus::CAABox(pos).splitX(neg, pos);
if (idx & 1)
res = pos;
else
@@ -492,7 +492,7 @@ CAreaOctTree::Node CAreaOctTree::Node::GetChild(int idx) const
}
else
{
neg.splitX(pos, neg);
zeus::CAABox(neg).splitX(neg, pos);
if (idx & 1)
res = pos;
else
@@ -501,10 +501,10 @@ CAreaOctTree::Node CAreaOctTree::Node::GetChild(int idx) const
}
else
{
neg.splitY(pos, neg);
zeus::CAABox(neg).splitY(neg, pos);
if (idx & 2)
{
pos.splitX(pos, neg);
zeus::CAABox(pos).splitX(neg, pos);
if (idx & 1)
res = pos;
else
@@ -512,7 +512,7 @@ CAreaOctTree::Node CAreaOctTree::Node::GetChild(int idx) const
}
else
{
neg.splitX(pos, neg);
zeus::CAABox(neg).splitX(neg, pos);
if (idx & 1)
res = pos;
else