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

Cleanup

5 files changed, 9 insertions, 9 deletions

diff --git a/src/nw4r/g3d/res/g3d_resnode.cpp b/src/nw4r/g3d/res/g3d_resnode.cpp
index 7788c86b..fe950682 100644
--- a/src/nw4r/g3d/res/g3d_resnode.cpp
+++ b/src/nw4r/g3d/res/g3d_resnode.cpp
@@ -99,7 +99,7 @@ void ResNode::CalcChrAnmResult(ChrAnmResult *pResult) const {
     }
 
     if (r.flags & ResNodeData::FLAG_ROT_ZERO) {
-        PSMTXIdentity(pResult->rt);
+        MTXIdentity(pResult->rt);
         flags |= ChrAnmResult::FLAG_ROT_ZERO;
     } else {
         pResult->rawR = math::VEC3(r.rot);
diff --git a/src/nw4r/lyt/lyt_drawInfo.cpp b/src/nw4r/lyt/lyt_drawInfo.cpp
index fb999a71..15ff814a 100644
--- a/src/nw4r/lyt/lyt_drawInfo.cpp
+++ b/src/nw4r/lyt/lyt_drawInfo.cpp
@@ -9,7 +9,7 @@ namespace lyt {
 // __ct__Q34nw4r3lyt8DrawInfoFv
 DrawInfo::DrawInfo() : mViewRect(), mScale(1.0f, 1.0f), mGlobalAlpha(1.0f) {
     memset(&mFlags, 0, 1);
-    PSMTXIdentity(mViewMtx);
+    MTXIdentity(mViewMtx);
 }
 
 // __dt__Q34nw4r3lyt8DrawInfoFv
diff --git a/src/nw4r/lyt/lyt_pane.cpp b/src/nw4r/lyt/lyt_pane.cpp
index 91888914..ef297901 100644
--- a/src/nw4r/lyt/lyt_pane.cpp
+++ b/src/nw4r/lyt/lyt_pane.cpp
@@ -277,12 +277,12 @@ void Pane::CalculateMtx(const DrawInfo &drawInfo) {
     this->mMtx._13 = this->mTranslate.y;
     this->mMtx._23 = this->mTranslate.z;
     if (this->mpParent) {
-        PSMTXConcat(this->mpParent->mGlbMtx, this->mMtx, this->mGlbMtx);
+        MTXConcat(this->mpParent->mGlbMtx, this->mMtx, this->mGlbMtx);
     } else {
         if (drawInfo.IsMultipleViewMtxOnDraw()) {
             this->mGlbMtx = this->mMtx;
         } else {
-            PSMTXConcat(drawInfo.GetViewMtx(), this->mMtx, this->mGlbMtx);
+            MTXConcat(drawInfo.GetViewMtx(), this->mMtx, this->mGlbMtx);
         }
     }
 
@@ -446,7 +446,7 @@ void Pane::LoadMtx(const DrawInfo &drawInfo) {
     math::MTX34 mtx;
     math::MTX34 *mtxPtr;
     if (drawInfo.IsMultipleViewMtxOnDraw()) {
-        PSMTXConcat(drawInfo.GetViewMtx(), this->mGlbMtx, mtx);
+        MTXConcat(drawInfo.GetViewMtx(), this->mGlbMtx, mtx);
         mtxPtr = &mtx;
     } else {
         mtxPtr = &this->mGlbMtx;
diff --git a/src/nw4r/lyt/lyt_textBox.cpp b/src/nw4r/lyt/lyt_textBox.cpp
index 4eeb8ff9..e32801cb 100644
--- a/src/nw4r/lyt/lyt_textBox.cpp
+++ b/src/nw4r/lyt/lyt_textBox.cpp
@@ -434,9 +434,9 @@ void TextBox::SetFont(const ut::Font *pFont) {
 void TextBox::LoadMtx(const DrawInfo &drawInfo) {
     math::MTX34 mtx;
     if (drawInfo.IsMultipleViewMtxOnDraw()) {
-        PSMTXConcat(drawInfo.GetViewMtx(), mGlbMtx, mtx);
+        MTXConcat(drawInfo.GetViewMtx(), mGlbMtx, mtx);
     } else {
-        PSMTXCopy(mGlbMtx, mtx);
+        MTXCopy(mGlbMtx, mtx);
     }
 
     ReverseYAxis(&mtx);
diff --git a/src/nw4r/lyt/lyt_util.cpp b/src/nw4r/lyt/lyt_util.cpp
index 7db782e9..ef86f45b 100644
--- a/src/nw4r/lyt/lyt_util.cpp
+++ b/src/nw4r/lyt/lyt_util.cpp
@@ -43,9 +43,9 @@ void SetAnimationEnable(Group *pGroup, nw4r::lyt::AnimTransform *pAnimTrans, boo
 // IsContain__Q24nw4r3lytFPQ34nw4r3lyt4PaneRCQ34nw4r4math4VEC2
 bool IsContain(Pane *pPane, const math::VEC2 &pos) {
     math::MTX34 invGlbMtx;
-    PSMTXInverse(pPane->GetGlobalMtx(), invGlbMtx);
+    MTXInverse(pPane->GetGlobalMtx(), invGlbMtx);
     math::VEC3 lclPos;
-    PSMTXMultVec(invGlbMtx, math::VEC3(pos.x, pos.y, 0.0f), lclPos);
+    MTXMultVec(invGlbMtx, math::VEC3(pos.x, pos.y, 0.0f), lclPos);
     return Contains(pPane->GetPaneRect(), math::VEC2(lclPos.x, lclPos.y));
 }