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

Minor fixes, use CUnitVector in CCollionInfo

Browse Source
This commit is contained in:
Phillip Stephens
2021-05-23 13:10:57 -07:00
parent f468adc0a3
commit 8f493f17f1
5 changed files with 118 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Collision/CGameCollision.cpp
View File

@@ -218,7 +218,7 @@ void CGameCollision::Move(CStateManager& mgr, CPhysicsActor& actor, float dt,
}
}
bool CGameCollision::CanBlock(const CMaterialList& mat, const zeus::CVector3f& v) {
bool CGameCollision::CanBlock(const CMaterialList& mat, const zeus::CUnitVector3f& v) {
if ((mat.HasMaterial(EMaterialTypes::Character) && !mat.HasMaterial(EMaterialTypes::SolidCharacter)) ||
mat.HasMaterial(EMaterialTypes::NoPlayerCollision)) {
return false;
@@ -231,7 +231,7 @@ bool CGameCollision::CanBlock(const CMaterialList& mat, const zeus::CVector3f& v
return (v.z() > 0.85f);
}
bool CGameCollision::IsFloor(const CMaterialList& mat, const zeus::CVector3f& v) {
bool CGameCollision::IsFloor(const CMaterialList& mat, const zeus::CUnitVector3f& v) {
return mat.HasMaterial(EMaterialTypes::Floor) || v.z() > 0.85f;
}