diff options
Diffstat (limited to 'src/m_Do/m_Do_ext.cpp')
| -rw-r--r-- | src/m_Do/m_Do_ext.cpp | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 084fa09e33..4909a94676 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -68,6 +68,11 @@ static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u1 J3DSys::mParentS.z = transformInfo->mScale.z; } +static BOOL isCurrentSolidHeap() { + /* Nonmatching */ + return FALSE; +} + /* 8000D320-8000D428 007C60 0108+00 6/6 0/0 0/0 .text initPlay__14mDoExt_baseAnmFsifss */ int mDoExt_baseAnm::initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) { @@ -1043,7 +1048,7 @@ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* c return 0; } if (modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() && param_10 == 0) { - if (param_10 = modelData->isLocked()) { + if (modelData->isLocked()) { param_10 = 0x20000; } else { param_10 = 0x80000; @@ -1083,7 +1088,8 @@ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* c J3DModelData* r23 = mpModel->getModelData(); u16 jointNum = r23->getJointNum(); for (int i = 0; i < jointNum; i++) { - *info = r23->getJointNodePointer(i)->getTransformInfo(); + J3DJoint* joint = r23->getJointNodePointer(i); + *info = joint->getTransformInfo(); JMAEulerToQuat(info->mRotation.x, info->mRotation.y, info->mRotation.z, quat); info++; quat++; @@ -1711,6 +1717,13 @@ void mDoExt_McaMorf2::calc() { Quaternion sp30; Quaternion sp20; Quaternion* var_r27; + f32 var_f31; + f32 var_f30; + f32 var_f29; + f32 sp1C; + f32 sp18; + f32 sp14; + f32 sp10; if (mpQuat == NULL) { var_r27 = &sp30; } else { @@ -1741,8 +1754,6 @@ void mDoExt_McaMorf2::calc() { } else { field_0x40->getTransform(jnt_no, &spF0[1]); - f32 sp1C; - f32 sp18; sp18 = 1.0f - field_0x44; sp1C = field_0x44; @@ -1763,15 +1774,15 @@ void mDoExt_McaMorf2::calc() { JMAEulerToQuat(spF0[i].mRotation.x, spF0[i].mRotation.y, spF0[i].mRotation.z, &sp60[i]); } - f32 var_f29 = sp1C / (sp18 + sp1C); + var_f29 = sp1C / (sp18 + sp1C); JMAQuatLerp(&sp60[0], &sp60[1], var_f29, var_r27); mDoMtx_quat(spC0, var_r27); mDoExt_setJ3DData(spC0, var_r30, jnt_no); } } else if (field_0x40 == NULL) { - f32 var_f31 = (mCurMorf - mPrevMorf) / (1.0f - mPrevMorf); - f32 var_f30 = 1.0f - var_f31; + var_f31 = (mCurMorf - mPrevMorf) / (1.0f - mPrevMorf); + var_f30 = 1.0f - var_f31; mpAnm->getTransform(jnt_no, &sp80); if (mpCallback1 != NULL) { @@ -1800,7 +1811,6 @@ void mDoExt_McaMorf2::calc() { mpAnm->getTransform(jnt_no, &spF0[0]); field_0x40->getTransform(jnt_no, &spF0[1]); - f32 sp14, sp10; sp10 = 1.0f - field_0x44; sp14 = field_0x44; @@ -1821,11 +1831,11 @@ void mDoExt_McaMorf2::calc() { JMAEulerToQuat(spF0[i].mRotation.x, spF0[i].mRotation.y, spF0[i].mRotation.z, &sp40[i]); } - f32 var_f31 = sp14 / (sp10 + sp14); + var_f31 = sp14 / (sp10 + sp14); JMAQuatLerp(&sp40[0], &sp40[1], var_f31, &sp20); var_f31 = (mCurMorf - mPrevMorf) / (1.0f - mPrevMorf); - f32 var_f30 = 1.0f - var_f31; + var_f30 = 1.0f - var_f31; JMAQuatLerp(var_r27, &sp20, var_f31, var_r27); var_r30->mTranslate.x = var_r30->mTranslate.x * var_f30 @@ -2477,7 +2487,7 @@ void mDoExt_cylinderPacket::draw() { GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - if (field_0x28) { + if (mClipZ) { GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE); } else { GXSetZMode(GX_DISABLE, GX_LEQUAL, GX_DISABLE); |