Skip to content

Commit

Permalink
d_a_obj_figure done except linkDraw regalloc
Browse files Browse the repository at this point in the history
  • Loading branch information
@LagoLunatic
LagoLunatic committed Jul 10, 2024
1 parent 17a7656 commit 635a1fd
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 84 deletions.
2 changes: 1 addition & 1 deletion configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ def JSystemLib(lib_name, objects):
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"),
Expand Down
9 changes: 7 additions & 2 deletions include/JSystem/J3DGraphBase/J3DMatBlock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/d/actor/d_a_npc_mt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand All @@ -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++;
}
Expand Down
106 changes: 55 additions & 51 deletions src/d/actor/d_a_obj_figure.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

static u8 dummy_bss[0x4C];

#define TOTAL_FIGURE_COUNT 0x86

static const char* l_arcname_tbl[] = {
"Figure",
"Figure2",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -861,7 +863,7 @@ daObjFigure_c::daObjFigure_c() {
if(mFigureNo == 0xFF) {
mFigureNo = 0;
}
if(mFigureNo >= 0x86) {
if(mFigureNo >= TOTAL_FIGURE_COUNT) {
mFigureNo = 0;
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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) {
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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 = {
Expand Down
Loading

0 comments on commit 635a1fd

Please sign in to comment.