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

Demo work (#984)

Browse Source
This commit is contained in:
LagoLunatic
2026-05-09 18:42:01 -04:00
committed by GitHub
parent 0e98a9b636
commit fe76ad5a3b
41 changed files with 546 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_adnno.cpp
+8 -8
View File
@@ -42,7 +42,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
/* 00000098-00000178 .text CreateHeap__12daObjAdnno_cFv */
BOOL daObjAdnno_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", ADNNO_BDL_ADNNO));
JUT_ASSERT(0x5c, modelData != NULL);
JUT_ASSERT(DEMO_SELECT(91, 92), modelData != NULL);
for (s32 i = 0; i < 16; i++) {
mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x37441422);
if (!mpModel[i])
@@ -67,11 +67,9 @@ void daObjAdnno_c::set_mtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(current.angle.y);
int x = i % 4;
int y = i / 4;
mDoMtx_stack_c::transM(
x * 40.0f - 60.0f,
60.0f - y * 40.0f,
(int)(i % 4) * 40.0f - 60.0f,
60.0f - (int)(i / 4) * 40.0f,
0.0f
);
mpModel[i]->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -95,7 +93,7 @@ cPhs_State daObjAdnno_c::_create() {
}
bool daObjAdnno_c::_delete() {
dComIfG_resDelete(&mPhs, "Adnno");
dComIfG_resDeleteDemo(&mPhs, "Adnno");
return true;
}
@@ -127,8 +125,10 @@ bool daObjAdnno_c::_draw() {
dComIfGd_setListBG();
for (s32 i = 0; i < 16; i++) {
if (dComIfGs_isEventBit(daObjAdnno_event_bit_table[i])) {
J3DMaterialTable* pBmt = (J3DMaterialTable*)dComIfG_getObjectRes("Adnno", daObjAdnno_bmt_table[i]);
mpModel[i]->getModelData()->setMaterialTable(pBmt, J3DMatCopyFlag_All);
mpModel[i]->getModelData()->setMaterialTable(
(J3DMaterialTable*)dComIfG_getObjectRes("Adnno", daObjAdnno_bmt_table[i]),
J3DMatCopyFlag_All
);
mDoExt_modelUpdateDL(mpModel[i]);
}
}