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

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-11-18 15:19:44 -10:00
parent 57c1196599
commit 35a3923cdf
21 changed files with 68 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/Collision/CCollidableOBBTreeGroup.cpp
View File

@@ -92,6 +92,7 @@ CRayCastResult CCollidableOBBTreeGroup::CastRayInternal(const CInternalRayCastSt
}
}
ret.Transform(rayCast.GetTransform());
return ret;
}

6
Runtime/Collision/CCollisionActor.cpp
View File

@@ -132,6 +132,12 @@ const CCollisionPrimitive* CCollisionActor::GetCollisionPrimitive() const
return x284_spherePrimitive.get();
}
EWeaponCollisionResponseTypes CCollisionActor::GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f&,
const CWeaponMode&, EProjectileAttrib) const
{
return x300_responseType;
}
zeus::CTransform CCollisionActor::GetPrimitiveTransform() const
{
zeus::CTransform xf = x34_transform;

2
Runtime/Collision/CCollisionActor.hpp
View File

@@ -47,6 +47,8 @@ public:
void Touch(CActor &, CStateManager &);
zeus::CVector3f GetOrbitPosition(const CStateManager &) const;
const CCollisionPrimitive* GetCollisionPrimitive() const;
EWeaponCollisionResponseTypes GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f&,
const CWeaponMode&, EProjectileAttrib) const;
zeus::CTransform GetPrimitiveTransform() const;
std::experimental::optional<zeus::CAABox> GetTouchBounds() const;
void SetDamageVulnerability(const CDamageVulnerability& vuln);