mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-05 04:49:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix relocation and data value mismatches

Browse Source
This commit is contained in:
LagoLunatic
2025-04-24 14:53:58 -04:00
parent ce8d17ec08
commit fa7d4d2896
11 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_demo00.cpp
+2 -2
View File
@@ -69,8 +69,8 @@ void daDemo00_c::setBaseMtx() {
void daDemo00_c::setShadowSize() {
J3DModelData* modelData = model.model->getModelData();
cXyz min(1000000000.0f, 1000000000.0f, 1000000000.0f);
cXyz max(-1000000000.0f, -1000000000.0f, -1000000000.0f);
cXyz min(100000000.0f, 100000000.0f, 100000000.0f);
cXyz max(-100000000.0f, -100000000.0f, -100000000.0f);
for (u16 i = 0; i < modelData->getJointNum(); i++) {
J3DJoint* joint = modelData->getJointNodePointer(i);
src/d/actor/d_a_player_fan.inc
+2 -2
View File
@@ -35,7 +35,7 @@ BOOL daPy_lk_c::fanJointCB(int param_0) {
}
mDoMtx_stack_c::revConcat(mpEquipItemModel->getAnmMtx(param_0));
mpEquipItemModel->setAnmMtx(1 * param_0, mDoMtx_stack_c::get());
mDoMtx_stack_c::copy(j3dSys.mCurrentMtx);
mDoMtx_copy(mDoMtx_stack_c::get(), j3dSys.mCurrentMtx);
return true;
}
@@ -62,7 +62,7 @@ BOOL daPy_lk_c::parachuteJointCB(int param_0) {
}
mDoMtx_stack_c::revConcat(mpEquipItemModel->getAnmMtx(param_0));
mpEquipItemModel->setAnmMtx(1 * param_0, mDoMtx_stack_c::get());
mDoMtx_stack_c::copy(j3dSys.mCurrentMtx);
mDoMtx_copy(mDoMtx_stack_c::get(), j3dSys.mCurrentMtx);
return true;
}
src/d/actor/d_a_pw.cpp
+3 -3
View File
@@ -55,11 +55,11 @@ static BOOL daPW_Draw(pw_class*) {
void anm_init(pw_class* i_this, int bckFileIdx, f32 morf, u8 loopMode, f32 speed, int soundFileIdx) {
i_this->mBckIdx = bckFileIdx;
if (soundFileIdx >= 0) {
void* soundAnm = dComIfG_getObjectRes("AM", soundFileIdx);
J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx);
void* soundAnm = dComIfG_getObjectRes("PW", soundFileIdx);
J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("PW", bckFileIdx);
i_this->mpMorf->setAnm(bckAnm, loopMode, morf, speed, 0.0f, -1.0f, soundAnm);
} else {
J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("AM", bckFileIdx);
J3DAnmTransform* bckAnm = (J3DAnmTransform*)dComIfG_getObjectRes("PW", bckFileIdx);
i_this->mpMorf->setAnm(bckAnm, loopMode, morf, speed, 0.0f, -1.0f, NULL);
}
}