AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update nod

This commit is contained in:
Jack Andersen 2017-07-01 19:40:12 -10:00
parent c41427e7f3
commit b7f88906ca
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Collision/CCollidableOBBTree.cpp
View File

@ -3,11 +3,15 @@
namespace urde namespace urde
{ {
u32 CCollidableOBBTree::sTableIndex = 0;
CCollidableOBBTree::CCollidableOBBTree(const COBBTree* tree, const urde::CMaterialList& material) CCollidableOBBTree::CCollidableOBBTree(const COBBTree* tree, const urde::CMaterialList& material)
: CCollisionPrimitive(material), : CCollisionPrimitive(material),
x10_tree((COBBTree*)tree) x10_tree((COBBTree*)tree) {}
{
bool CCollidableOBBTree::LineIntersectsLeaf(const COBBTree::CLeafData& leaf, CRayCastInfo& info) const
{
return false;
} }
FourCC CCollidableOBBTree::GetPrimType() const FourCC CCollidableOBBTree::GetPrimType() const

16
Runtime/Collision/CCollidableOBBTree.hpp
View File

@ -6,18 +6,30 @@
namespace urde namespace urde
{ {
class CRayCastInfo
{
const zeus::CMRay& x0_ray;
const CMaterialFilter& x4_filter;
float x8_mag;
public:
CRayCastInfo(const zeus::CMRay& ray, const CMaterialFilter& filter, float mag)
: x0_ray(ray), x4_filter(filter), x8_mag(mag) {}
};
class CCollidableOBBTree : public CCollisionPrimitive class CCollidableOBBTree : public CCollisionPrimitive
{ {
COBBTree* x10_tree = nullptr; COBBTree* x10_tree = nullptr;
u32 x14_ = 0; u32 x14_ = 0;
u32 x18_ = 0; u32 x18_ = 0;
u32 x1c_ = 0; u32 x1c_ = 0;
static u32 sTableIndex;
bool LineIntersectsLeaf(const COBBTree::CLeafData& leaf, CRayCastInfo& info) const;
public: public:
CCollidableOBBTree(const COBBTree* tree, const CMaterialList& material); CCollidableOBBTree(const COBBTree* tree, const CMaterialList& material);
virtual ~CCollidableOBBTree() {} virtual ~CCollidableOBBTree() = default;
void ResetTestStats() const; void ResetTestStats() const;
void ResetTestStatsRecurse(const COBBTree::CNode&) const; void ResetTestStatsRecurse(const COBBTree::CNode&) const;
u32 GetTableIndex() const { return -1; } u32 GetTableIndex() const { return sTableIndex; }
zeus::CAABox CalculateAABox(const zeus::CTransform &) const; zeus::CAABox CalculateAABox(const zeus::CTransform &) const;
zeus::CAABox CalculateLocalAABox() const; zeus::CAABox CalculateLocalAABox() const;
virtual FourCC GetPrimType() const; virtual FourCC GetPrimType() const;

2
nod

@ -1 +1 @@
Subproject commit 41148a1368f0294addfb5abc5fccdbdfe0c3569b Subproject commit 2a472651ae9dcdce7e5b5c3a1e3d3769ab347e15