mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-09 10:54:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

setup dolphin VEC/MTX function defines (#1903)

Browse Source 
* setup VEC function defines

* setup MTX function defines
This commit is contained in:
TakaRikka
2023-09-02 06:38:08 -07:00
committed by GitHub
parent f90d73eeeb
commit 2a67e0a8ba
102 changed files with 479 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/d/a/b/d_a_b_go/d_a_b_go.cpp
+1 -1
View File
@@ -541,7 +541,7 @@ static void action(b_go_class* b_go) {
b_go->speed.x = newSpeed.x;
b_go->speed.z = newSpeed.z;
PSVECAdd(&b_go->current.pos, &b_go->speed, &b_go->current.pos);
VECAdd(&b_go->current.pos, &b_go->speed, &b_go->current.pos);
b_go->speed.y += b_go->mGravity;
b_go->mAcch.CrrPos(dComIfG_Bgsp());
rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp
+6 -6
View File
@@ -262,11 +262,11 @@ static int nodeCallBack(J3DJoint* param_0, int param_1) {
b_oh_class* this_ = (b_oh_class*)model_p->getUserArea();
if (this_ != NULL && jnt_no >= this_->field_0xca8 && jnt_no <= 29) {
PSMTXCopy(model_p->i_getAnmMtx(jnt_no), *calc_mtx);
MTXCopy(model_p->i_getAnmMtx(jnt_no), *calc_mtx);
mDoMtx_YrotM(*calc_mtx, this_->field_0x61c[jnt_no].y + this_->field_0x784[jnt_no].y);
mDoMtx_ZrotM(*calc_mtx, this_->field_0x61c[jnt_no].x + this_->field_0x784[jnt_no].x);
MtxTrans(this_->mTentacleLength + -100.0f, 1.0f, 1.0f, 1);
PSMTXCopy(*calc_mtx, J3DSys::mCurrentMtx);
MTXCopy(*calc_mtx, J3DSys::mCurrentMtx);
MtxScale(1.0f, this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no],
this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no], 1);
model_p->i_setAnmMtx(jnt_no, *calc_mtx);
@@ -473,7 +473,7 @@ static void start(b_oh_class* i_this) {
case 1:
if (i_this->field_0xcac < -100.0f) {
for (int i = 0; i < 28; i++) {
PSMTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i), mDoMtx_stack_c::get());
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i), mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&sp28);
if (sp28.y > boss->field_0x47a0) {
@@ -1071,7 +1071,7 @@ static void action(b_oh_class* i_this) {
cLib_addCalc2(&i_this->mTentacleLength, l_HIO.mLength, 0.1f, 0.5f);
}
PSMTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8),
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->current.pos);
@@ -1194,7 +1194,7 @@ static void damage_check(b_oh_class* i_this) {
i_this->mHealth = 1000;
cc_at_check(i_this, &i_this->mAtInfo);
PSMTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i * 2 + 1),
MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i * 2 + 1),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->mEyePos);
i_dComIfGp_setHitMark(1, i_this, &i_this->mEyePos, NULL, NULL, 0);
@@ -1310,7 +1310,7 @@ static int daB_OH_Execute(b_oh_class* i_this) {
}
for (int i = 0; i < 15; i++) {
PSMTXCopy(model_p->i_getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get());
MTXCopy(model_p->i_getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&collider_center);
if (i_this->mAction >= ACTION_END) {
rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp
+2 -2
View File
@@ -141,10 +141,10 @@ static void action(b_oh2_class* i_this) {
break;
}
PSMTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8),
MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8),
mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->current.pos);
PSMTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(0), mDoMtx_stack_c::get());
MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(0), mDoMtx_stack_c::get());
local_20.set(0.0f, 0.0f, i_this->field_0x5c8 * 20.0f + 650.0f);
mDoMtx_stack_c::multVec(&local_20, &vstack_2C);
rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp
+1 -1
View File
@@ -508,7 +508,7 @@ asm void daBgObj_c::setAttentionInfo(fopAc_ac_c* param_0) {
void daBgObj_c::initBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
setBaseMtx();
}
rel/d/a/d_a_boomerang/d_a_boomerang.cpp
+8 -8
View File
@@ -859,13 +859,13 @@ void daBoomerang_c::windModelCallBack() {
mDoMtx_XrotM((MtxP)mDoMtx_stack_c::get(), -shape_angle.x);
mDoMtx_YrotM((MtxP)mDoMtx_stack_c::get(), -shape_angle.y);
PSMTXConcat(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx, mDoMtx_stack_c::get());
MTXConcat(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx, mDoMtx_stack_c::get());
mDoMtx_stack_c::get()[0][3] = J3DSys::mCurrentMtx[0][3];
mDoMtx_stack_c::get()[1][3] = J3DSys::mCurrentMtx[1][3];
mDoMtx_stack_c::get()[2][3] = J3DSys::mCurrentMtx[2][3];
PSMTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx);
field_0x56c->setAnmMtx(4, mDoMtx_stack_c::get());
return;
@@ -1092,14 +1092,14 @@ void daBoomerang_c::setRoomInfo() {
/* 8049FAA4-8049FBAC 001A64 0108+00 2/2 0/0 0/0 .text setKeepMatrix__13daBoomerang_cFv */
void daBoomerang_c::setKeepMatrix() {
daAlink_c* link = daAlink_getAlinkActorClass();
PSMTXCopy(link->getLeftItemMatrix(), mDoMtx_stack_c::now);
MTXCopy(link->getLeftItemMatrix(), mDoMtx_stack_c::now);
mDoMtx_stack_c::transM(32.0f, -5.0f, -6.0f);
mDoMtx_stack_c::XYZrotM(0xfd28, 0x1bbb, 0xf99a);
PSMTXCopy(mDoMtx_stack_c::now, field_0x568->mBaseTransformMtx);
PSMTXCopy(link->getLeftItemMatrix(), field_0x56c->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, field_0x568->mBaseTransformMtx);
MTXCopy(link->getLeftItemMatrix(), field_0x56c->mBaseTransformMtx);
mDoMtx_stack_c::multVecZero(&current.pos);
daAlink_c::simpleAnmPlay(m_waitEffBtk);
PSMTXCopy(link->getLeftItemMatrix(), field_0x590->mBaseTransformMtx);
MTXCopy(link->getLeftItemMatrix(), field_0x590->mBaseTransformMtx);
}
/* ############################################################################################## */
@@ -1113,7 +1113,7 @@ COMPILER_STRIP_GATE(0x804A2910, &lit_4945);
void daBoomerang_c::setMoveMatrix() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
PSMTXCopy(mDoMtx_stack_c::now, field_0x56c->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, field_0x56c->mBaseTransformMtx);
daAlink_c::simpleAnmPlay(m_windBtk);
field_0x98c += 1.0f;
s32 maxFrame = mBck.getBckAnm()->getFrameMax();
@@ -1126,7 +1126,7 @@ void daBoomerang_c::setMoveMatrix() {
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::YrotM(field_0x95a);
mDoMtx_stack_c::XrotM(0x7fff);
PSMTXCopy(mDoMtx_stack_c::now, field_0x568->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, field_0x568->mBaseTransformMtx);
}
#else
#pragma push
rel/d/a/d_a_do/d_a_do.cpp
+2 -2
View File
@@ -442,7 +442,7 @@ static int nodeCallBack(J3DJoint* i_jntP, int param_1) {
do_class* user_area = (do_class*)model->getUserArea();
if (user_area) {
PSMTXCopy(model->i_getAnmMtx(joint_num), *calc_mtx);
MTXCopy(model->i_getAnmMtx(joint_num), *calc_mtx);
if (joint_num == 9 || joint_num == 10) {
cMtx_YrotM(*calc_mtx, user_area->field_0x60e.y + user_area->field_0x626.y);
@@ -457,7 +457,7 @@ static int nodeCallBack(J3DJoint* i_jntP, int param_1) {
}
model->setAnmMtx(joint_num, *calc_mtx);
PSMTXCopy(*calc_mtx, j3dSys.mCurrentMtx);
MTXCopy(*calc_mtx, j3dSys.mCurrentMtx);
}
}
return 1;
rel/d/a/d_a_dshutter/d_a_dshutter.cpp
+1 -1
View File
@@ -190,7 +190,7 @@ void daDsh_c::setMtx() {
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80467708-8046772C 0002E8 0024+00 5/5 0/0 0/0 .text setAction__7daDsh_cFPQ27daDsh_c8action_c */
rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp
+2 -2
View File
@@ -15,8 +15,8 @@ void daIzumiGate_c::initBaseMtx() {
/* 808490B8-8084910C 000098 0054+00 2/2 0/0 0/0 .text setBaseMtx__13daIzumiGate_cFv */
void daIzumiGate_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
PSMTXCopy(mDoMtx_stack_c::now, mBgMtx);
PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mBgMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
}
/* 8084910C-80849138 0000EC 002C+00 1/0 0/0 0/0 .text daIzumiGate_Draw__FP13daIzumiGate_c
rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ static int daScex_Create(fopAc_ac_c* i_this) {
mDoMtx_stack_c::transS(scex->current.pos.x, scex->current.pos.y, scex->current.pos.z);
mDoMtx_stack_c::YrotM(scex->shape_angle.y);
PSMTXInverse(mDoMtx_stack_c::get(), scex->mMatrix);
MTXInverse(mDoMtx_stack_c::get(), scex->mMatrix);
scex->mScale.x *= 75.0f;
scex->mScale.z *= 75.0f;
scex->mScale.y *= 150.0f;
rel/d/a/d_a_spinner/d_a_spinner.cpp
+1 -1
View File
@@ -531,7 +531,7 @@ void daSpinner_c::setMatrix() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0xa84 + 90.0f, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::YrotM(field_0xa7e);
PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
mBck.entry(mpModel->getModelData());
mpModel->calc();
}
rel/d/a/d_a_title/d_a_title_nonmatching.cpp
+1 -1
View File
@@ -511,7 +511,7 @@ asm int daTitle_c::getDemoPrm() {
/* 80D67768-80D6786C 000D48 0104+00 1/1 0/0 0/0 .text Draw__9daTitle_cFv */
int daTitle_c::Draw() {
J3DModelData* modelData = mpModel->getModelData();
PSMTXTrans(mpModel->getBaseTRMtx(), 0.0f, 0.0f, -430.0f);
MTXTrans(mpModel->getBaseTRMtx(), 0.0f, 0.0f, -430.0f);
mpModel->getBaseScale()->x = -1.0f;
mBck.entry(modelData);
rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp
+2 -2
View File
@@ -1731,7 +1731,7 @@ static int daE_YK_Execute(e_yk_class* i_this) {
i_this->mAttentionInfo.mFlags = 0;
// need to define inline here
PSMTXCopy(daPy_getLinkPlayerActorClass()->getWolfMouthMatrix(),mDoMtx_stack_c::now);
MTXCopy(daPy_getLinkPlayerActorClass()->getWolfMouthMatrix(),mDoMtx_stack_c::now);
model->i_setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_stack_c::multVecZero(&i_this->current.pos);
} else {
@@ -1782,7 +1782,7 @@ static int daE_YK_Execute(e_yk_class* i_this) {
PSMTXCopy(model->i_getAnmMtx(2),(MtxP)calc_mtx);
MTXCopy(model->i_getAnmMtx(2),(MtxP)calc_mtx);
pos.set(0.0f,0.0f,0.0f);
MtxPosition(&pos,&i_this->mEyePos);
rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp
+3 -3
View File
@@ -195,7 +195,7 @@ static int nodeCallBack(J3DJoint* p_joint, int param_1) {
J3DModel* sysModel = j3dSys.mModel;
npc_tr_class* npc_tr = (npc_tr_class*)sysModel->mUserArea;
PSMTXCopy(sysModel->i_getAnmMtx(jointNo), *calc_mtx);
MTXCopy(sysModel->i_getAnmMtx(jointNo), *calc_mtx);
if (jointNo == 1) {
mDoMtx_YrotM(*calc_mtx, npc_tr->field_0x5f2[0] + (s16)(npc_tr->field_0x5f8 * 0.3f));
@@ -203,7 +203,7 @@ static int nodeCallBack(J3DJoint* p_joint, int param_1) {
mDoMtx_YrotM(*calc_mtx, npc_tr->field_0x5f2[jointNo - 1] + (s16)(npc_tr->field_0x5f8));
}
sysModel->setAnmMtx(jointNo, *calc_mtx);
PSMTXCopy(*calc_mtx, j3dSys.mCurrentMtx);
MTXCopy(*calc_mtx, j3dSys.mCurrentMtx);
}
return 1;
@@ -523,7 +523,7 @@ static int daNPC_TR_Execute(npc_tr_class* npc_tr) {
f32 scale = npc_tr->mScale.x * l_HIO.field_0x8;
mDoMtx_stack_c::scaleM(scale, scale, scale);
PSMTXCopy(mDoMtx_stack_c::get(), npc_tr->field_0x5b8->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::get(), npc_tr->field_0x5b8->mBaseTransformMtx);
return 1;
}
rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ static int daObjBombf_Delete(daObjBombf_c* i_this) {
void daObjBombf_c::setMatrix() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x584, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
PSMTXCopy(mDoMtx_stack_c::now, field_0x570->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, field_0x570->mBaseTransformMtx);
}
/* 80BBAE9C-80BBAEA8 000018 000C+00 1/1 0/0 0/0 .rodata bombOffset$3727 */
rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ void daObjCatDoor_c::initBaseMtx() {
mCullMtx = mMtx;
mDoMtx_stack_c::transS(current.pos);
mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y);
PSMTXCopy(mDoMtx_stack_c::get(), mMtx);
MTXCopy(mDoMtx_stack_c::get(), mMtx);
setBaseMtx();
}
rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ void daObjBoard_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::scaleM(mScale);
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 8057BE20-8057BE24 -00001 0004+00 2/2 0/0 0/0 .data l_arcName */
rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp
+3 -3
View File
@@ -9,10 +9,10 @@
/* 80BCC7F8-80BCC86C 000078 0074+00 2/2 0/0 0/0 .text setBaseMtx__11daCowdoor_cFv */
void daCowdoor_c::setBaseMtx() {
PSMTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
PSMTXCopy(mDoMtx_stack_c::now, field_0x5a8->mBaseTransformMtx);
PSMTXCopy(mDoMtx_stack_c::now, mBgMtx);
MTXCopy(mDoMtx_stack_c::now, field_0x5a8->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mBgMtx);
}
/* 80BCC86C-80BCC8C4 0000EC 0058+00 1/0 0/0 0/0 .text Create__11daCowdoor_cFv */
rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ static int daObj_Fmobj_Create(fopAc_ac_c* i_this) {
a_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_stack_c::transM(0.0f, -30.0f, 0.0f);
PSMTXCopy(mDoMtx_stack_c::get(), a_this->mDzbMtx);
MTXCopy(mDoMtx_stack_c::get(), a_this->mDzbMtx);
a_this->mpBgW->Move();
}
rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp
+6 -6
View File
@@ -113,7 +113,7 @@ int daObjHBombkoya_c::create1st() {
int phase = dComIfG_resLoad(actor_phase, l_arcName);
if (phase == cPhs_COMPLEATE_e) {
PSMTXIdentity(mBgMtx);
MTXIdentity(mBgMtx);
phase = MoveBGCreate(l_arcName, 7, NULL, 0x2860, &mBgMtx);
if (phase == cPhs_ERROR_e) {
@@ -133,7 +133,7 @@ int daObjHBombkoya_c::CreateHeap() {
}
Mtx m;
PSMTXIdentity(m);
MTXIdentity(m);
mpModel->i_setBaseTRMtx(m);
return 1;
}
@@ -173,7 +173,7 @@ int daObjHBombkoya_c::Create() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(current.angle.y);
mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z);
PSMTXCopy(mDoMtx_stack_c::get(), mMtx);
MTXCopy(mDoMtx_stack_c::get(), mMtx);
for (int i = 0; i < 9; i++) {
mEmitterKeys[i] = 0;
@@ -220,7 +220,7 @@ bool daObjHBombkoya_c::setParticle(u16* i_particleIDs, int i_particleMax,
cXyz base_pos;
base_pos = i_setTbl[i].m_position;
PSMTXMultVec(mMtx, &base_pos, &position);
MTXMultVec(mMtx, &base_pos, &position);
cXyz scale;
scale.z = i_setTbl[i].m_scale;
@@ -298,7 +298,7 @@ int daObjHBombkoya_c::Execute(Mtx** param_0) {
base_pos.y = 0.0f;
base_pos.z = -500.0f;
PSMTXMultVec(mMtx, &base_pos, &cyl_pos);
MTXMultVec(mMtx, &base_pos, &cyl_pos);
mCyl.SetC(cyl_pos);
dComIfG_Ccsp()->Set(&mCyl);
}
@@ -333,7 +333,7 @@ int daObjHBombkoya_c::Execute(Mtx** param_0) {
cXyz base_pos;
base_pos = ptable[i].set_info.m_position;
PSMTXMultVec(mMtx, &base_pos, &pos);
MTXMultVec(mMtx, &base_pos, &pos);
cXyz scale;
scale.z = ptable[i].set_info.m_scale;
rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp
+3 -3
View File
@@ -41,8 +41,8 @@ int daObjKJgjs_c::create1st() {
void daObjKJgjs_c::setMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::XYZrotM(current.angle.x, current.angle.y, current.angle.z);
PSMTXCopy(mDoMtx_stack_c::now, mMtx[1]);
PSMTXCopy(mDoMtx_stack_c::now, mMtx[0]);
MTXCopy(mDoMtx_stack_c::now, mMtx[1]);
MTXCopy(mDoMtx_stack_c::now, mMtx[0]);
}
/* 80C4654C-80C46554 000008 0008+00 1/1 0/0 0/0 .rodata l_bmdidx */
@@ -65,7 +65,7 @@ static const Vec l_cull_box[4] = {
/* 80C46264-80C46310 000244 00AC+00 1/0 0/0 0/0 .text Create__12daObjKJgjs_cFv */
int daObjKJgjs_c::Create() {
fopAcM_SetMtx(this, mMtx[1]);
PSMTXCopy(mMtx[1], mpModel->mBaseTransformMtx);
MTXCopy(mMtx[1], mpModel->mBaseTransformMtx);
dBgW* bgw_p = mpBgW;
bgw_p->field_0x91 |= 4;
if (!field_0x60c) {
rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ void daObjLv4Floor_c::setBaseMtx() {
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80C678B0-80C678D4 000130 0024+00 1/0 0/0 0/0 .text Create__15daObjLv4Floor_cFv */
rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp
+1 -1
View File
@@ -424,7 +424,7 @@ void daMagLiftRot_c::setBaseMtx() {
mpModel->setBaseScale(cXyz(1.0f, 1.0f, 1.0f));
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
#else
#pragma push
rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ void daObjMGate_c::setBaseMtx() {
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::ZXYrotM(mGateAngle.x, mGateAngle.y, mGateAngle.z);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
if (mpKeyModel != NULL) {
cXyz key_offset(l_key_offset[mKind]);
rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ static void action(obj_myogan_class* i_this) {
mDoMtx_stack_c::scaleM(l_HIO.mSize, l_HIO.mSize, l_HIO.mSize);
i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
PSMTXCopy(mDoMtx_stack_c::get(), i_this->mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), i_this->mBgMtx);
i_this->mpBgW->Move();
i_this->mpBrk->play();
rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp
+3 -3
View File
@@ -18,9 +18,9 @@ void daObjOnsen_c::initBaseMtx() {
void daObjOnsen_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
PSMTXCopy(mDoMtx_stack_c::now, mpModel[0]->mBaseTransformMtx);
PSMTXCopy(mDoMtx_stack_c::now, mpModel[1]->mBaseTransformMtx);
PSMTXCopy(mDoMtx_stack_c::now, mBgMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel[0]->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel[1]->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mBgMtx);
}
/* 80CA7C28-80CA7C74 000148 004C+00 1/0 0/0 0/0 .text Create__12daObjOnsen_cFv */
rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ void daObjProp_c::init() {
void daObjProp_c::setModelMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
}
/* 80CB5558-80CB55AC 0003F8 0054+00 1/0 0/0 0/0 .text daObjProp_create__FP11daObjProp_c */
rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ void daObjRCircle_c::init() {
/* 80CB8BF0-80CB8C44 000610 0054+00 1/1 0/0 0/0 .text setModelMtx__14daObjRCircle_cFv */
void daObjRCircle_c::setModelMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
}
/* 80CB8C44-80CB8C98 000664 0054+00 1/0 0/0 0/0 .text daObjRCircle_create__FP14daObjRCircle_c */
rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ void daObjSMark_c::initBaseMtx() {
void daObjSMark_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
PSMTXCopy((MtxP)&mDoMtx_stack_c::now,(MtxP)&mCullMtx);
MTXCopy((MtxP)&mDoMtx_stack_c::now,(MtxP)&mCullMtx);
}
/* ############################################################################################## */
/* 8059A3E8-8059A3EC 000000 0004+00 2/2 0/0 0/0 .rodata @3642 */
rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ void daObjGake_c::setBaseMtx() {
mDoMtx_stack_c::YrotM(shape_angle.y);
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
}
/* 80D0BCB8-80D0BD30 000118 0078+00 1/0 0/0 0/0 .text Create__11daObjGake_cFv */
rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ void daObjTMoon_c::initBaseMtx() {
void daObjTMoon_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(shape_angle.y);
PSMTXCopy(mDoMtx_stack_c::now, field_0x570->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, field_0x570->mBaseTransformMtx);
}
/* 80D12C48-80D12C9C 000128 0054+00 1/1 0/0 0/0 .text Create__12daObjTMoon_cFv */
rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ static int daObj_Usaku_Execute(obj_usaku_class* i_this) {
i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
if (i_this->mpBgW != NULL) {
PSMTXCopy(mDoMtx_stack_c::get(), i_this->mBgMtx);
MTXCopy(mDoMtx_stack_c::get(), i_this->mBgMtx);
i_this->mpBgW->Move();
}
rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ void daObjVGnd_c::initBaseMtx() {
void daObjVGnd_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
}
/* 80D214AC-80D21500 00014C 0054+00 1/1 0/0 0/0 .text Create__11daObjVGnd_cFv */
rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp
+1 -1
View File
@@ -396,7 +396,7 @@ void daObjVolcBall_c::setBaseMtx() {
}
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
PSMTXCopy(mDoMtx_stack_c::get(), field_0x28ec);
MTXCopy(mDoMtx_stack_c::get(), field_0x28ec);
}
/* ############################################################################################## */
rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp
+1 -1
View File
@@ -263,7 +263,7 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) {
if (tmp < 0) {
mDoMtx_stack_c::YrotM(-0x8000);
}
PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx);
MTXCopy(mDoMtx_stack_c::get(), i_this->mMtx);
i_this->mpBgW->Move();
rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ static int daObj_Web1_Execute(obj_web1_class* i_this) {
mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
mDoMtx_stack_c::scaleM(i_this->mScale.x * 1.2f, i_this->mScale.x, i_this->mScale.x * 1.2f);
mDoMtx_stack_c::transM(0.0f, i_this->mScale.x * i_this->mScale.y * -15.0f + 9.0f, 0.0f);
PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx);
MTXCopy(mDoMtx_stack_c::get(), i_this->mMtx);
i_this->mpBgW->Move();
i_this->mCylCc.SetC(i_this->current.pos);
rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ void daObjZCloth_c::initBaseMtx() {
void daObjZCloth_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
PSMTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
}
/* 80D3EEC0-80D3EF0C 000120 004C+00 1/1 0/0 0/0 .text Create__13daObjZCloth_cFv */
rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ void daTagSpinner_c::initBaseMtx() {
/* 80D618C4-80D6191C 000244 0058+00 1/1 0/0 0/0 .text setBaseMtx__14daTagSpinner_cFv */
void daTagSpinner_c::setBaseMtx() {
PSMTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
mDoMtx_ZXYrotM(mDoMtx_stack_c::now, shape_angle.x, shape_angle.y, shape_angle.z);
}