summaryrefslogtreecommitdiff
path: root/src/d
diff options
context:
space:
mode:
Diffstat (limited to 'src/d')
-rw-r--r--src/d/a/d_a_base.cpp8
-rw-r--r--src/d/a/obj/d_a_obj_switch.cpp8
-rw-r--r--src/d/a/obj/d_a_obj_tbox.cpp6
-rw-r--r--src/d/col/bg/d_bg_s.cpp4
-rw-r--r--src/d/col/bg/d_bg_w.cpp26
-rw-r--r--src/d/col/bg/d_bg_w_kcol.cpp2
-rw-r--r--src/d/col/bg/d_bg_w_time.cpp6
-rw-r--r--src/d/col/c/c_cc_d.cpp60
-rw-r--r--src/d/col/c/c_m3d.cpp6
-rw-r--r--src/d/col/c/c_m3d_g_aab.cpp4
-rw-r--r--src/d/col/c/c_m3d_g_cps.cpp4
-rw-r--r--src/d/col/c/c_m3d_g_lin.cpp6
-rw-r--r--src/d/col/c/c_m3d_g_unk.cpp20
-rw-r--r--src/d/col/cc/d_cc_d.cpp2
-rw-r--r--src/d/col/cc/d_cc_mass_s.cpp10
-rw-r--r--src/d/col/cc/d_cc_s.cpp2
-rw-r--r--src/d/lyt/d_screen_fader.cpp8
17 files changed, 91 insertions, 91 deletions
diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp
index f5588812..8619d9b2 100644
--- a/src/d/a/d_a_base.cpp
+++ b/src/d/a/d_a_base.cpp
@@ -391,7 +391,7 @@ bool dAcBase_c::getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDis
bool isWithinThreshhold = false;
if (actor != nullptr) {
- distSquared = PSVECSquareDistance(mPosition, actor->mPosition);
+ distSquared = VECSquareDistance(mPosition, actor->mPosition);
if (distSquared <= distThresh * distThresh) {
isWithinThreshhold = true;
@@ -414,7 +414,7 @@ bool dAcBase_c::getDistanceAndAngleToActor(
mAng angleToActorY(0), angleToActorX(0);
if (actor != nullptr) {
- distSquared = PSVECSquareDistance(mPosition, actor->mPosition);
+ distSquared = VECSquareDistance(mPosition, actor->mPosition);
angleToActorY.set(cLib::targetAngleY(mPosition, actor->mPosition));
angleToActorX.set(cLib::targetAngleX(mPosition, actor->mPosition));
@@ -453,11 +453,11 @@ bool dAcBase_c::getDistanceAndAngleToPlayer(
}
f32 dAcBase_c::getDistToPlayer() {
- return EGG::Math<f32>::sqrt(PSVECSquareDistance(mPosition, dAcPy_c::LINK->mPosition));
+ return EGG::Math<f32>::sqrt(VECSquareDistance(mPosition, dAcPy_c::LINK->mPosition));
}
f32 dAcBase_c::getSquareDistToPlayer() {
- return PSVECSquareDistance(mPosition, dAcPy_c::LINK->mPosition);
+ return VECSquareDistance(mPosition, dAcPy_c::LINK->mPosition);
}
// Some weirdness with the float registers being used
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp
index 9f75909b..6ffba7c8 100644
--- a/src/d/a/obj/d_a_obj_switch.cpp
+++ b/src/d/a/obj/d_a_obj_switch.cpp
@@ -26,8 +26,8 @@ void dAcOswMdlCallback_c::timingB(u32 nodeId, nw4r::g3d::WorldMtxManip *manip, n
mMtx_c mtx1;
mMtx_c mtx2;
manip->GetMtx(mtx1);
- PSMTXTrans(mtx2, mElevation, 0.0f, 0.0f);
- PSMTXConcat(mtx1, mtx2, mtx1);
+ MTXTrans(mtx2, mElevation, 0.0f, 0.0f);
+ MTXConcat(mtx1, mtx2, mtx1);
manip->SetMtx(mtx1);
}
}
@@ -189,8 +189,8 @@ int dAcOsw_c::actorExecute() {
updateMatrix();
field_0x5B8.copyFrom(mWorldMtx);
mMtx_c tmp;
- PSMTXTrans(tmp, 0.0f, mButtonCtrl.mElevation, 0.0f);
- PSMTXConcat(field_0x5B8, tmp, field_0x5B8);
+ MTXTrans(tmp, 0.0f, mButtonCtrl.mElevation, 0.0f);
+ MTXConcat(field_0x5B8, tmp, field_0x5B8);
mModel.setScale(mScale);
mModel.setLocalMtx(mWorldMtx);
mModel.calc(false);
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp
index 07264a7d..931dc459 100644
--- a/src/d/a/obj/d_a_obj_tbox.cpp
+++ b/src/d/a/obj/d_a_obj_tbox.cpp
@@ -2418,7 +2418,7 @@ void dAcTbox_c::fn_8026DAC0(mAng &ang) {
}
void dAcTbox_c::fn_8026DAD0(const mVec3_c *a, mVec3_c *b) const {
- PSMTXMultVec(mWorldMtx, *a, *b);
+ MTXMultVec(mWorldMtx, *a, *b);
}
void dAcTbox_c::getCylParams(mVec3_c *c, f32 *r, f32 *h) const {
@@ -2529,7 +2529,7 @@ void dAcTbox_c::getCylParams(mVec3_c *c, f32 *r, f32 *h) const {
break;
}
if (c != nullptr) {
- PSMTXMultVec(mWorldMtx, *c, *c);
+ MTXMultVec(mWorldMtx, *c, *c);
}
}
@@ -2631,7 +2631,7 @@ bool dAcTbox_c::checkForLinkBonk() {
}
mVec3_c linkPos;
- PSMTXMultVec(mCcD3.mInvMtx, link->mPosition, linkPos);
+ MTXMultVec(mCcD3.mInvMtx, link->mPosition, linkPos);
mVec3_c ccLo, ccHi;
getCCBounds(&ccLo, &ccHi);
// Math performed in local coordinate space
diff --git a/src/d/col/bg/d_bg_s.cpp b/src/d/col/bg/d_bg_s.cpp
index 17dd3b29..5252f964 100644
--- a/src/d/col/bg/d_bg_s.cpp
+++ b/src/d/col/bg/d_bg_s.cpp
@@ -886,10 +886,10 @@ void dBgS_MoveBGProc_Typical(
mMtx_c a;
if (i_bgw->GetOldInvMtx(&a) != NULL) {
mVec3_c moveOld;
- PSMTXMultVec(a, *i_pos, moveOld);
+ MTXMultVec(a, *i_pos, moveOld);
mVec3_c movePos;
- PSMTXMultVec(i_bgw->mInvMtx, moveOld, movePos);
+ MTXMultVec(i_bgw->mInvMtx, moveOld, movePos);
*i_pos = movePos;
}
}
diff --git a/src/d/col/bg/d_bg_w.cpp b/src/d/col/bg/d_bg_w.cpp
index fc8256ac..bfe905ea 100644
--- a/src/d/col/bg/d_bg_w.cpp
+++ b/src/d/col/bg/d_bg_w.cpp
@@ -31,9 +31,9 @@ cBgW::cBgW()
mpGrp(nullptr),
mpNodeTree(nullptr),
mNeedsFullTransform(true) {
- PSMTXIdentity(mInvMtx);
- PSMTXIdentity(mMtx);
- PSMTXIdentity(mMtxUnk);
+ MTXIdentity(mInvMtx);
+ MTXIdentity(mMtx);
+ MTXIdentity(mMtxUnk);
}
cBgW::~cBgW() {
@@ -65,24 +65,24 @@ void cBgW::FreeArea() {
}
u32 cBgW::GetOldInvMtx(mMtx_c *m) {
- return PSMTXInverse(mMtx, *m);
+ return MTXInverse(mMtx, *m);
}
void cBgW::UpdateMtx() {
if (!mpMdlMtx) {
- PSMTXIdentity(mInvMtx);
- PSMTXIdentity(mMtx);
- PSMTXIdentity(mMtxUnk);
+ MTXIdentity(mInvMtx);
+ MTXIdentity(mMtx);
+ MTXIdentity(mMtxUnk);
} else {
- PSMTXCopy(*mpMdlMtx, mInvMtx);
+ MTXCopy(*mpMdlMtx, mInvMtx);
if (mpScale) {
mMtx_c scale;
- PSMTXScale(scale, mpScale->x, mpScale->y, mpScale->z);
- PSMTXConcat(mInvMtx, scale, mInvMtx);
+ MTXScale(scale, mpScale->x, mpScale->y, mpScale->z);
+ MTXConcat(mInvMtx, scale, mInvMtx);
}
- PSMTXCopy(mInvMtx, mMtx);
- PSMTXCopy(mInvMtx, mMtxUnk);
+ MTXCopy(mInvMtx, mMtx);
+ MTXCopy(mInvMtx, mMtxUnk);
}
}
@@ -99,7 +99,7 @@ void cBgW::GlobalVtx() {
} else {
int i = 0;
do {
- PSMTXMultVec(mInvMtx, mpBgd->mVtxTbl[i], mpVtxTbl[i]);
+ MTXMultVec(mInvMtx, mpBgd->mVtxTbl[i], mpVtxTbl[i]);
i++;
} while (i < mpBgd->mVtxNum);
}
diff --git a/src/d/col/bg/d_bg_w_kcol.cpp b/src/d/col/bg/d_bg_w_kcol.cpp
index ce27c650..e6bcc6d1 100644
--- a/src/d/col/bg/d_bg_w_kcol.cpp
+++ b/src/d/col/bg/d_bg_w_kcol.cpp
@@ -146,7 +146,7 @@ void dBgWKCol::vt_0x3C() {
bool dBgWKCol::LineCheck(cBgS_LinChk *pLine) {
mVec3_c diff;
VEC3Sub(diff, pLine->mLin.GetStartP(), pLine->mLin.GetEndP());
- f32 mag = PSVECMag(diff);
+ f32 mag = VECMag(diff);
if (mag < 500.0f) {
int tmp0 = (int)(mag * 0.002f) + 1;
f32 tmp1 = mag / (tmp0 + 1);
diff --git a/src/d/col/bg/d_bg_w_time.cpp b/src/d/col/bg/d_bg_w_time.cpp
index 7360bd4d..48737219 100644
--- a/src/d/col/bg/d_bg_w_time.cpp
+++ b/src/d/col/bg/d_bg_w_time.cpp
@@ -49,9 +49,9 @@ bool dBgWTime::GetTriPnt(cBgS_PolyInfo const &info, mVec3_c *pA, mVec3_c *pB, mV
pB->set(1.f, 0.f, -1.f);
pC->set(-1.f, 0.f, -1.f);
- PSMTXMultVec(mtx, *pA, *pA);
- PSMTXMultVec(mtx, *pB, *pB);
- PSMTXMultVec(mtx, *pC, *pC);
+ MTXMultVec(mtx, *pA, *pA);
+ MTXMultVec(mtx, *pB, *pB);
+ MTXMultVec(mtx, *pC, *pC);
*pA += info.GetField0x20();
*pB += info.GetField0x20();
diff --git a/src/d/col/c/c_cc_d.cpp b/src/d/col/c/c_cc_d.cpp
index ab5c6247..bdabbceb 100644
--- a/src/d/col/c/c_cc_d.cpp
+++ b/src/d/col/c/c_cc_d.cpp
@@ -19,7 +19,7 @@
#include "rvl/MTX.h" // IWYU pragma: export
static inline void MtxTransMinusXYZ(mMtx_c &mtx, f32 x, f32 y, f32 z) {
- PSMTXTrans(mtx, -x, -y, -z);
+ MTXTrans(mtx, -x, -y, -z);
}
mVec3_c cCcD_ShapeAttr::sVirtualCenter = mVec3_c::Zero;
@@ -692,7 +692,7 @@ bool cCcD_TriAttr::GetNVec(const mVec3_c &pnt, mVec3_c *pOut) const {
*pOut = GetN();
} else {
*pOut = GetN();
- PSVECScale(*pOut, *pOut, -1.0f);
+ VECScale(*pOut, *pOut, -1.0f);
}
return true;
}
@@ -728,8 +728,8 @@ cCcD_UnkAttr::~cCcD_UnkAttr() {}
bool cCcD_UnkAttr::Calc(const mVec3_c &start, const mVec3_c &end, mVec3_c *pOut) {
mVec3_c tmp0, tmp1;
const mMtx_c &inv = mInvMtx;
- PSMTXMultVec(inv, start, tmp0);
- PSMTXMultVec(inv, end, tmp1);
+ MTXMultVec(inv, start, tmp0);
+ MTXMultVec(inv, end, tmp1);
for (int i = 0; i < 3; i++) {
bool tmp0Min = tmp0(i) < mMin(i);
bool tmp0Max = tmp0(i) > mMax(i);
@@ -761,7 +761,7 @@ bool cCcD_UnkAttr::Calc(const mVec3_c &start, const mVec3_c &end, mVec3_c *pOut)
(*pOut)(i) = (tmp0(i) + tmp1(i)) * 0.5f;
}
}
- PSMTXMultVec(mMtx, *pOut, *pOut);
+ MTXMultVec(mMtx, *pOut, *pOut);
return true;
}
@@ -827,23 +827,23 @@ void cCcD_UnkAttr::CalcAabBox() {
mVec3_c a;
a = start;
- PSMTXMultVec(mtx, a, a);
+ MTXMultVec(mtx, a, a);
mAab.SetMinMax(a);
a = end;
- PSMTXMultVec(mtx, a, a);
+ MTXMultVec(mtx, a, a);
mAab.SetMinMax(a);
a.x = start.x;
a.y = start.y;
a.z = end.z;
- PSMTXMultVec(mtx, a, a);
+ MTXMultVec(mtx, a, a);
mAab.SetMinMax(a);
a.x = end.x;
a.y = end.y;
a.z = start.z;
- PSMTXMultVec(mtx, a, a);
+ MTXMultVec(mtx, a, a);
mAab.SetMinMax(a);
}
@@ -988,18 +988,18 @@ bool cCcD_CpsAttr::Calc(const mVec3_c &start, const mVec3_c &end, mVec3_c *pOut)
}
bInverse = false;
} else {
- PSMTXTrans(mtx0, startRef.x, startRef.y, startRef.z);
+ MTXTrans(mtx0, startRef.x, startRef.y, startRef.z);
mtx0.XrotM(mAng::atan2s(-dist, tmp0.y));
mtx0.YrotM(mAng::atan2s(-tmp0.x, tmp0.z));
mMtx_c mtx1;
MtxTransMinusXYZ(mtx1, startRef.x, startRef.y, startRef.z);
- PSMTXConcat(mtx0, mtx1, mtx0);
- PSMTXMultVec(mtx0, start, tmp1);
- PSMTXMultVec(mtx0, end, tmp2);
+ MTXConcat(mtx0, mtx1, mtx0);
+ MTXMultVec(mtx0, start, tmp1);
+ MTXMultVec(mtx0, end, tmp2);
tmp3 = GetStart();
- PSMTXMultVec(mtx0, GetEnd(), tmp4);
+ MTXMultVec(mtx0, GetEnd(), tmp4);
bInverse = true;
}
tmp3.y -= GetR() * 0.5f;
@@ -1007,8 +1007,8 @@ bool cCcD_CpsAttr::Calc(const mVec3_c &start, const mVec3_c &end, mVec3_c *pOut)
cyl.SetC(tmp3, GetR(), tmp4.y - tmp3.y);
CalcCyl(cyl, tmp1, tmp2, pOut);
if (bInverse) {
- PSMTXInverse(mtx0, mtx0);
- PSMTXMultVec(mtx0, *pOut, *pOut);
+ MTXInverse(mtx0, mtx0);
+ MTXMultVec(mtx0, *pOut, *pOut);
}
return true;
}
@@ -1111,31 +1111,31 @@ void cCcD_CpsAttr::CalcAabBox() {
bool cCcD_CpsAttr::GetNVec(const mVec3_c &param0, mVec3_c *pOut) const {
mVec3_c tmp1;
- PSVECSubtract(GetEnd(), GetStart(), tmp1);
- f32 sqMag = PSVECDotProduct(tmp1, tmp1);
+ VECSubtract(GetEnd(), GetStart(), tmp1);
+ f32 sqMag = VECDotProduct(tmp1, tmp1);
if (cM3d_IsZero(sqMag)) {
return false;
}
mVec3_c tmp2;
- PSVECSubtract(param0, GetStart(), tmp2);
- f32 sqDist = PSVECDotProduct(tmp2, tmp1) / sqMag;
+ VECSubtract(param0, GetStart(), tmp2);
+ f32 sqDist = VECDotProduct(tmp2, tmp1) / sqMag;
mVec3_c tmp3;
if (sqDist < 0.f) {
tmp3 = GetStart();
} else if (sqDist > 1.f) {
tmp3 = GetEnd();
} else {
- PSVECScale(tmp1, tmp1, sqDist);
- PSVECAdd(tmp1, GetStart(), tmp3);
+ VECScale(tmp1, tmp1, sqDist);
+ VECAdd(tmp1, GetStart(), tmp3);
}
- PSVECSubtract(param0, tmp3, *pOut);
- if (cM3d_IsZero(PSVECMag(*pOut))) {
+ VECSubtract(param0, tmp3, *pOut);
+ if (cM3d_IsZero(VECMag(*pOut))) {
pOut->set(0.f, 0.f, 0.f);
return false;
} else {
- PSVECNormalize(*pOut, *pOut);
+ VECNormalize(*pOut, *pOut);
return true;
}
}
@@ -1266,12 +1266,12 @@ bool cCcD_CylAttr::GetNVec(const mVec3_c &param0, mVec3_c *pOut) const {
vec = GetC();
vec.y = param0.y;
}
- PSVECSubtract(param0, vec, *pOut);
- if (cM3d_IsZero(PSVECMag(*pOut))) {
+ VECSubtract(param0, vec, *pOut);
+ if (cM3d_IsZero(VECMag(*pOut))) {
pOut->set(0.f, 0.f, 0.f);
return false;
} else {
- PSVECNormalize(*pOut, *pOut);
+ VECNormalize(*pOut, *pOut);
return true;
}
}
@@ -1393,11 +1393,11 @@ bool cCcD_SphAttr::GetNVec(const mVec3_c &param0, mVec3_c *param1) const {
param1->x = param0.x - GetC().x;
param1->y = param0.y - GetC().y;
param1->z = param0.z - GetC().z;
- if (cM3d_IsZero(PSVECMag(*param1))) {
+ if (cM3d_IsZero(VECMag(*param1))) {
param1->set(0.0f, 0.0f, 0.0f);
return false;
} else {
- PSVECNormalize(*param1, *param1);
+ VECNormalize(*param1, *param1);
return true;
}
}
diff --git a/src/d/col/c/c_m3d.cpp b/src/d/col/c/c_m3d.cpp
index ca55d2da..f69a11a7 100644
--- a/src/d/col/c/c_m3d.cpp
+++ b/src/d/col/c/c_m3d.cpp
@@ -169,8 +169,8 @@ bool cM3d_Cross_SphSph(const cM3dGSph &, const cM3dGSph &, VEC3 *) {
void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph &pSph, const cM3dGTri &pTri, VEC3 *pPnt) {
VEC3 scale, add;
- PSVECAdd(pTri.mA, pTri.mB, add);
- PSVECScale(add, scale, 0.5f);
+ VECAdd(pTri.mA, pTri.mB, add);
+ VECScale(add, scale, 0.5f);
const f32 mag = VEC3DistSq(&scale, &pSph.GetC());
if (cM3d_IsZero(mag)) {
*pPnt = pSph.GetC();
@@ -245,7 +245,7 @@ f32 cM3d_lineVsPosSuisenCross(const VEC3 &, const VEC3 &, const VEC3 &, VEC3 *)
}
bool cM3d_Normalize(nw4r::math::VEC3 *pPnt) {
- f32 mag = PSVECMag(*pPnt);
+ f32 mag = VECMag(*pPnt);
if (cM3d_IsZero(mag)) {
return true;
}
diff --git a/src/d/col/c/c_m3d_g_aab.cpp b/src/d/col/c/c_m3d_g_aab.cpp
index a0b9a78a..18788741 100644
--- a/src/d/col/c/c_m3d_g_aab.cpp
+++ b/src/d/col/c/c_m3d_g_aab.cpp
@@ -27,8 +27,8 @@ void cM3dGAab::SetMax(const mVec3_c &max) {
}
void cM3dGAab::CalcCenter(mVec3_c &center) const {
- PSVECAdd(mMin, mMax, center);
- PSVECScale(center, center, 0.5f);
+ VECAdd(mMin, mMax, center);
+ VECScale(center, center, 0.5f);
}
void cM3dGAab::PlusR(f32 r) {
diff --git a/src/d/col/c/c_m3d_g_cps.cpp b/src/d/col/c/c_m3d_g_cps.cpp
index 6fbcfc3d..fd1028ac 100644
--- a/src/d/col/c/c_m3d_g_cps.cpp
+++ b/src/d/col/c/c_m3d_g_cps.cpp
@@ -34,10 +34,10 @@ bool cM3dGCps::Cross(cM3dGUnk &unk, mVec3_c *vec) {
bool cM3dGCps::fn_80337f40(const mVec3_c &v) const {
f32 r2 = mRadius * mRadius;
- if (!(mFlags & 1) && PSVECSquareDistance(mStart, v) <= r2) {
+ if (!(mFlags & 1) && VECSquareDistance(mStart, v) <= r2) {
return true;
}
- if (!(mFlags & 2) && PSVECSquareDistance(mEnd, v) <= r2) {
+ if (!(mFlags & 2) && VECSquareDistance(mEnd, v) <= r2) {
return true;
}
f32 tmp;
diff --git a/src/d/col/c/c_m3d_g_lin.cpp b/src/d/col/c/c_m3d_g_lin.cpp
index e602ba11..5266f26d 100644
--- a/src/d/col/c/c_m3d_g_lin.cpp
+++ b/src/d/col/c/c_m3d_g_lin.cpp
@@ -11,9 +11,9 @@ void cM3dGLin::SetStartEnd(const mVec3_c *start, const mVec3_c *end) {
void cM3dGLin::CalcPos(mVec3_c *out, f32 scale) const {
mVec3_c tmp;
- PSVECSubtract(mEnd, mStart, tmp);
- PSVECScale(tmp, tmp, scale);
- PSVECAdd(tmp, mStart, *out);
+ VECSubtract(mEnd, mStart, tmp);
+ VECScale(tmp, tmp, scale);
+ VECAdd(tmp, mStart, *out);
}
void cM3dGLin::SetStart(const mVec3_c &start) {
diff --git a/src/d/col/c/c_m3d_g_unk.cpp b/src/d/col/c/c_m3d_g_unk.cpp
index 01f30de6..570af068 100644
--- a/src/d/col/c/c_m3d_g_unk.cpp
+++ b/src/d/col/c/c_m3d_g_unk.cpp
@@ -16,8 +16,8 @@ cM3dGUnk::cM3dGUnk() {
field_0xB4 = 0;
mVirtCenter.set(0.0f, 0.0f, 0.0f);
field_0xC4 = 0.0f;
- PSMTXIdentity(mMtx);
- PSMTXIdentity(mInvMtx);
+ MTXIdentity(mMtx);
+ MTXIdentity(mInvMtx);
}
void cM3dGUnk::Set(const mVec3_c &vA, const mVec3_c &vB) {
@@ -34,13 +34,13 @@ void cM3dGUnk::Set(const mVec3_c &vA, const mVec3_c &vB) {
void cM3dGUnk::Update() {
mVec3_c a, b;
- PSMTXMultVec(mMtx, mMin, a);
- PSMTXMultVec(mMtx, mMax, b);
+ MTXMultVec(mMtx, mMin, a);
+ MTXMultVec(mMtx, mMax, b);
mLin.GetStart().x = (a.x + b.x) * 0.5f;
mLin.GetStart().y = (a.y + b.y) * 0.5f;
mLin.GetStart().z = (a.z + b.z) * 0.5f;
- if (!PSMTXInverse(mMtx, mInvMtx)) {
- PSMTXIdentity(mInvMtx);
+ if (!MTXInverse(mMtx, mInvMtx)) {
+ MTXIdentity(mInvMtx);
}
}
@@ -89,7 +89,7 @@ void cM3dGUnk::Set(const mMtx_c &mtx) {
void cM3dGUnk::Set(const mVec3_c &vec, const mAng &ang) {
mMtx_c mtx;
- PSMTXIdentity(mtx);
+ MTXIdentity(mtx);
mtx.YrotS(ang);
mtx.setTranslation(vec);
Set(mtx);
@@ -97,7 +97,7 @@ void cM3dGUnk::Set(const mVec3_c &vec, const mAng &ang) {
bool cM3dGUnk::Cross(const mVec3_c &vec) {
mVec3_c tmp;
- PSMTXMultVec(mInvMtx, vec, tmp);
+ MTXMultVec(mInvMtx, vec, tmp);
if ((tmp.x < mMin.x)) {
return false;
}
@@ -121,11 +121,11 @@ bool cM3dGUnk::Cross(const mVec3_c &vec) {
void cM3dGUnk::Clamp(const mVec3_c &in, mVec3_c &out) {
mVec3_c tmp1, tmp2;
- PSMTXMultVec(mInvMtx, in, tmp1);
+ MTXMultVec(mInvMtx, in, tmp1);
cM3dGAab aab;
aab.Set(mMin, mMax);
aab.Clamp(tmp1, tmp2);
- PSMTXMultVec(mMtx, tmp2, out);
+ MTXMultVec(mMtx, tmp2, out);
}
void cM3dGUnk::fn_80338f30(f32 f0, f32 f1) {
diff --git a/src/d/col/cc/d_cc_d.cpp b/src/d/col/cc/d_cc_d.cpp
index ce7e720f..4c4188b9 100644
--- a/src/d/col/cc/d_cc_d.cpp
+++ b/src/d/col/cc/d_cc_d.cpp
@@ -16,7 +16,7 @@ cCcD_ShapeAttr *dCcD_Cps::GetShapeAttr() {
}
void dCcD_Cps::unknownCalc() {
- PSVECSubtract(mEnd, mStart, mAt.mVec);
+ VECSubtract(mEnd, mStart, mAt.mVec);
}
dCcD_Tri::dCcD_Tri() {}
diff --git a/src/d/col/cc/d_cc_mass_s.cpp b/src/d/col/cc/d_cc_mass_s.cpp
index 7472d2a3..01120aac 100644
--- a/src/d/col/cc/d_cc_mass_s.cpp
+++ b/src/d/col/cc/d_cc_mass_s.cpp
@@ -176,13 +176,13 @@ u32 dCcMassS_Mng::Chk(mVec3_c *p_xyz, dAcObjBase_c **p_actor, dCcMassS_HitInf *p
if (field_0x3A8 & 0x10) {
mVec3_c vec;
- PSVECSubtract((*p_actor)->getPosition(), *p_xyz, vec);
+ VECSubtract((*p_actor)->getPosition(), *p_xyz, vec);
vec.y = 0;
- f32 vecMag = PSVECMag(vec);
+ f32 vecMag = VECMag(vec);
if (cM3d_IsZero(vecMag)) {
vec.x = 1;
} else {
- PSVECScale(vec, vec, f / vecMag);
+ VECScale(vec, vec, f / vecMag);
}
obj->GetStts()->PlusCcMove(vec.x, vec.y, vec.z);
}
@@ -208,7 +208,7 @@ u32 dCcMassS_Mng::Chk(mVec3_c *p_xyz, dAcObjBase_c **p_actor, dCcMassS_HitInf *p
tmpVec.z = p_xyz->z;
if (mCamTopPos.y < (20.0f + plusH)) {
- f32 newCamTopDist = PSVECSquareDistance(&tmpVec, *mCpsAttr.GetStartP());
+ f32 newCamTopDist = VECSquareDistance(&tmpVec, *mCpsAttr.GetStartP());
if (mCamTopDist > newCamTopDist) {
mCamTopDist = newCamTopDist;
mCamTopPos = tmpVec;
@@ -216,7 +216,7 @@ u32 dCcMassS_Mng::Chk(mVec3_c *p_xyz, dAcObjBase_c **p_actor, dCcMassS_HitInf *p
}
if (mCamBottomPos.y < (20.0f + plusH)) {
- f32 newCamBottomDist = PSVECSquareDistance(&tmpVec, *mCpsAttr.GetEndP());
+ f32 newCamBottomDist = VECSquareDistance(&tmpVec, *mCpsAttr.GetEndP());
if (mCamBottomDist > newCamBottomDist) {
mCamBottomDist = newCamBottomDist;
mCamBottomPos = tmpVec;
diff --git a/src/d/col/cc/d_cc_s.cpp b/src/d/col/cc/d_cc_s.cpp
index e5789bcd..fca2d6a0 100644
--- a/src/d/col/cc/d_cc_s.cpp
+++ b/src/d/col/cc/d_cc_s.cpp
@@ -159,7 +159,7 @@ void dCcS::SetArea(mMtx_c *pMtx) {
// non-match: Huh
mAreas[mAreaCount].mInv = mAreas[mAreaCount].mMtx = *pMtx;
- PSMTXInverse(mAreas[mAreaCount].mInv, mAreas[mAreaCount].mInv);
+ MTXInverse(mAreas[mAreaCount].mInv, mAreas[mAreaCount].mInv);
mAreaCount++;
}
diff --git a/src/d/lyt/d_screen_fader.cpp b/src/d/lyt/d_screen_fader.cpp
index 1ea4a5d7..8d8d7c30 100644
--- a/src/d/lyt/d_screen_fader.cpp
+++ b/src/d/lyt/d_screen_fader.cpp
@@ -45,14 +45,14 @@ void dScreenFader_c::draw() {
f32 scaleY = EGG::Screen::GetSizeYMax();
mMtx_c mtx;
- PSMTXScale(mtx, scaleX, mProgress, 1.0f);
- PSMTXTransApply(mtx, mtx, -scaleX * 0.5f, scaleY * 0.5f - mProgress, 0.0f);
+ MTXScale(mtx, scaleX, mProgress, 1.0f);
+ MTXTransApply(mtx, mtx, -scaleX * 0.5f, scaleY * 0.5f - mProgress, 0.0f);
GXColor a = EGG::DrawGX::BLACK;
EGG::DrawGX::DrawDL(EGG::DrawGX::DL_17, mtx, a);
- PSMTXScale(mtx, scaleX, mProgress, 1.0f);
- PSMTXTransApply(mtx, mtx, -scaleX * 0.5f, -scaleY * 0.5f, 0.0f);
+ MTXScale(mtx, scaleX, mProgress, 1.0f);
+ MTXTransApply(mtx, mtx, -scaleX * 0.5f, -scaleY * 0.5f, 0.0f);
EGG::DrawGX::DrawDL(EGG::DrawGX::DL_17, mtx, a);
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 02:46:54 +0000