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

Fix CNewIntroBoss and particle bugs

Browse Source
This commit is contained in:
Jack Andersen
2019-01-04 17:28:02 -10:00
parent 5b55320e9b
commit d60fcc99c9
17 changed files with 151 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Collision/COBBTree.hpp
View File

@@ -27,7 +27,7 @@ public:
public:
CLeafData() = default;
CLeafData(const std::vector<u16>&);
CLeafData(std::vector<u16>&& surface);
CLeafData(CInputStream&);
const std::vector<u16>& GetSurfaceVector() const;
@@ -45,7 +45,8 @@ public:
public:
CNode() = default;
CNode(const CNode&) = default;
CNode(const zeus::CTransform&, const zeus::CVector3f&, const CNode*, const CNode*, const CLeafData*);
CNode(const zeus::CTransform&, const zeus::CVector3f&, std::unique_ptr<CNode>&&, std::unique_ptr<CNode>&&,
std::unique_ptr<CLeafData>&&);
CNode(CInputStream&);
bool WasHit() const { return x4c_hit; }
@@ -68,11 +69,10 @@ private:
public:
COBBTree() = default;
COBBTree(const COBBTree::SIndexData&, const CNode*);
COBBTree(CInputStream&);
static std::unique_ptr<CCollidableOBBTreeGroupContainer> BuildOrientedBoundingBoxTree(const zeus::CVector3f&,
const zeus::CVector3f&);
static std::unique_ptr<COBBTree> BuildOrientedBoundingBoxTree(const zeus::CVector3f&,
const zeus::CVector3f&);
CCollisionSurface GetSurface(u16 idx) const;
const u16* GetTriangleEdgeIndices(u16 idx) const { return &x18_indexData.x50_surfaceIndices[idx * 3]; }
void GetTriangleVertexIndices(u16 idx, u16 indicesOut[3]) const;