PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-10 18:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Text parser progress, add missing OSFont.c file

Browse Source
This commit is contained in:
Phillip Stephens
2024-10-22 16:12:41 -07:00
parent cc524f13d4
commit a425ca9b42
14 changed files with 572 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
include/Kyoto/Math/CMatrix3f.hpp
View File

@@ -6,50 +6,85 @@
#include "Kyoto/Math/CTransform4f.hpp"
#include "Kyoto/Math/CVector3f.hpp"
class CInputStream;
class CMatrix3f {
static const CMatrix3f sIdentity;
public:
CMatrix3f(float _m00, float _m01, float _m02, float _m10, float _m11, float _m12, float _m20,
float _m21, float _m22)
: m00(_m00)
, m01(_m01)
, m02(_m02)
, m10(_m10)
, m11(_m11)
, m12(_m12)
, m20(_m20)
, m21(_m21)
, m22(_m22) {}
CMatrix3f(const CVector3f& _m0, const CVector3f& _m1, const CVector3f& _m2);
CMatrix3f(const CMatrix3f& left, float leftScale, const CMatrix3f& right, float rightScale);
CMatrix3f(CInputStream& in);
CMatrix3f(const CMatrix3f&);
CMatrix3f(const CVector3f& m0, const CVector3f& m1, const CVector3f& m2);
// fake but useful for CEulerAngles?
CMatrix3f(const CTransform4f& xf);/*
: m0(xf.GetRow(kDX))
, m1(xf.GetRow(kDY))
, m2(xf.GetRow(kDZ)) {}*/
CMatrix3f(const CTransform4f& xf); /*
: m0(xf.GetRow(kDX))
, m1(xf.GetRow(kDY))
, m2(xf.GetRow(kDZ)) {}*/
void RotateY(const CRelAngle& angle);
void RotateZ(const CRelAngle& angle);
const CMatrix3f& operator=(const CMatrix3f& other);
const CVector3f operator*(const CVector3f&) const;
const CMatrix3f operator*(const CMatrix3f&) const;
static const CMatrix3f& Identity() { return sIdentity; }
CMatrix3f Orthonormalized() const;
float Determinant() const;
void AddScaledMatrix(const CMatrix3f& mat, float scale);
// TODO: names/check
inline const CVector3f& GetRow(EDimX dim) const { return m0; }
inline const CVector3f& GetRow(EDimY dim) const { return m1; }
inline const CVector3f& GetRow(EDimZ dim) const { return m2; }
inline const CVector3f& GetRow(EDimX dim) const {
return *reinterpret_cast< const CVector3f* >(&m00);
}
inline const CVector3f& GetRow(EDimY dim) const {
return *reinterpret_cast< const CVector3f* >(&m10);
}
inline const CVector3f& GetRow(EDimZ dim) const {
return *reinterpret_cast< const CVector3f* >(&m20);
}
float Get00() const { return m0.GetX(); }
float Get01() const { return m0.GetY(); }
float Get02() const { return m0.GetZ(); }
float Get10() const { return m1.GetX(); }
float Get11() const { return m1.GetY(); }
float Get12() const { return m1.GetZ(); }
float Get20() const { return m2.GetX(); }
float Get21() const { return m2.GetY(); }
float Get22() const { return m2.GetZ(); }
float Get00() const { return m00; }
float Get01() const { return m01; }
float Get02() const { return m02; }
float Get10() const { return m10; }
float Get11() const { return m11; }
float Get12() const { return m12; }
float Get20() const { return m20; }
float Get21() const { return m21; }
float Get22() const { return m22; }
inline CVector3f GetColumn(EDimY dim) const { return CVector3f(m0.GetY(), m1.GetY(), m2.GetY()); }
inline CVector3f GetColumn(EDimY dim) const { return CVector3f(m01, m11, m21); }
static CMatrix3f FromTransform(const CTransform4f& xf);/* {
return CMatrix3f(xf.GetRow(kDX), xf.GetRow(kDY), xf.GetRow(kDZ));
}*/
static CMatrix3f FromTransform(const CTransform4f& xf); /* {
return CMatrix3f(xf.GetRow(kDX), xf.GetRow(kDY), xf.GetRow(kDZ));
}*/
private:
// TODO maybe individual floats
CVector3f m0;
CVector3f m1;
CVector3f m2;
float m00;
float m01;
float m02;
float m10;
float m11;
float m12;
float m20;
float m21;
float m22;
// CVector3f m0;
// CVector3f m1;
// CVector3f m2;
};
CHECK_SIZEOF(CMatrix3f, 0x24);