encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work on create functions of d_a_npc_midp and changed mpMatAnm to array (#2366)

Browse Source 
* Work on create functions of d_a_npc_midp and changed mpMatAnm to array

* Pull request cleanup
This commit is contained in:
Carco_21
2025-04-01 13:31:12 -07:00
committed by GitHub
parent 3df4a4b8d5
commit cc7f26c838
10 changed files with 297 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc.cpp
+7 -7
View File
@@ -1432,23 +1432,23 @@ void daNpcT_c::playAllAnm() {
/* 801490D4-80149190 143A14 00BC+00 1/0 1/0 55/0 .text ctrlBtk__8daNpcT_cFv */
BOOL daNpcT_c::ctrlBtk() {
if (mpMatAnm != NULL) {
if (mpMatAnm[0] != NULL) {
if (field_0xe29 != 0 && mBtkAnm.getBtkAnm() != NULL) {
mpMatAnm->setNowOffsetX(field_0xde4 * cM_ssin(mJntAnm.getEyeAngleY()));
mpMatAnm->setNowOffsetY(field_0xde0 * cM_ssin(mJntAnm.getEyeAngleX()));
mpMatAnm[0]->setNowOffsetX(field_0xde4 * cM_ssin(mJntAnm.getEyeAngleY()));
mpMatAnm[0]->setNowOffsetY(field_0xde0 * cM_ssin(mJntAnm.getEyeAngleX()));
if (field_0xe2a != 0) {
mpMatAnm->setMorfFrm(field_0xe2a);
mpMatAnm[0]->setMorfFrm(field_0xe2a);
field_0xe2a = 0;
}
mpMatAnm->onEyeMoveFlg();
mpMatAnm[0]->onEyeMoveFlg();
return TRUE;
}
if (field_0xe2a != 0) {
mpMatAnm->setMorfFrm(field_0xe2a);
mpMatAnm[0]->setMorfFrm(field_0xe2a);
field_0xe2a = 0;
}
mpMatAnm->offEyeMoveFlg();
mpMatAnm[0]->offEyeMoveFlg();
}
return FALSE;
src/d/actor/d_a_npc_gnd.cpp
+2 -2
View File
@@ -711,9 +711,9 @@ COMPILER_STRIP_GATE(0x809BE550, &lit_4391);
/* 809BBE80-809BBF44 000960 00C4+00 1/1 0/0 0/0 .text Draw__11daNpc_Gnd_cFv */
int daNpc_Gnd_c::Draw() {
if (mpMatAnm != NULL) {
if (mpMatAnm[0] != NULL) {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm);
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
}
src/d/actor/d_a_npc_hanjo.cpp
+6 -6
View File
@@ -843,8 +843,8 @@ int daNpc_Hanjo_c::CreateHeap() {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
mpMatAnm = new daNpcT_MatAnm_c();
if (mpMatAnm == NULL) {
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;
}
switch (mType) {
@@ -915,9 +915,9 @@ int daNpc_Hanjo_c::Execute() {
/* 809F9B8C-809F9C20 000BEC 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Hanjo_cFv */
int daNpc_Hanjo_c::Draw() {
if (mpMatAnm != NULL) {
if (mpMatAnm[0] != NULL) {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm);
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
}
@@ -982,8 +982,8 @@ int daNpc_Hanjo_c::isDelete() {
void daNpc_Hanjo_c::reset() {
csXyz acStack_20;
int iVar1 = (u8*)&field_0x1728 - (u8*)&field_0x16e0;
if (mpMatAnm != NULL) {
mpMatAnm->initialize();
if (mpMatAnm[0] != NULL) {
mpMatAnm[0]->initialize();
}
initialize();
for (int i = 0; i < 4; i++) {
src/d/actor/d_a_npc_jagar.cpp
+6 -6
View File
@@ -249,8 +249,8 @@ int daNpc_Jagar_c::CreateHeap() {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
mpMatAnm = new daNpcT_MatAnm_c();
if (mpMatAnm == NULL) {
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;
}
@@ -275,9 +275,9 @@ int daNpc_Jagar_c::Execute() {
/* 80A14FA0-80A15034 000980 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Jagar_cFv */
int daNpc_Jagar_c::Draw() {
if (mpMatAnm != NULL) {
if (mpMatAnm[0] != NULL) {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm);
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 100.0f, 0, 0, 0);
}
@@ -338,8 +338,8 @@ int daNpc_Jagar_c::isDelete() {
void daNpc_Jagar_c::reset() {
csXyz acStack_20;
int iVar1 = (u8*)&field_0x1008 - (u8*)&field_0xfd4;
if (mpMatAnm != NULL) {
mpMatAnm->initialize();
if (mpMatAnm[0] != NULL) {
mpMatAnm[0]->initialize();
}
initialize();
src/d/actor/d_a_npc_midp.cpp
+184 -376
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_yelia.cpp
+6 -6
View File
@@ -451,8 +451,8 @@ int daNpc_Yelia_c::CreateHeap() {
}
model->setUserArea((u32)this);
mpMatAnm = new daNpcT_MatAnm_c();
if (mpMatAnm == NULL) {
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;
}
@@ -484,9 +484,9 @@ int daNpc_Yelia_c::Execute() {
/* 80B4DC74-80B4DD08 000A54 0094+00 1/1 0/0 0/0 .text Draw__13daNpc_Yelia_cFv */
int daNpc_Yelia_c::Draw() {
if (mpMatAnm != NULL) {
if (mpMatAnm[0] != NULL) {
J3DModelData* model_data = mpMorf[0]->getModel()->getModelData();
model_data->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm);
model_data->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return draw(FALSE, FALSE, field_0xde8, NULL, 100.0f, FALSE, FALSE, FALSE);
}
@@ -565,8 +565,8 @@ BOOL daNpc_Yelia_c::isDelete() {
/* 80B4DF10-80B4E068 000CF0 0158+00 1/1 0/0 0/0 .text reset__13daNpc_Yelia_cFv */
void daNpc_Yelia_c::reset() {
u32 size = (u32)&field_0xfec - (u32)&mpNextAction;
if (mpMatAnm != NULL) {
mpMatAnm->initialize();
if (mpMatAnm[0] != NULL) {
mpMatAnm[0]->initialize();
}
initialize();
for (int i = 0; i < 4; i++) {
src/d/actor/d_a_npc_zant.cpp
+4 -4
View File
@@ -181,9 +181,9 @@ int daNpc_Zant_c::Execute() {
/* 80B6C754-80B6C7E8 000694 0094+00 1/1 0/0 0/0 .text Draw__12daNpc_Zant_cFv */
int daNpc_Zant_c::Draw() {
if (mpMatAnm != NULL) {
if (mpMatAnm[0] != NULL) {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm);
modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
}
return daNpcT_c::draw(0, 0, field_0xde8, NULL, 0.0f, 1, 0, 0);
}
@@ -245,8 +245,8 @@ void daNpc_Zant_c::reset() {
int iVar1 = (u8*)&field_0xf9c - (u8*)&field_0xf84;
memset(&field_0xf84, 0, iVar1);
if (mpMatAnm) {
mpMatAnm->initialize();
if (mpMatAnm[0]) {
mpMatAnm[0]->initialize();
}
setAngle(home.angle.y);
src/d/actor/d_a_peru.cpp
+5 -5
View File
@@ -245,8 +245,8 @@ int daPeru_c::CreateHeap() {
}
model->setUserArea((u32)this);
mpMatAnm = new daNpcT_MatAnm_c();
if (mpMatAnm == NULL) {
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
return 0;
}
@@ -293,7 +293,7 @@ int daPeru_c::Execute() {
/* 80D477A4-80D47840 0009A4 009C+00 1/1 0/0 0/0 .text Draw__8daPeru_cFv */
int daPeru_c::Draw() {
daNpcT_MatAnm_c* matAnm = mpMatAnm;
daNpcT_MatAnm_c* matAnm = mpMatAnm[0];
if (matAnm != NULL) {
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
u16 eyeballMat = getEyeballMaterialNo();
@@ -351,8 +351,8 @@ void daPeru_c::reset() {
field_0xa80 = daPeru_Param_c::m.field_0x64[2];
mMorfFrames = daPeru_Param_c::m.field_0x00[17];
mActionFunc = NULL;
if (mpMatAnm != NULL) {
mpMatAnm->initialize();
if (mpMatAnm[0] != NULL) {
mpMatAnm[0]->initialize();
}
field_0xe80 = 0;
for (int i = 0; i < 3; i++) {