falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert user area changes

This commit is contained in:
Pheenoh 2023-01-15 12:28:57 -07:00
parent 8b52fd247a
commit ca38ce3465
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/JSystem/J3DGraphAnimator/J3DModel.h
View File

@ -90,20 +90,20 @@ public:
Mtx33* getNrmMtxPtr() const { return mMtxBuffer->getNrmMtxPtr(); }
Mtx* getDrawMtxPtr() const { return mMtxBuffer->getDrawMtxPtr(); }
void setBaseScale(const Vec& scale) { mBaseScale = scale; }
void setUserArea(UserArea* area) { mUserArea = area; }
UserArea* getUserArea() const { return mUserArea; }
void setUserArea(u32 area) { mUserArea = area; }
u32 getUserArea() const { return mUserArea; }
Vec* getBaseScale() { return &mBaseScale; }
void setAnmMtx(int i, Mtx m) { mMtxBuffer->setAnmMtx(i, m); }
// is there a better way to handle inlines with same name as non-inlines?
MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); }
void setAnmMtx(int p1, Mtx mtx) { return mMtxBuffer->setAnmMtx(p1, mtx); }
void i_setAnmMtx(int p1, Mtx mtx) { return mMtxBuffer->setAnmMtx(p1, mtx); }
/* 0x04 */ J3DModelData* mModelData;
/* 0x08 */ u32 mFlags;
/* 0x0C */ u32 mDiffFlag;
/* 0x10 */ J3DCalcCallBack mCalcCallBack;
/* 0x14 */ UserArea* mUserArea;
/* 0x14 */ u32 mUserArea;
/* 0x18 */ Vec mBaseScale;
/* 0x24 */ Mtx mBaseTransformMtx;
/* 0x54 */ Mtx mInternalView;

2
rel/d/a/d_a_do/d_a_do.cpp
View File

@ -786,7 +786,7 @@ COMPILER_STRIP_GATE(0x8066EE1C, &lit_3981);
#pragma pop
/* 80668624-80668754 0009C4 0130+00 1/1 0/0 0/0 .text depth_check__FP8do_class4cXyzf */
#ifndef NONMATCHING
#ifdef NONMATCHING
static bool depth_check(do_class* i_dogP, cXyz i_pos, f32 param_2) {
dBgS_GndChk gnd_chk;
dBgS_ObjGndChk_Spl gnd_chk_spl;

2
rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp
View File

@ -560,7 +560,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 0;
}
npc_tr->field_0x5b8->setUserArea((UserArea*)actor);
npc_tr->field_0x5b8->setUserArea((u32)actor);
for (u16 i = 0; i < npc_tr->field_0x5b8->getModelData()->getJointNum(); i++) {
npc_tr->field_0x5b8->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);

4
src/d/a/d_a_npc.cpp
View File

@ -2036,7 +2036,7 @@ void daNpcT_c::setMtx() {
mDoMtx_stack_c::scaleM(mScale);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((UserArea*)this);
model->setUserArea((u32)this);
mMcaMorfAnm[0]->onMorfNone();
if (cM3d_IsZero(field_0xdfc) != 0) {
@ -3786,7 +3786,7 @@ void daBaseNpc_c::setMtx(int param_0) {
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
if (param_0) {
model->setUserArea((UserArea*)this);
model->setUserArea((u32)this);
} else {
model->setUserArea(0);
}