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

CCollisionSurface: Collapse separate CVector3f instances into std::array

Browse Source 
Will allow converting GetVertices() over to returning a reference to
std::array, rather than simply a pointer.
This commit is contained in:
Lioncash
2020-04-06 05:54:21 -04:00
parent 41c2ede092
commit ecf3cfdb49
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/Collision/CCollisionSurface.hpp
View File

@@ -1,5 +1,7 @@
#pragma once
#include <array>
#include "Runtime/GCNTypes.hpp"
#include <zeus/CPlane.hpp>
@@ -7,17 +9,15 @@
namespace urde {
class CCollisionSurface {
zeus::CVector3f x0_a;
zeus::CVector3f xc_b;
zeus::CVector3f x18_c;
std::array<zeus::CVector3f, 3> x0_data;
u32 x24_flags;
public:
CCollisionSurface(const zeus::CVector3f&, const zeus::CVector3f&, const zeus::CVector3f&, u32);
CCollisionSurface(const zeus::CVector3f& a, const zeus::CVector3f& b, const zeus::CVector3f& c, u32 flags);
zeus::CVector3f GetNormal() const;
const zeus::CVector3f& GetVert(s32 idx) const { return (&x0_a)[idx]; }
const zeus::CVector3f* GetVerts() const { return &x0_a; }
const zeus::CVector3f& GetVert(s32 idx) const { return x0_data[idx]; }
const zeus::CVector3f* GetVerts() const { return x0_data.data(); }
zeus::CPlane GetPlane() const;
u32 GetSurfaceFlags() const { return x24_flags; }
};