diff options
Diffstat (limited to 'src/d/a/obj')
| -rw-r--r-- | src/d/a/obj/d_a_obj_switch.cpp | 8 | ||||
| -rw-r--r-- | src/d/a/obj/d_a_obj_tbox.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
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 |