mirror of
https://github.com/zeldaret/ss
synced 2026-09-10 03:52:24 -04:00
MTX/VEC cleanup
This commit is contained in:
@@ -250,7 +250,7 @@ bool AttentionManager::playTargetAnim(s32 idx) {
|
||||
dAcObjBase_c *actor = pool->getActor(mModels.mCurrentTargetInfoIdx);
|
||||
mMtx_c mtx;
|
||||
mVec3_c v = pool->mInfos[mModels.mCurrentTargetInfoIdx].field_0x08;
|
||||
PSMTXTrans(mtx, v.x, v.y, v.z);
|
||||
MTXTrans(mtx, v.x, v.y, v.z);
|
||||
|
||||
mModels.mMdls->mMdl.setLocalMtx(mtx);
|
||||
mModels.mMdls->mMdl.setScale(sHio.field_0x14, sHio.field_0x14, sHio.field_0x14);
|
||||
|
||||
@@ -50,11 +50,11 @@ void DowsingTarget::reinitialize(DowsingSlot type) {
|
||||
void DowsingTarget::getPosition(mVec3_c &position) {
|
||||
mMtx_c mtx;
|
||||
mMtx_c mtx2;
|
||||
PSMTXTrans(mtx.m, mpActor->mPosition.x, mpActor->mPosition.y, mpActor->mPosition.z);
|
||||
MTXTrans(mtx.m, mpActor->mPosition.x, mpActor->mPosition.y, mpActor->mPosition.z);
|
||||
mtx.YrotM(mpActor->mRotation.y);
|
||||
PSMTXScale(mtx2.m, mpActor->mScale.x, mpActor->mScale.y, mpActor->mScale.z);
|
||||
PSMTXConcat(mtx.m, mtx2.m, mtx.m);
|
||||
PSMTXMultVec(mtx.m, mOffset, position);
|
||||
MTXScale(mtx2.m, mpActor->mScale.x, mpActor->mScale.y, mpActor->mScale.z);
|
||||
MTXConcat(mtx.m, mtx2.m, mtx.m);
|
||||
MTXMultVec(mtx.m, mOffset, position);
|
||||
}
|
||||
|
||||
bool DowsingTarget::hasZeldaDowsing() {
|
||||
|
||||
Reference in New Issue
Block a user