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

More Collision related fixes

Browse Source
This commit is contained in:
Phillip Stephens
2017-02-28 19:42:06 -08:00
parent e923d83617
commit 0f90a1f532
15 changed files with 282 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Collision/CCollidableSphere.hpp
View File

@@ -2,6 +2,7 @@
#define __URDE_CCOLLIDALBESPHERE_HPP
#include "CCollisionPrimitive.hpp"
#include "zeus/CSphere.hpp"
namespace urde
{
@@ -17,7 +18,14 @@ class CCollidableSphere : public CCollisionPrimitive
static const Type sType;
static u32 sTableIndex;
zeus::CSphere x10_sphere;
public:
CCollidableSphere(const zeus::CSphere&, const CMaterialList&);
const zeus::CSphere& GetSphere() const;
void SetSphereCenter(const zeus::CVector3f&);
virtual u32 GetTableIndex() const;
virtual zeus::CAABox CalculateAABox(const zeus::CTransform&) const;
virtual zeus::CAABox CalculateLocalAABox() const;
@@ -29,7 +37,7 @@ public:
static bool CollideMovingAABox(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
CCollisionInfo&);
static bool CollideMovingSphere(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
CCollisionInfo&);
CCollisionInfo&);
};
}