summaryrefslogtreecommitdiff
path: root/include/SSystem/SComponent
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2023-09-02 06:38:08 -0700
committerGitHub <noreply@github.com>2023-09-02 16:38:08 +0300
commit6432e1541ebcf6ba1c535b07f5227bdd4a8d0e61 (patch)
treed01d11c2218d7db5dd00d42b57112765a6ee2ceb /include/SSystem/SComponent
parent2d45b68231560eaf0001914c8f2da4bd81f9dd59 (diff)
setup dolphin VEC/MTX function defines (#1903)
* setup VEC function defines * setup MTX function defines
Diffstat (limited to 'include/SSystem/SComponent')
-rw-r--r--include/SSystem/SComponent/c_m3d_g_lin.h2
-rw-r--r--include/SSystem/SComponent/c_m3d_g_pla.h2
-rw-r--r--include/SSystem/SComponent/c_xyz.h12
3 files changed, 8 insertions, 8 deletions
diff --git a/include/SSystem/SComponent/c_m3d_g_lin.h b/include/SSystem/SComponent/c_m3d_g_lin.h
index e80d2b93bf..096ad4ce90 100644
--- a/include/SSystem/SComponent/c_m3d_g_lin.h
+++ b/include/SSystem/SComponent/c_m3d_g_lin.h
@@ -18,7 +18,7 @@ public:
void SetStartEnd(const cXyz&, const cXyz&);
void SetStartEnd(const Vec&, const Vec&);
void CalcPos(Vec*, f32) const;
- void CalcVec(Vec* pOut) const { PSVECSubtract(&this->mEnd, &this->mStart, pOut); }
+ void CalcVec(Vec* pOut) const { VECSubtract(&this->mEnd, &this->mStart, pOut); }
void SetEnd(const cXyz&);
const cXyz& GetStartP(void) const { return mStart; }
cXyz& GetStartP(void) { return mStart; }
diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h
index 125f06ee7c..2eeb39c25f 100644
--- a/include/SSystem/SComponent/c_m3d_g_pla.h
+++ b/include/SSystem/SComponent/c_m3d_g_pla.h
@@ -23,7 +23,7 @@ public:
virtual ~cM3dGPla() {}
- f32 getPlaneFunc(const Vec* pPoint) const { return mD + PSVECDotProduct(&mNormal, pPoint); }
+ f32 getPlaneFunc(const Vec* pPoint) const { return mD + VECDotProduct(&mNormal, pPoint); }
const cXyz& GetNP() const { return mNormal; }
const cXyz* i_GetNP() const { return &mNormal; }
f32 GetD() const { return mD; }
diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h
index 5218f9d961..12b64bb90e 100644
--- a/include/SSystem/SComponent/c_xyz.h
+++ b/include/SSystem/SComponent/c_xyz.h
@@ -52,9 +52,9 @@ struct cXyz : Vec {
y -= f;
z -= f;
}
- void operator-=(const Vec& other) { PSVECSubtract(this, &other, this); }
- void operator+=(const Vec& other) { PSVECAdd(this, &other, this); }
- void operator*=(f32 scale) { PSVECScale(this, this, scale); }
+ void operator-=(const Vec& other) { VECSubtract(this, &other, this); }
+ void operator+=(const Vec& other) { VECAdd(this, &other, this); }
+ void operator*=(f32 scale) { VECScale(this, this, scale); }
/* 80266C6C */ cXyz getCrossProduct(Vec const&) const;
/* 80266CBC */ cXyz outprod(Vec const&) const;
/* 80266CE4 */ cXyz norm() const;
@@ -111,8 +111,8 @@ struct cXyz : Vec {
}
}
- float getSquareMag() const { return PSVECSquareMag(this); }
- f32 getSquareDistance(const Vec& other) const { return PSVECSquareDistance(this, &other); }
+ float getSquareMag() const { return VECSquareMag(this); }
+ f32 getSquareDistance(const Vec& other) const { return VECSquareDistance(this, &other); }
static float getNearZeroValue() { return 8e-11f; }
@@ -134,7 +134,7 @@ struct cXyz : Vec {
f32 absXZ(const Vec& other) const { return sqrtf(this->abs2XZ(other)); }
f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); }
- f32 getDotProduct(const Vec& other) const { return PSVECDotProduct(this, &other); }
+ f32 getDotProduct(const Vec& other) const { return VECDotProduct(this, &other); }
f32 inprod(const Vec& other) const { return getDotProduct(other); }
};