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

All MREA cooker sections initial integration

Browse Source
This commit is contained in:
Jack Andersen
2016-08-11 09:52:22 -10:00
parent bc8daa1d50
commit e14bbeb368
16 changed files with 548 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Collision/CAreaOctTree.cpp
View File

@@ -7,7 +7,7 @@ CAreaOctTree::Node CAreaOctTree::Node::GetChild(int idx) const
{
u16 flags = *reinterpret_cast<const u16*>(m_ptr);
const u32* offsets = reinterpret_cast<const u32*>(m_ptr + 4);
ETreeType type = ETreeType((flags << (2 * idx)) & 0x3);
ETreeType type = ETreeType((flags >> (2 * idx)) & 0x3);
if (type == ETreeType::Branch)
{
@@ -76,7 +76,7 @@ void CAreaOctTree::SwapTreeNode(u8* ptr, Node::ETreeType type)
for (int i=0 ; i<8 ; ++i)
{
Node::ETreeType ctype = Node::ETreeType((*typeBits << (2 * i)) & 0x3);
Node::ETreeType ctype = Node::ETreeType((*typeBits >> (2 * i)) & 0x3);
u32* offsets = reinterpret_cast<u32*>(ptr + 4);
offsets[i] = hecl::SBig(offsets[i]);
SwapTreeNode(ptr + offsets[i] + 36, ctype);