mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 05:37:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use joint enums in several different places (#981)

Browse Source 
Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>
This commit is contained in:
123456789758
2026-06-16 14:55:36 -04:00
committed by GitHub
parent f2d931cd81
commit d61a31e7ab
82 changed files with 1693 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_ikada.cpp
+14 -14
View File
@@ -111,9 +111,9 @@ daObj_Ikada_HIO_c::daObj_Ikada_HIO_c() {
}
/* 000002D8-00000324 .text nodeControl_CB__FP7J3DNodei */
static BOOL nodeControl_CB(J3DNode* node, int arg1) {
static BOOL nodeControl_CB(J3DNode* node, int calcTiming) {
J3DJoint* joint = (J3DJoint*)node;
if (arg1 == 0) {
if (calcTiming == J3DNodeCBCalcTiming_In) {
daObj_Ikada_c* i_this = (daObj_Ikada_c*)j3dSys.getModel()->getUserArea();
if (i_this != NULL) {
i_this->_nodeControl(joint, j3dSys.getModel());
@@ -125,14 +125,14 @@ static BOOL nodeControl_CB(J3DNode* node, int arg1) {
/* 00000324-00000458 .text _nodeControl__13daObj_Ikada_cFP7J3DNodeP8J3DModel */
void daObj_Ikada_c::_nodeControl(J3DNode* node, J3DModel* model) {
J3DJoint* joint = (J3DJoint*)node;
s32 uVar1 = joint->getJntNo();
mDoMtx_stack_c::copy(model->getAnmMtx(uVar1));
mDoMtx_stack_c::ZXYrotM(mJointRot[uVar1].x, mJointRot[uVar1].y, mJointRot[uVar1].z);
if (uVar1 == 1) {
s32 jntNo = joint->getJntNo();
mDoMtx_stack_c::copy(model->getAnmMtx(jntNo));
mDoMtx_stack_c::ZXYrotM(mJointRot[jntNo].x, mJointRot[jntNo].y, mJointRot[jntNo].z);
if (jntNo == VSVSP_JNT_SV_CREAN_e) {
mDoMtx_stack_c::XrotM(m115A + m115E * (REG12_S(5) + 5) * cM_ssin(m115C));
}
MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
model->setAnmMtx(uVar1, mDoMtx_stack_c::get());
model->setAnmMtx(jntNo, mDoMtx_stack_c::get());
}
/* 00000458-00000494 .text pathMove_CB__FP4cXyzP4cXyzP4cXyzPv */
@@ -463,7 +463,7 @@ void daObj_Ikada_c::setRopePos() {
spBC = *pcVar6;
mDoMtx_stack_c::copy(mpModel->getAnmMtx(1));
mDoMtx_stack_c::copy(mpModel->getAnmMtx(VSVSP_JNT_SV_CREAN_e));
mDoMtx_stack_c::transM(m_crane_offset.x, m_crane_offset.y, m_crane_offset.z);
mDoMtx_stack_c::multVecZero(pcVar6);
@@ -513,7 +513,7 @@ void daObj_Ikada_c::setRopePos() {
iVar3 = 0;
iVar4 = 0;
} else {
mDoMtx_stack_c::copy(mpModel->getAnmMtx(1));
mDoMtx_stack_c::copy(mpModel->getAnmMtx(VSVSP_JNT_SV_CREAN_e));
mDoMtx_stack_c::transM(m_crane_offset.x, m_crane_offset.y, m_crane_offset.z);
cMtx_copy(mDoMtx_stack_c::get(), ropeEndMtx);
spA4.set(pcVar7->x - ropeEndMtx[0][3], pcVar7->y - ropeEndMtx[1][3], pcVar7->z - ropeEndMtx[2][3]);
@@ -1246,7 +1246,7 @@ bool daObj_Ikada_c::_draw() {
J3DModelData* modelData = mpModel->getModelData();
mBckAnm.entry(modelData);
mDoExt_modelUpdateDL(mpModel);
mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(NULL);
mpModel->getModelData()->getJointNodePointer(VSVSP_JNT_SV_SHIP_ROOT_e)->setMtxCalc(NULL);
} else {
mDoExt_modelUpdateDL(mpModel);
}
@@ -1384,7 +1384,7 @@ void daObj_Ikada_c::createInit() {
cXyz* pcVar8 = &mRopeLine.getPos(0)[m07D8] - 1;
cXyz* pcVar7 = &m07DC[m07D8 - 1];
mDoMtx_stack_c::copy(mpModel->getAnmMtx(1));
mDoMtx_stack_c::copy(mpModel->getAnmMtx(VSVSP_JNT_SV_CREAN_e));
mDoMtx_stack_c::transM(m_crane_offset.x, m_crane_offset.y, m_crane_offset.z);
mDoMtx_stack_c::multVecZero(pcVar8);
@@ -1452,9 +1452,9 @@ BOOL daObj_Ikada_c::_createHeap() {
if (mType == 4) {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
switch (i) {
case 1:
case 2:
case 3:
case VSVSP_JNT_SV_CREAN_e:
case VSVSP_JNT_SV_REEL_e:
case VSVSP_JNT_SV_HANDLE_1_e:
modelData->getJointNodePointer(i)->setCallBack(nodeControl_CB);
break;
}