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

Several collision fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-12-17 16:54:50 -10:00
parent 2a8edf9da8
commit 73ae278c87
29 changed files with 114 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Collision/CCollisionInfo.cpp
View File

@@ -7,9 +7,9 @@ CCollisionInfo CCollisionInfo::GetSwapped() const
{
CCollisionInfo ret;
ret.x0_point = x0_point;
ret.xc_ = xc_;
ret.xc_extentX = xc_extentX;
ret.x30_valid = x30_valid;
ret.x31_ = x31_;
ret.x31_hasExtents = x31_hasExtents;
ret.x38_materialLeft = x40_materialRight;
ret.x40_materialRight = x38_materialLeft;
ret.x48_normalLeft = x54_normalRight;
@@ -26,7 +26,7 @@ void CCollisionInfo::Swap()
zeus::CVector3f CCollisionInfo::GetExtreme() const
{
return x0_point + xc_ + x18_ + x24_;
return x0_point + xc_extentX + x18_extentY + x24_extentZ;
}
}