mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 06:03:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_figure done except linkDraw regalloc

Browse Source
This commit is contained in:
LagoLunatic
2024-07-10 11:25:00 -04:00
parent 17a7656450
commit 635a1fd052
5 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1569,7 +1569,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_ekskz"),
ActorRel(NonMatching, "d_a_obj_eskban", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_ferris", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_obj_figure"),
ActorRel(NonMatching, "d_a_obj_figure", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_obj_firewall"),
ActorRel(NonMatching, "d_a_obj_flame"),
ActorRel(NonMatching, "d_a_obj_ftree"),
include/JSystem/J3DGraphBase/J3DMatBlock.h
+7 -2
View File
@@ -594,13 +594,13 @@ struct J3DBlend : public J3DBlendInfo {
J3DBlend() { *(J3DBlendInfo*)this = j3dDefaultBlendInfo; }
explicit J3DBlend(const J3DBlendInfo& info) { *(J3DBlendInfo*)this = info; }
GXBlendMode getBlendMode() const { return (GXBlendMode)mBlendMode; }
GXBlendMode getType() const { return (GXBlendMode)mBlendMode; }
GXBlendFactor getSrcFactor() const { return (GXBlendFactor)mSrcFactor; }
GXBlendFactor getDstFactor() const { return (GXBlendFactor)mDstFactor; }
GXLogicOp getLogicOp() const { return (GXLogicOp)mLogicOp; }
void load(u8 ditherEnable) {
J3DGDSetBlendMode(getBlendMode(), getSrcFactor(), getDstFactor(), getLogicOp(), ditherEnable);
J3DGDSetBlendMode(getType(), getSrcFactor(), getDstFactor(), getLogicOp(), ditherEnable);
}
void setType(u8 i_type) {
@@ -614,6 +614,11 @@ struct J3DBlend : public J3DBlendInfo {
void setDstFactor(u8 i_dst) {
mDstFactor = i_dst;
}
void getOp() const {}
// void operator=(const J3DBlend&) {}
// void operator==(J3DBlend&) {}
void setBlendInfo(const J3DBlendInfo&) {}
};
extern const J3DFogInfo j3dDefaultFogInfo;
src/d/actor/d_a_npc_mt.cpp
+5 -5
View File
@@ -7,6 +7,8 @@
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#define TOTAL_FIGURE_COUNT 0x86
static u16 l_figure_comp[] = {
0x95FF,
0x94FF,
@@ -249,11 +251,9 @@ bool daNpcMt_c::isFigureGet(u8) {
/* 00002B98-00002C38 .text setFigure__9daNpcMt_cFUc */
void daNpcMt_c::setFigure(u8 figure) {
/* Nonmatching */
if(figure < 0x86) {
if(figure < TOTAL_FIGURE_COUNT) {
u8 reg = dComIfGs_getEventReg(l_figure_comp[figure / 8]);
reg |= 1 << (figure & 7);
reg |= 1 << (figure % 8);
dComIfGs_setEventReg(l_figure_comp[figure / 8], reg);
dComIfGs_onEventBit(0x3A01);
}
@@ -263,7 +263,7 @@ void daNpcMt_c::setFigure(u8 figure) {
int daNpcMt_c::getFigureMakeNum() {
int num = 0;
for(u8 i = 0; i < 0x86; i++) {
for(u8 i = 0; i < TOTAL_FIGURE_COUNT; i++) {
if(isFigureGet(i)) {
num++;
}
src/d/actor/d_a_obj_figure.cpp
+55 -51
View File
@@ -16,6 +16,8 @@
static u8 dummy_bss[0x4C];
#define TOTAL_FIGURE_COUNT 0x86
static const char* l_arcname_tbl[] = {
"Figure",
"Figure2",
@@ -88,7 +90,7 @@ struct FigureData {
/* 0x08 */ int mRoomId;
}; // Size: 0x0C
static const FigureData l_figure_dat_tbl[] = {
static const FigureData l_figure_dat_tbl[TOTAL_FIGURE_COUNT] = {
{
0,
0x37441422,
@@ -861,7 +863,7 @@ daObjFigure_c::daObjFigure_c() {
if(mFigureNo == 0xFF) {
mFigureNo = 0;
}
if(mFigureNo >= 0x86) {
if(mFigureNo >= TOTAL_FIGURE_COUNT) {
mFigureNo = 0;
}
@@ -927,15 +929,14 @@ s32 daObjFigure_c::_create() {
/* 00000720-00000A90 .text createHeap__13daObjFigure_cFv */
BOOL daObjFigure_c::createHeap() {
/* Nonmatching */
int id = dSnap_GetFigRoomId(getFigureNo());
if(l_figure_dat_tbl[getFigureNo()].mRoomId >= 0) {
id = l_figure_dat_tbl[getFigureNo()].mRoomId;
}
J3DModelData* pModelData;
const char* arcname = l_arcname_tbl[id];
J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectIDRes(arcname, getFigureBmd(mFigureNo)));
pModelData = (J3DModelData*)(dComIfG_getObjectIDRes(arcname, getFigureBmd(mFigureNo)));
if(pModelData == NULL) {
return false;
}
@@ -1235,8 +1236,6 @@ void daObjFigure_c::eventMesSetInit(int staffIdx) {
/* 00001294-00001600 .text eventMesSet__13daObjFigure_cFv */
bool daObjFigure_c::eventMesSet() {
/* Nonmatching */
switch(m73F) {
case 0:
if(m73A != 0) {
@@ -1245,7 +1244,7 @@ bool daObjFigure_c::eventMesSet() {
else {
dComIfGp_setDoStatusForce(0x21);
dComIfGp_setAStatusForce(0x27);
if(g_mDoCPd_cpadInfo[0].mMainStickPosX != 0.0f || g_mDoCPd_cpadInfo[0].mMainStickPosY != 0.0f || g_mDoCPd_cpadInfo[0].mCStickPosY != 0.0f) {
if(g_mDoCPd_cpadInfo[0].mMainStickPosX || g_mDoCPd_cpadInfo[0].mMainStickPosY || g_mDoCPd_cpadInfo[0].mCStickPosY) {
m738 = l_figure_check_tbl[0].field_0x32;
m734 += (s16)(g_mDoCPd_cpadInfo[0].mMainStickPosX * l_figure_check_tbl[0].field_0x2C);
m728 += (s16)(g_mDoCPd_cpadInfo[0].mMainStickPosY * l_figure_check_tbl[0].field_0x04);
@@ -1432,10 +1431,10 @@ void daObjFigure_c::setMtx() {
/* 00001954-000019DC .text isFigureGet__13daObjFigure_cFUc */
BOOL daObjFigure_c::isFigureGet(u8 figureNo) {
/* Nonmatching */
if(figureNo / 8 < 0x11) {
return dComIfGs_getEventReg(l_figure_comp[figureNo / 8]) & (1 << (figureNo & 7));
u8 reg = dComIfGs_getEventReg(l_figure_comp[figureNo / 8]);
u32 ret = reg & (1 << figureNo % 8);
return (u8)ret; // Fakematch for the clrlwi
}
return false;
@@ -1491,12 +1490,14 @@ static BOOL daSampleIsDelete(void*) {
/* 00001B08-00002148 .text linkDraw__FP14mDoExt_McaMorf */
void linkDraw(mDoExt_McaMorf* pMorf) {
/* Nonmatching */
/* Nonmatching - regalloc (maybe the same issue as daPy_lk_c::draw?) */
pMorf->calc();
j3dSys.setModel(pMorf->getModel());
j3dSys.setTexture(j3dSys.getModel()->getModelData()->getTexture());
j3dSys.getModel()->unlock();
J3DModel* model = pMorf->getModel();
J3DModelData* modelData = model->getModelData();
j3dSys.setModel(model);
j3dSys.setTexture(modelData->getTexture());
model->unlock();
static mDoExt_offCupOnAupPacket l_offCupOnAupPacket1;
static mDoExt_offCupOnAupPacket l_offCupOnAupPacket2;
@@ -1507,102 +1508,105 @@ void linkDraw(mDoExt_McaMorf* pMorf) {
J3DShape* ZOffNoneShape[4];
J3DShape* ZOnShape[4];
int i;
J3DMaterial* mat = j3dSys.getModel()->getModelData()->getJointNodePointer(0x13)->getMesh();
J3DJoint* link_root_joint = modelData->getJointNodePointer(0x00); // link_root joint
J3DJoint* cl_eye_joint = modelData->getJointNodePointer(0x13); // cl_eye joint
J3DJoint* cl_mayu_joint = modelData->getJointNodePointer(0x15); // cl_mayu joint
J3DMaterial* mtl;
mtl = modelData->getJointNodePointer(0x13)->getMesh(); // cl_eye joint
int zoff_blend_cnt = 0;
int zoff_none_cnt = 0;
int zon_cnt = 0;
int i;
for (i = 0; i < 2; i++) {
while (mat) {
mat->setMaterialMode(1);
if (mat->getZMode()->getCompareEnable() == 0) {
if (mat->getBlend()->mBlendMode == 1) {
ZOffBlendShape[zoff_blend_cnt] = mat->getShape();
while (mtl) {
mtl->setMaterialMode(1);
if (mtl->getZMode()->getCompareEnable() == 0) {
// TODO: debug map indicates J3DBlend::getType inline was used
if (mtl->getBlend()->mBlendMode == GX_BM_BLEND) {
ZOffBlendShape[zoff_blend_cnt] = mtl->getShape();
zoff_blend_cnt++;
JUT_ASSERT(0x6E7, zoff_blend_cnt <= 4);
} else {
ZOffNoneShape[zoff_none_cnt] = mat->getShape();
ZOffNoneShape[zoff_none_cnt] = mtl->getShape();
zoff_none_cnt++;
JUT_ASSERT(0x6EA, zoff_none_cnt <= 4);
}
} else {
ZOnShape[zon_cnt] = mat->getShape();
ZOnShape[zon_cnt] = mtl->getShape();
zon_cnt++;
JUT_ASSERT(0x6EE, zon_cnt <= 4);
}
mat = mat->getNext();
mtl = mtl->getNext();
}
mat = j3dSys.getModel()->getModelData()->getJointNodePointer(0x15)->getMesh();
mtl = modelData->getJointNodePointer(0x15)->getMesh(); // cl_mayu joint
}
dComIfGd_setListP0();
l_onCupOffAupPacket2.entryOpa();
for(int i = 0; i < 4; i++) {
for(i = 0; i < 4; i++) {
ZOffBlendShape[i]->hide();
ZOnShape[i]->hide();
ZOffNoneShape[i]->show();
}
j3dSys.getModel()->getModelData()->getJointNodePointer(0x13)->entryIn();
j3dSys.getModel()->getModelData()->getJointNodePointer(0x15)->entryIn();
cl_eye_joint->entryIn();
cl_mayu_joint->entryIn();
l_offCupOnAupPacket2.entryOpa();
for(int i = 0; i < 4; i++) {
for(i = 0; i < 4; i++) {
ZOffBlendShape[i]->show();
ZOffNoneShape[i]->hide();
}
j3dSys.getModel()->getModelData()->getJointNodePointer(0x13)->entryIn();
j3dSys.getModel()->getModelData()->getJointNodePointer(0x15)->entryIn();
cl_eye_joint->entryIn();
cl_mayu_joint->entryIn();
i = 0;
for (J3DMaterial* pMaterial = j3dSys.getModel()->getModelData()->getJointNodePointer(0)->getMesh(); pMaterial != NULL; pMaterial = pMaterial->getNext()) {
mtl = link_root_joint->getMesh();
for (i = 0; mtl != NULL; i++, mtl = mtl->getNext()) {
if(i != 2 && i != 5) {
pMaterial->getShape()->hide();
mtl->getShape()->hide();
}
i++;
}
j3dSys.getModel()->getModelData()->getJointNodePointer(0)->entryIn();
link_root_joint->entryIn();
i = 0;
for (J3DMaterial* pMaterial = j3dSys.getModel()->getModelData()->getJointNodePointer(0)->getMesh(); pMaterial != NULL; pMaterial = pMaterial->getNext()) {
for (i = 0, mtl = link_root_joint->getMesh(); mtl != NULL; i++, mtl = mtl->getNext()) {
if(i != 2 && i != 5) {
pMaterial->getShape()->show();
mtl->getShape()->show();
}
else {
pMaterial->getShape()->hide();
mtl->getShape()->hide();
}
i++;
}
l_onCupOffAupPacket1.entryOpa();
for(int i = 0; i < 4; i++) {
for(i = 0; i < 4; i++) {
ZOffBlendShape[i]->hide();
ZOnShape[i]->show();
ZOffNoneShape[i]->hide();
}
j3dSys.getModel()->getModelData()->getJointNodePointer(0x13)->entryIn();
j3dSys.getModel()->getModelData()->getJointNodePointer(0x15)->entryIn();
cl_eye_joint->entryIn();
cl_mayu_joint->entryIn();
l_offCupOnAupPacket1.entryOpa();
for(int i = 0; i < 4; i++) {
for(i = 0; i < 4; i++) {
ZOnShape[i]->hide();
}
dComIfGd_setListInvisisble();
dComIfGd_setList();
mDoExt_modelEntryDL(pMorf->getModel());
for (J3DMaterial* pMaterial = j3dSys.getModel()->getModelData()->getJointNodePointer(0)->getMesh(); pMaterial != NULL; pMaterial = pMaterial->getNext()) {
pMaterial->getShape()->hide();
for (mtl = link_root_joint->getMesh(); mtl != NULL; mtl = mtl->getNext()) {
mtl->getShape()->show();
}
j3dSys.getModel()->getModelData()->getJointNodePointer(0x13)->getMesh()->getShape()->show();
j3dSys.getModel()->getModelData()->getJointNodePointer(0x15)->getMesh()->getShape()->show();
modelData->getJointNodePointer(0x14)->getMesh()->getShape()->show(); // cl_hana joint
modelData->getJointNodePointer(0x29)->getMesh()->getShape()->show(); // cl_back joint
}
static actor_method_class daSampleMethodTable = {
src/d/actor/d_a_player_main.cpp
+26 -25
View File
@@ -785,7 +785,7 @@ void daPy_lk_c::onBodyEffect() {
/* 80107308-80108204 .text draw__9daPy_lk_cFv */
BOOL daPy_lk_c::draw() {
/* Nonmatching - regalloc */
/* Nonmatching - regalloc (maybe the same issue as linkDraw in d_a_obj_figure.cpp?) */
if (mSightPacket.getDrawFlg()) {
mSightPacket.setSight();
}
@@ -1622,9 +1622,9 @@ void daPy_lk_c::setPhotoBoxModel() {
initModel(&mpEquipItemModel, LINK_BDL_CAMERA, 0x37221222);
mDoExt_setCurrentHeap(oldHeap);
if (mEquipItem == CAMERA) {
mpEquipItemModel->getModelData()->getJointNodePointer(0x02)->getMesh()->getShape()->hide();
mpEquipItemModel->getModelData()->getJointNodePointer(0x02)->getMesh()->getShape()->hide(); // frash joint
} else {
mpEquipItemModel->getModelData()->getJointNodePointer(0x02)->getMesh()->getShape()->show();
mpEquipItemModel->getModelData()->getJointNodePointer(0x02)->getMesh()->getShape()->show(); // frash joint
}
}
@@ -3606,9 +3606,9 @@ BOOL daPy_lk_c::execute() {
setNeckAngle();
setHatAngle();
mpCLModelData->getJointNodePointer(0x00)->setMtxCalc(m_pbCalc[PART_UNDER_e]);
mpCLModelData->getJointNodePointer(0x02)->setMtxCalc(m_pbCalc[PART_UPPER_e]);
mpCLModelData->getJointNodePointer(0x1D)->setMtxCalc(m_pbCalc[PART_UNDER_e]);
mpCLModelData->getJointNodePointer(0x00)->setMtxCalc(m_pbCalc[PART_UNDER_e]); // link_root joint
mpCLModelData->getJointNodePointer(0x02)->setMtxCalc(m_pbCalc[PART_UPPER_e]); // body_chn joint
mpCLModelData->getJointNodePointer(0x1D)->setMtxCalc(m_pbCalc[PART_UNDER_e]); // wash_chn joint
checkOriginalHatAnimation();
@@ -4141,15 +4141,15 @@ void daPy_lk_c::playerInit() {
mpYmgcs00Model->getModelData()->getJointNodePointer(i)->setCallBack(daPy_auraCallback);
}
mpCLModelData->getJointNodePointer(0x01)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x0D)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x04)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x08)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x0C)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x1C)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x0F)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x00)->setCallBack(daPy_jointCallback0);
mpCLModelData->getJointNodePointer(0x28)->setCallBack(daPy_jointCallback1);
mpCLModelData->getJointNodePointer(0x01)->setCallBack(daPy_jointCallback0); // center joint
mpCLModelData->getJointNodePointer(0x0D)->setCallBack(daPy_jointCallback0); // cl_podA joint
mpCLModelData->getJointNodePointer(0x04)->setCallBack(daPy_jointCallback0); // chest_jnt joint
mpCLModelData->getJointNodePointer(0x08)->setCallBack(daPy_jointCallback0); // cl_LhandA joint
mpCLModelData->getJointNodePointer(0x0C)->setCallBack(daPy_jointCallback0); // cl_RhandA joint
mpCLModelData->getJointNodePointer(0x1C)->setCallBack(daPy_jointCallback0); // hatC_jnt
mpCLModelData->getJointNodePointer(0x0F)->setCallBack(daPy_jointCallback0); // head_jnt
mpCLModelData->getJointNodePointer(0x00)->setCallBack(daPy_jointCallback0); // link_root joint
mpCLModelData->getJointNodePointer(0x28)->setCallBack(daPy_jointCallback1); // cl_back joint
m_pbCalc[PART_UNDER_e]->setUserArea(reinterpret_cast<u32>(this));
m_pbCalc[PART_UNDER_e]->setBeforeCalc(daPy_jointBeforeCallback);
@@ -4159,31 +4159,32 @@ void daPy_lk_c::playerInit() {
m_pbCalc[PART_UPPER_e]->setAfterCalc(daPy_jointAfterCallback);
int i;
J3DMaterial* mat = mpCLModelData->getJointNodePointer(0x13)->getMesh();
J3DMaterial* mtl = mpCLModelData->getJointNodePointer(0x13)->getMesh(); // cl_eye joint
int zoff_blend_cnt = 0;
int zoff_none_cnt = 0;
int zon_cnt = 0;
for (i = 0; i < 2; i++) {
while (mat) {
mat->setMaterialMode(1);
if (mat->getZMode()->getCompareEnable() == 0) {
if (mat->getBlend()->mBlendMode == 1) {
mpZOffBlendShape[zoff_blend_cnt] = mat->getShape();
while (mtl) {
mtl->setMaterialMode(1);
if (mtl->getZMode()->getCompareEnable() == 0) {
// TODO: debug map indicates J3DBlend::getType inline was used
if (mtl->getBlend()->mBlendMode == GX_BM_BLEND) {
mpZOffBlendShape[zoff_blend_cnt] = mtl->getShape();
zoff_blend_cnt++;
JUT_ASSERT(0x53EE, zoff_blend_cnt <= 4);
} else {
mpZOffNoneShape[zoff_none_cnt] = mat->getShape();
mpZOffNoneShape[zoff_none_cnt] = mtl->getShape();
zoff_none_cnt++;
JUT_ASSERT(0x53F2, zoff_none_cnt <= 4);
}
} else {
mpZOnShape[zon_cnt] = mat->getShape();
mpZOnShape[zon_cnt] = mtl->getShape();
zon_cnt++;
JUT_ASSERT(0x53F6, zon_cnt <= 4);
}
mat = mat->getNext();
mtl = mtl->getNext();
}
mat = mpCLModelData->getJointNodePointer(0x15)->getMesh();
mtl = mpCLModelData->getJointNodePointer(0x15)->getMesh(); // cl_mayu joint
}
JUT_ASSERT(0x53FD, zon_cnt == 4);
JUT_ASSERT(0x53FE, zoff_none_cnt == 4);