Match MarioActor::updateBaseScaleMtx

This commit is contained in:
Headpenguin 2023-07-09 11:42:03 -04:00
parent c012856bd5
commit ccdb433149
3 changed files with 7 additions and 1 deletions

View File

@ -213,7 +213,7 @@ doPressing__10MarioActorFv,MarioActor.o,Player.a,true
careMovingObject__10MarioActorFv,MarioActor.o,Player.a,true
doStun__10MarioActorFv,MarioActor.o,Player.a,true
scaleMtx__10MarioActorFPA4_f,MarioActor.o,Player.a,true
updateBaseScaleMtx__10MarioActorFv,MarioActor.o,Player.a,false
updateBaseScaleMtx__10MarioActorFv,MarioActor.o,Player.a,true
getRealMtx__10MarioActorCFPA4_fPCc,MarioActor.o,Player.a,false
getRealPos__10MarioActorCFPCcPQ29JGeometry8TVec3<f>,MarioActor.o,Player.a,false
getGlobalJointMtx__10MarioActorFPCc,MarioActor.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
213 careMovingObject__10MarioActorFv MarioActor.o Player.a true
214 doStun__10MarioActorFv MarioActor.o Player.a true
215 scaleMtx__10MarioActorFPA4_f MarioActor.o Player.a true
216 updateBaseScaleMtx__10MarioActorFv MarioActor.o Player.a false true
217 getRealMtx__10MarioActorCFPA4_fPCc MarioActor.o Player.a false
218 getRealPos__10MarioActorCFPCcPQ29JGeometry8TVec3<f> MarioActor.o Player.a false
219 getGlobalJointMtx__10MarioActorFPCc MarioActor.o Player.a false

View File

@ -44,6 +44,7 @@ u32 PSMTXInverse(const Mtx, Mtx);
void PSMTXMultVec(const Mtx, const Vec *, Vec *);
void PSMTXScaleApply(const Mtx, Mtx, f32, f32, f32);
void PSMTXScale(Mtx, f32, f32, f32);
void PSMTXRotAxisRad(Mtx dst, const Vec *, f32);

View File

@ -1006,3 +1006,8 @@ void MarioActor::scaleMtx(MtxPtr rawMtx) {
rawMtx[1][2] = stack_2c.y;
rawMtx[2][2] = stack_2c.z;
}
void MarioActor::updateBaseScaleMtx() {
if(_230 -> _8_3c) PSMTXScale(_bf8.toMtxPtr(), mScale.x, mScale.y, mScale.z);
else PSMTXIdentity(_bf8.toMtxPtr());
}