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

CCollisionSurface: Collapse separate CVector3f instances into std::array 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Collision/CCollisionSurface.cpp
View File

@ -5,16 +5,16 @@
namespace urde { namespace urde {
CCollisionSurface::CCollisionSurface(const zeus::CVector3f& a, const zeus::CVector3f& b, const zeus::CVector3f& c, CCollisionSurface::CCollisionSurface(const zeus::CVector3f& a, const zeus::CVector3f& b, const zeus::CVector3f& c,
u32 flags) u32 flags)
: x0_a(a), xc_b(b), x18_c(c), x24_flags(flags) {} : x0_data{a, b, c}, x24_flags(flags) {}
zeus::CVector3f CCollisionSurface::GetNormal() const { zeus::CVector3f CCollisionSurface::GetNormal() const {
zeus::CVector3f v1 = (xc_b - x0_a).cross(x18_c - x0_a); const zeus::CVector3f v1 = (x0_data[1] - x0_data[0]).cross(x0_data[2] - x0_data[0]);
return zeus::CUnitVector3f(v1, true); return zeus::CUnitVector3f(v1, true);
} }
zeus::CPlane CCollisionSurface::GetPlane() const { zeus::CPlane CCollisionSurface::GetPlane() const {
zeus::CVector3f norm = GetNormal(); const zeus::CVector3f norm = GetNormal();
return {norm, norm.dot(x0_a)}; return {norm, norm.dot(x0_data[0])};
} }
} // namespace urde } // namespace urde

12
Runtime/Collision/CCollisionSurface.hpp
View File

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