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

fix setLightTevColorType_MAJI usage (#2103)

Browse Source
This commit is contained in:
Caroline Madsen
2024-03-20 14:41:42 -07:00
committed by GitHub
parent 4ea2b399be
commit 5845e695ce
45 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp
+4 -4
View File
@@ -1369,7 +1369,7 @@ int daB_DS_c::draw() {
J3DModel* model = mpMorf->getModel();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
J3DModelData* model_data = model->getModelData();
if (mType == PHASE_2) {
@@ -1392,7 +1392,7 @@ int daB_DS_c::draw() {
if (!mNoDrawSword) {
J3DModel* sword_model = mpSwordMorf->getModel();
g_env_light.settingTevStruct(0, &mSwordPos, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model, &tevStr);
mpSwordBrkAnm->entry(sword_model->getModelData());
mpSwordMorf->entryDL();
}
@@ -1450,7 +1450,7 @@ int daB_DS_c::draw() {
if (!mNoDrawSword) {
J3DModel* sword_model = mpSwordMorf->getModel();
g_env_light.settingTevStruct(0, &mSwordPos, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(sword_model, &tevStr);
mpSwordBrkAnm->entry(sword_model->getModelData());
mpSwordMorf->entryDL();
}
@@ -1464,7 +1464,7 @@ int daB_DS_c::draw() {
if (mDrawZant) {
J3DModel* zant_model = mpZantMorf->getModel();
g_env_light.settingTevStruct(3, &mSwordPos, &tevStr);
g_env_light.setLightTevColorType_MAJI(zant_model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(zant_model, &tevStr);
J3DShape* shape =
mpZantMorf->getModel()->getModelData()->getMaterialNodePointer(2)->getShape();
if (shape != NULL) {
rel/d/a/b/d_a_b_go/d_a_b_go.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ static int daB_GO_Draw(b_go_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpMorf->entryDL();
}
rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ static int daB_GOS_Draw(b_gos_class* i_this) {
J3DModel* model = i_this->mpMorf->getModel();
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpMorf->entryDL();
cXyz sp28;
rel/d/a/d_a_mirror/d_a_mirror.cpp
+1 -1
View File
@@ -617,7 +617,7 @@ int daMirror_c::draw() {
if (mpModel != NULL) {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
}
rel/d/a/d_a_myna/d_a_myna.cpp
+1 -1
View File
@@ -1427,7 +1427,7 @@ int daMyna_c::draw() {
J3DModel* model = mpMorf->getModel();
J3DModelData* modelData = model->getModelData();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
if (cLib_checkBit<u16>(field_0x914, 0x40)) {
mBtpAnm.entry(modelData);
}
rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp
+2 -2
View File
@@ -765,12 +765,12 @@ int daBdoor_c::draw() {
fopAcM_OffStatus(this, 0);
}
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpDoorModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpDoorModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpDoorModel);
dComIfGd_setList();
if (mLocked) {
g_env_light.setLightTevColorType_MAJI(mpLockModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpLockModel, &tevStr);
mpLockAnm->entry(mpLockModel->getModelData());
mDoExt_modelUpdateDL(mpLockModel);
}
rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp
+1 -1
View File
@@ -730,7 +730,7 @@ int daE_YM_c::draw() {
J3DModel* model_p = field_0x5b4->getModel();
g_env_light.settingTevStruct(6, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model_p->getModelData(), &tevStr);
g_env_light.setLightTevColorType_MAJI(model_p, &tevStr);
J3DModelData* modelData_p = model_p->getModelData();
for (u16 i = 0; i < modelData_p->getMaterialNum(); i++) {
rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp
+2 -2
View File
@@ -1153,11 +1153,11 @@ int daNpcAsh_c::Draw() {
mMcaMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
draw(0, 0, daNpcAsh_Param_c::m.mShadow, NULL, 0);
if (field_0xf60 == 1) {
g_env_light.setLightTevColorType_MAJI(mModelBow->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModelBow, &tevStr);
mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(16));
mModelBow->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mModelBow);
g_env_light.setLightTevColorType_MAJI(mModelQuiver->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mModelQuiver, &tevStr);
mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(2));
mModelQuiver->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mModelQuiver);
rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp
+2 -3
View File
@@ -624,7 +624,7 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) {
} else {
g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
}
g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr);
i_this->mpBtkAnm->entry(model->getModelData());
i_this->mpBtpAnm->entry(model->getModelData());
@@ -640,8 +640,7 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) {
}
if (i_this->field_0x5b4 == 3) {
g_env_light.setLightTevColorType_MAJI(i_this->mpDishMorf->getModel()->mModelData,
&i_this->tevStr);
g_env_light.setLightTevColorType_MAJI(i_this->mpDishMorf->getModel(), &i_this->tevStr);
i_this->mpDishMorf->entryDL();
}
rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp
+1 -1
View File
@@ -222,7 +222,7 @@ static asm int nodeCallBack(J3DJoint* param_0, int param_1) {
/* 80B25B78-80B25BDC 000258 0064+00 1/0 0/0 0/0 .text daNPC_TR_Draw__FP12npc_tr_class */
static int daNPC_TR_Draw(npc_tr_class* npc_tr) {
g_env_light.settingTevStruct(0, &npc_tr->current.pos, &npc_tr->tevStr);
g_env_light.setLightTevColorType_MAJI(npc_tr->field_0x5b8->mModelData, &npc_tr->tevStr);
g_env_light.setLightTevColorType_MAJI(npc_tr->field_0x5b8, &npc_tr->tevStr);
mDoExt_modelUpdateDL(npc_tr->field_0x5b8);
return 1;
}
rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp
+1 -1
View File
@@ -156,7 +156,7 @@ void daBarDesk_c::setBreakEffect() {
/* 80BA98E8-80BA998C 000848 00A4+00 1/0 0/0 0/0 .text Draw__11daBarDesk_cFv */
int daBarDesk_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ int daObj_Bed_c::Execute() {
/* 80BADDF4-80BADEB8 000874 00C4+00 1/1 0/0 0/0 .text Draw__11daObj_Bed_cFv */
int daObj_Bed_c::Draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
if (mGroundH != -1e9f) {
mShadow = dComIfGd_setShadow(mShadow, 1, mpModel, &current.pos,
rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ static int daObjBombf_Execute(daObjBombf_c* i_this) {
/* 80BBADF8-80BBAE5C 000478 0064+00 1/1 0/0 0/0 .text draw__12daObjBombf_cFv */
int daObjBombf_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x570->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x570, &tevStr);
mDoExt_modelUpdateDL(field_0x570);
return 1;
}
rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp
+1 -1
View File
@@ -1009,7 +1009,7 @@ void daObjBossWarp_c::setGoal() {
/* 8057B190-8057B23C 001BD0 00AC+00 1/1 0/0 0/0 .text draw__15daObjBossWarp_cFv */
int daObjBossWarp_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
mpBrkAnm->entry(mpModel->getModelData());
mpBtkAnm[0]->entry(mpModel->getModelData());
mpBtkAnm[1]->entry(mpModel->getModelData());
rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ void daBsGate_c::modeClose() {
/* 80BC2F94-80BC3038 0007F4 00A4+00 1/0 0/0 0/0 .text Draw__10daBsGate_cFv */
int daBsGate_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp
+1 -1
View File
@@ -316,7 +316,7 @@ void daObjCdoor_c::actionDead() {
/* 80BC7C04-80BC7CE4 000EC4 00E0+00 1/0 0/0 0/0 .text Draw__12daObjCdoor_cFv */
int daObjCdoor_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
if (mType == 1) {
J3DModelData* model_data = mpModel->getModelData();
if (mIsOpen) {
rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ int daObjChandelier_c::Delete() {
/* 80BC8194-80BC8238 0002D4 00A4+00 1/0 0/0 0/0 .text Draw__17daObjChandelier_cFv */
int daObjChandelier_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp
+1 -1
View File
@@ -494,7 +494,7 @@ int daObjCHO_c::Draw() {
Z_BufferChk();
J3DModel* model = mpMorf->getModel();
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(model->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(model, &tevStr);
mpBtkAnm->entry(model->getModelData());
mpBrkAnm->entry(model->getModelData());
mpMorf->entryDL();
rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ int daCowdoor_c::Execute(f32 (**param_0)[3][4]) {
/* 80BCCA48-80BCCAEC 0002C8 00A4+00 1/0 0/0 0/0 .text Draw__11daCowdoor_cFv */
int daCowdoor_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x5a8->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(field_0x5a8, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(field_0x5a8);
dComIfGd_setList();
rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp
+1 -1
View File
@@ -194,7 +194,7 @@ int daGraveStone_c::Execute(Mtx** i_mtxP) {
/* 80C13078-80C1311C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__14daGraveStone_cFv */
int daGraveStone_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
dComIfGd_setListBG();
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();

Some files were not shown because too many files have changed in this diff Show More