Merge pull request #313 from robojumper/vec-mtx-cleanup

Cleanup

6 files changed, 15 insertions, 15 deletions

diff --git a/src/m/m2d.cpp b/src/m/m2d.cpp
index 1d980058..1aaaefff 100644
--- a/src/m/m2d.cpp
+++ b/src/m/m2d.cpp
@@ -268,10 +268,10 @@ Simple_c::Simple_c() : Base_c(0x80), mLayout(), mDrawInfo(), mpResAcc(nullptr),
 void Simple_c::calc() {
     calcBefore();
     nw4r::math::MTX34 mtx;
-    PSMTXIdentity(mtx.m);
+    MTXIdentity(mtx.m);
     // Probably inlines
     mVec3_c v = mVec;
-    PSMTXTransApply(mtx.m, mtx.m, v.x, v.y, v.z);
+    MTXTransApply(mtx.m, mtx.m, v.x, v.y, v.z);
     mDrawInfo.SetViewMtx(mtx);
     calcAfter();
 }
diff --git a/src/m/m3d/m_bline.cpp b/src/m/m3d/m_bline.cpp
index 19f506fd..355c73d0 100644
--- a/src/m/m3d/m_bline.cpp
+++ b/src/m/m3d/m_bline.cpp
@@ -59,8 +59,8 @@ void blineMat_c::update() {
     mVec3_c vec;
 
     getCurrentCamera().GetCameraMtx(&camMtx);
-    PSMTXInverse(camMtx, camMtx);
-    PSMTXMultVec(camMtx, mVec3_c::Zero, vec);
+    MTXInverse(camMtx, camMtx);
+    MTXMultVec(camMtx, mVec3_c::Zero, vec);
 
     for (bline_c *line = (bline_c *)nw4r::ut::List_GetNext(&mLines, 0); line != nullptr;
          line = (bline_c *)nw4r::ut::List_GetNext(&mLines, line)) {
diff --git a/src/m/m3d/m_bmdl.cpp b/src/m/m3d/m_bmdl.cpp
index 2515e856..32fa0fc9 100644
--- a/src/m/m3d/m_bmdl.cpp
+++ b/src/m/m3d/m_bmdl.cpp
@@ -44,7 +44,7 @@ bool bmdl_c::getNodeWorldMtxMultVec(u32 p1, const nw4r::math::VEC3 &in, nw4r::ma
     if (!getNodeWorldMtx(p1, &mtx)) {
         return false;
     } else {
-        PSMTXMultVec(mtx, in, out);
+        MTXMultVec(mtx, in, out);
         return true;
     }
 }
diff --git a/src/m/m3d/m_mdl.cpp b/src/m/m3d/m_mdl.cpp
index 4d04e84c..15daf8e7 100644
--- a/src/m/m3d/m_mdl.cpp
+++ b/src/m/m3d/m_mdl.cpp
@@ -57,7 +57,7 @@ void mdl_c::mdlCallback_c::ExecCallbackA(
             tmp.x = result->rt._03;
             tmp.y = result->rt._13;
             tmp.z = result->rt._23;
-            PSMTXQuat(result->rt, q1);
+            MTXQuat(result->rt, q1);
             result->rt._03 = tmp.x;
             result->rt._13 = tmp.y;
             result->rt._23 = tmp.z;
@@ -121,7 +121,7 @@ bool mdl_c::mdlCallback_c::create(nw4r::g3d::ResMdl mdl, mAllocator_c *alloc, u3
         node->s.x = 1.0f;
         node->s.y = 1.0f;
         node->s.z = 1.0f;
-        PSMTXIdentity(node->rt);
+        MTXIdentity(node->rt);
         node++;
     }
 
diff --git a/src/m/m3d/m_shadow.cpp b/src/m/m3d/m_shadow.cpp
index 668a6669..2cb88080 100644
--- a/src/m/m3d/m_shadow.cpp
+++ b/src/m/m3d/m_shadow.cpp
@@ -504,7 +504,7 @@ bool mShadowChild_c::addMdl(scnLeaf_c &mdl, const mQuat_c &quat) {
 
 bool mShadowChild_c::setGeom(const GXTexObj *texObj, const mMtx_c &mtx, const mQuat_c &quat) {
     mQuat = quat;
-    PSMTXMultVec(mtx.m, mQuat.v, mQuat.v);
+    MTXMultVec(mtx.m, mQuat.v, mQuat.v);
     if (texObj == nullptr) {
         mTexObj = *mShadow_c::sTexObj;
     } else {
@@ -591,7 +591,7 @@ void mShadowChild_c::draw() {
     GXSetTevColor(GX_TEVREG0, mShadowColor);
     Mtx mtx;
     C_MTXLightOrtho(mtx, field_0x13C, -field_0x13C, -field_0x13C, field_0x13C, 0.5f, -0.5f, 0.5f, 0.5f);
-    PSMTXConcat(mtx, mFrustum.mView.m, mtx);
+    MTXConcat(mtx, mFrustum.mView.m, mtx);
     GXLoadTexMtxImm(mtx, GX_TEXMTX0, GX_MTX3x4);
     mShadow_c::GetInstance()->draw(mFrustum.mView, field_0x154);
     GXSetTevSwapModeTable(GX_TEV_SWAP0, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA);
@@ -628,14 +628,14 @@ void mCustomShadow_c::calc(mMtx_c mtx, mMtx_c &mtx2) const {
     mVec3_c trans;
     mtx2.copyFrom(mMtx);
     mVec3_c offset(0.0f, field_0x48, 0.0f);
-    PSMTXMultVec(mtx2, offset, trans);
-    PSMTXMultVec(mtx, trans, trans);
+    MTXMultVec(mtx2, offset, trans);
+    MTXMultVec(mtx, trans, trans);
 
-    PSMTXTrans(mtx2, trans.x, trans.y, trans.z);
+    MTXTrans(mtx2, trans.x, trans.y, trans.z);
 
     mMtx_c scaleMtx;
-    PSMTXScale(scaleMtx, field_0x4C, field_0x4C, field_0x4C);
-    PSMTXConcat(mtx2, scaleMtx, mtx2);
+    MTXScale(scaleMtx, field_0x4C, field_0x4C, field_0x4C);
+    MTXConcat(mtx2, scaleMtx, mtx2);
 }
 
 } // namespace m3d
diff --git a/src/m/m_color_fader.cpp b/src/m/m_color_fader.cpp
index ed36ceae..50b865ef 100644
--- a/src/m/m_color_fader.cpp
+++ b/src/m/m_color_fader.cpp
@@ -54,7 +54,7 @@ void mColorFader_c::draw() {
     GXSetProjection(projMtx, GX_ORTHOGRAPHIC);
 
     Mtx posMtx;
-    PSMTXIdentity(posMtx);
+    MTXIdentity(posMtx);
     GXLoadPosMtxImm(posMtx, 0);
     GXSetCurrentMtx(0);