encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

rename variable in accordance with assert (#2797)

Browse Source
This commit is contained in:
roeming
2025-11-12 16:45:53 -08:00
committed by GitHub
parent 63093fea4a
commit a3c76c8a7e
36 changed files with 996 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc.h
+1 -1
View File
@@ -1017,7 +1017,7 @@ public:
class daNpcF_c : public fopAc_ac_c { class daNpcF_c : public fopAc_ac_c {
protected: protected:
/* 0x568 */ mDoExt_McaMorfSO* mpMorf; /* 0x568 */ mDoExt_McaMorfSO* mAnm_p;
/* 0x56C */ mDoExt_bckAnm mBckAnm; /* 0x56C */ mDoExt_bckAnm mBckAnm;
/* 0x588 */ mDoExt_btpAnm mBtpAnm; /* 0x588 */ mDoExt_btpAnm mBtpAnm;
/* 0x5A0 */ mDoExt_btkAnm mBtkAnm; /* 0x5A0 */ mDoExt_btkAnm mBtkAnm;
include/d/actor/d_a_npc_moir.h
+1 -1
View File
@@ -181,7 +181,7 @@ public:
/* 80A82878 */ inline void drawOtherMdls(); /* 80A82878 */ inline void drawOtherMdls();
/* 80A82900 */ inline BOOL drawDbgInfo(); /* 80A82900 */ inline BOOL drawDbgInfo();
MtxP getHandRMtx() { return mpMorf->getModel()->getAnmMtx(17); } MtxP getHandRMtx() { return mAnm_p->getModel()->getAnmMtx(17); }
s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; } s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; }
include/d/actor/d_a_npc_theB.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
/* 80AFFFE0 */ void EvCut_TheBHint(int); /* 80AFFFE0 */ void EvCut_TheBHint(int);
/* 80B00204 */ void EvCut_CoachGuardGameOver(int); /* 80B00204 */ void EvCut_CoachGuardGameOver(int);
void setTRMtx(MtxP mtx) { mpMorf->getModel()->setBaseTRMtx(mtx); } void setTRMtx(MtxP mtx) { mAnm_p->getModel()->setBaseTRMtx(mtx); }
void setGameOver() { mGameOver = 1; } void setGameOver() { mGameOver = 1; }
static u8 mEvtSeqList[72]; static u8 mEvtSeqList[72];
include/d/actor/d_a_npc_zra.h
+1 -1
View File
@@ -323,7 +323,7 @@ public:
int getType() { return mType; } int getType() { return mType; }
u32 getAngleNoFromParam() { return (u8)(fopAcM_GetParam(this) >> 8); } u32 getAngleNoFromParam() { return (u8)(fopAcM_GetParam(this) >> 8); }
void setBlastFlag(u8 i_flag) { mBlastFlag = i_flag; } void setBlastFlag(u8 i_flag) { mBlastFlag = i_flag; }
MtxP getHeadMtx() { return mpMorf->getModel()->getAnmMtx(4); } MtxP getHeadMtx() { return mAnm_p->getModel()->getAnmMtx(4); }
/* 0x0B48 */ Z2Creature mCreatureSound; /* 0x0B48 */ Z2Creature mCreatureSound;
/* 0x0BD8 */ J3DModel* mpObjectModel[3]; /* 0x0BD8 */ J3DModel* mpObjectModel[3];
src/d/actor/d_a_npc4.cpp
+22 -22
View File
@@ -611,7 +611,7 @@ BOOL daNpcF_c::execute() {
int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor, int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
BOOL i_hideDamage) { BOOL i_hideDamage) {
f32 damage_ratio, frame; f32 damage_ratio, frame;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
J3DModelData* modelData = model->getModelData(); J3DModelData* modelData = model->getModelData();
field_0x9f3 = 1; field_0x9f3 = 1;
@@ -664,10 +664,10 @@ int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10*
if (mTwilight) { if (mTwilight) {
dComIfGd_setListDark(); dComIfGd_setListDark();
mpMorf->entryDL(); mAnm_p->entryDL();
dComIfGd_setList(); dComIfGd_setList();
} else { } else {
mpMorf->entryDL(); mAnm_p->entryDL();
} }
if (mAnmFlags & ANM_PLAY_BTP) { if (mAnmFlags & ANM_PLAY_BTP) {
@@ -741,7 +741,7 @@ void* daNpcF_c::srchActor(void* i_proc, void* i_this) {
/* 8015276C-801527FC 14D0AC 0090+00 2/0 0/0 40/9 .text setMtx__8daNpcF_cFv */ /* 8015276C-801527FC 14D0AC 0090+00 2/0 0/0 40/9 .text setMtx__8daNpcF_cFv */
void daNpcF_c::setMtx() { void daNpcF_c::setMtx() {
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::ZXYrotM(mCurAngle);
mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::scaleM(scale);
@@ -750,15 +750,15 @@ void daNpcF_c::setMtx() {
if (mAnmFlags & 0x100) { if (mAnmFlags & 0x100) {
mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
mpMorf->modelCalc(); mAnm_p->modelCalc();
} else { } else {
mpMorf->modelCalc(); mAnm_p->modelCalc();
} }
} }
/* 801527FC-801528C8 14D13C 00CC+00 2/0 0/0 38/0 .text setMtx2__8daNpcF_cFv */ /* 801527FC-801528C8 14D13C 00CC+00 2/0 0/0 38/0 .text setMtx2__8daNpcF_cFv */
void daNpcF_c::setMtx2() { void daNpcF_c::setMtx2() {
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::ZXYrotM(mCurAngle);
mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::scaleM(scale);
@@ -766,16 +766,16 @@ void daNpcF_c::setMtx2() {
model->setUserArea((uintptr_t)this); model->setUserArea((uintptr_t)this);
if (cM3d_IsZero_inverted(mExpressionMorf)) { if (cM3d_IsZero_inverted(mExpressionMorf)) {
mpMorf->onMorfNone(); mAnm_p->onMorfNone();
} else { } else {
mpMorf->offMorfNone(); mAnm_p->offMorfNone();
} }
if (mAnmFlags & 0x100) { if (mAnmFlags & 0x100) {
mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
mpMorf->modelCalc(); mAnm_p->modelCalc();
} else { } else {
mpMorf->modelCalc(); mAnm_p->modelCalc();
} }
} }
@@ -895,7 +895,7 @@ J3DAnmTevRegKey* daNpcF_c::getTevRegKeyAnmP(char* i_arcName, int i_resIdx) {
* setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii */ * setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii */
BOOL daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_morf, int i_mode, BOOL daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_morf, int i_mode,
int i_start, int i_end) { int i_start, int i_end) {
mpMorf->setAnm(i_anm, i_mode, i_morf, i_speed, (f32)i_start, (f32)i_end); mAnm_p->setAnm(i_anm, i_mode, i_morf, i_speed, (f32)i_start, (f32)i_end);
return true; return true;
} }
@@ -942,12 +942,12 @@ void daNpcF_c::setRoomNo() {
/* 80152E24-80152EC4 14D764 00A0+00 1/1 0/0 0/0 .text chkEndAnm__8daNpcF_cFf */ /* 80152E24-80152EC4 14D764 00A0+00 1/1 0/0 0/0 .text chkEndAnm__8daNpcF_cFf */
BOOL daNpcF_c::chkEndAnm(f32 param_0) { BOOL daNpcF_c::chkEndAnm(f32 param_0) {
switch ((u8)mpMorf->getPlayMode()) { switch ((u8)mAnm_p->getPlayMode()) {
case J3DFrameCtrl::EMode_LOOP: case J3DFrameCtrl::EMode_LOOP:
return mpMorf->isLoop(); return mAnm_p->isLoop();
case J3DFrameCtrl::EMode_NONE: case J3DFrameCtrl::EMode_NONE:
case J3DFrameCtrl::EMode_RESET: case J3DFrameCtrl::EMode_RESET:
return mpMorf->isStop() && mpMorf->getPlaySpeed() == 0.0f && param_0 != 0.0f; return mAnm_p->isStop() && mAnm_p->getPlaySpeed() == 0.0f && param_0 != 0.0f;
case J3DFrameCtrl::EMode_REVERSE: case J3DFrameCtrl::EMode_REVERSE:
default: default:
return false; return false;
@@ -1019,13 +1019,13 @@ BOOL daNpcF_c::playAllAnm() {
} }
if (mAnmFlags & ANM_PLAY_MORF) { if (mAnmFlags & ANM_PLAY_MORF) {
rate = mpMorf->getPlaySpeed(); rate = mAnm_p->getPlaySpeed();
if (mAnmFlags & ANM_PAUSE_MORF) { if (mAnmFlags & ANM_PAUSE_MORF) {
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
mpMorf->play(mPolySound, mReverb); mAnm_p->play(mPolySound, mReverb);
mpMorf->setPlaySpeed(rate); mAnm_p->setPlaySpeed(rate);
} else { } else {
mpMorf->play(mPolySound, mReverb); mAnm_p->play(mPolySound, mReverb);
if (chkEndAnm(rate)) { if (chkEndAnm(rate)) {
mMotionLoops++; mMotionLoops++;
} }
@@ -1088,7 +1088,7 @@ void daNpcF_c::playExpressionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) {
morf = mExpressionMorfOverride; morf = mExpressionMorfOverride;
} }
mExpressionMorf = morf; mExpressionMorf = morf;
mpMorf->setMorf(morf); mAnm_p->setMorf(morf);
} }
} }
@@ -1127,7 +1127,7 @@ void daNpcF_c::playMotionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) {
morf = mMotionMorfOverride; morf = mMotionMorfOverride;
} }
mExpressionMorf = 0.0f; mExpressionMorf = 0.0f;
mpMorf->setMorf(morf); mAnm_p->setMorf(morf);
} }
} }
src/d/actor/d_a_npc_ash.cpp
+24 -24
View File
@@ -226,7 +226,7 @@ daNpcAsh_c::~daNpcAsh_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -284,7 +284,7 @@ cPhs__Step daNpcAsh_c::Create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f);
mCreatureSound.init(&current.pos, &eyePos, 3, 1); mCreatureSound.init(&current.pos, &eyePos, 3, 1);
mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length);
@@ -309,7 +309,7 @@ cPhs__Step daNpcAsh_c::Create() {
mGroundH = mAcch.GetGroundH(); mGroundH = mAcch.GetGroundH();
setEnvTevColor(); setEnvTevColor();
setRoomNo(); setRoomNo();
mpMorf->modelCalc(); mAnm_p->modelCalc();
reset(); reset();
Execute(); Execute();
} }
@@ -320,17 +320,17 @@ cPhs__Step daNpcAsh_c::Create() {
/* 80958B68-80958F08 000968 03A0+00 1/1 0/0 0/0 .text CreateHeap__10daNpcAsh_cFv */ /* 80958B68-80958F08 000968 03A0+00 1/1 0/0 0/0 .text CreateHeap__10daNpcAsh_cFv */
BOOL daNpcAsh_c::CreateHeap() { BOOL daNpcAsh_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 11)); J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 11));
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound,
0x80000, 0x11020284); 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->mpModel == NULL) { if (mAnm_p != NULL && mAnm_p->mpModel == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return false; return false;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) { for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
} }
@@ -391,17 +391,17 @@ int daNpcAsh_c::Execute() {
/* 8095911C-80959238 000F1C 011C+00 1/1 0/0 0/0 .text Draw__10daNpcAsh_cFv */ /* 8095911C-80959238 000F1C 011C+00 1/1 0/0 0/0 .text Draw__10daNpcAsh_cFv */
int daNpcAsh_c::Draw() { int daNpcAsh_c::Draw() {
mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false); draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false);
if (mType == TYPE_CASTLE) { if (mType == TYPE_CASTLE) {
g_env_light.setLightTevColorType_MAJI(mModelBow, &tevStr); g_env_light.setLightTevColorType_MAJI(mModelBow, &tevStr);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(16)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(16));
mModelBow->setBaseTRMtx(mDoMtx_stack_c::get()); mModelBow->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mModelBow); mDoExt_modelUpdateDL(mModelBow);
g_env_light.setLightTevColorType_MAJI(mModelQuiver, &tevStr); g_env_light.setLightTevColorType_MAJI(mModelQuiver, &tevStr);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2));
mModelQuiver->setBaseTRMtx(mDoMtx_stack_c::get()); mModelQuiver->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mModelQuiver); mDoExt_modelUpdateDL(mModelQuiver);
} }
@@ -416,11 +416,11 @@ bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int lookatJoints[3] = {1, 3, 4}; int lookatJoints[3] = {1, 3, 4};
if (jointNo == 0) { if (jointNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -437,15 +437,15 @@ bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jointNo == 4 || jointNo == 12) && (mAnmFlags & ANM_PLAY_BCK)) { if ((jointNo == 4 || jointNo == 12) && (mAnmFlags & ANM_PLAY_BCK)) {
J3DAnmTransform* bckAnm = mBckAnm.getBckAnm(); J3DAnmTransform* bckAnm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(bckAnm); mAnm_p->changeAnm(bckAnm);
} }
if (cM3d_IsZero_inverted(mExpressionMorf)) { if (cM3d_IsZero_inverted(mExpressionMorf)) {
if (jointNo == 12) { if (jointNo == 12) {
mpMorf->onMorfNone(); mAnm_p->onMorfNone();
} else if (jointNo == 4) { } else if (jointNo == 4) {
mpMorf->offMorfNone(); mAnm_p->offMorfNone();
} }
} }
@@ -545,7 +545,7 @@ bool daNpcAsh_c::setExpressionBtp(int i_idx) {
if (btpAnm == NULL) { if (btpAnm == NULL) {
return true; return true;
} }
if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) {
mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP;
if (i_idx == 0) { if (i_idx == 0) {
mAnmFlags |= ANM_FLAG_800; mAnmFlags |= ANM_FLAG_800;
@@ -577,7 +577,7 @@ void daNpcAsh_c::setMotionAnm(int i_idx, f32 i_morf) {
} }
if (btkAnm != NULL) { if (btkAnm != NULL) {
if (setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0f, btkAttr)) { if (setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0f, btkAttr)) {
mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK;
} }
} }
@@ -717,7 +717,7 @@ void daNpcAsh_c::playMotion() {
/* 8095C9BC-8095CC8C 0047BC 02D0+00 1/1 0/0 0/0 .text lookat__10daNpcAsh_cFv */ /* 8095C9BC-8095CC8C 0047BC 02D0+00 1/1 0/0 0/0 .text lookat__10daNpcAsh_cFv */
void daNpcAsh_c::lookat() { void daNpcAsh_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL snap = false; BOOL snap = false;
f32 body_angleX_min = mpHIO->m.common.body_angleX_min; f32 body_angleX_min = mpHIO->m.common.body_angleX_min;
@@ -1328,7 +1328,7 @@ void daNpcAsh_c::setAttnPos() {
lookat(); lookat();
cXyz vec(10.0f, 10.0f, 0.0f); cXyz vec(10.0f, 10.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&vec, &eyePos); mDoMtx_stack_c::multVec(&vec, &eyePos);
vec.x = 0.0f; vec.x = 0.0f;
@@ -1352,7 +1352,7 @@ void daNpcAsh_c::setAttnPos() {
mHeadPos.z); mHeadPos.z);
cXyz center; cXyz center;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2));
mDoMtx_stack_c::multVecZero(&center); mDoMtx_stack_c::multVecZero(&center);
center.y = current.pos.y; center.y = current.pos.y;
mCcCyl[0].SetC(center); mCcCyl[0].SetC(center);
src/d/actor/d_a_npc_ashB.cpp
+24 -24
View File
@@ -112,7 +112,7 @@ daNpcAshB_c::~daNpcAshB_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -144,8 +144,8 @@ cPhs__Step daNpcAshB_c::Create() {
if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x58b0)) { if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x58b0)) {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} else { } else {
J3DModelData* model_data = mpMorf->getModel()->getModelData(); J3DModelData* model_data = mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f);
mCreatureSound.init(&current.pos, &eyePos, 3, 1); mCreatureSound.init(&current.pos, &eyePos, 3, 1);
mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length);
@@ -164,7 +164,7 @@ cPhs__Step daNpcAshB_c::Create() {
mGroundH = mAcch.GetGroundH(); mGroundH = mAcch.GetGroundH();
setEnvTevColor(); setEnvTevColor();
setRoomNo(); setRoomNo();
mpMorf->modelCalc(); mAnm_p->modelCalc();
reset(); reset();
Execute(); Execute();
} }
@@ -177,17 +177,17 @@ cPhs__Step daNpcAshB_c::Create() {
/* 8095E4A0-8095E758 000740 02B8+00 1/1 0/0 0/0 .text CreateHeap__11daNpcAshB_cFv */ /* 8095E4A0-8095E758 000740 02B8+00 1/1 0/0 0/0 .text CreateHeap__11daNpcAshB_cFv */
BOOL daNpcAshB_c::CreateHeap() { BOOL daNpcAshB_c::CreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 28)); J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 28));
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound,
0x80000, 0x11020284); 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->mpModel == NULL) { if (mAnm_p != NULL && mAnm_p->mpModel == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return false; return false;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) { for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) {
modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
} }
@@ -227,7 +227,7 @@ int daNpcAshB_c::Execute() {
/* 8095E96C-8095E9C8 000C0C 005C+00 1/1 0/0 0/0 .text Draw__11daNpcAshB_cFv */ /* 8095E96C-8095E9C8 000C0C 005C+00 1/1 0/0 0/0 .text Draw__11daNpcAshB_cFv */
int daNpcAshB_c::Draw() { int daNpcAshB_c::Draw() {
mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false); draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false);
return 1; return 1;
} }
@@ -239,11 +239,11 @@ bool daNpcAshB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int lookatJoints[3] = {1, 9, 10}; int lookatJoints[3] = {1, 9, 10};
if (jointNo == 0) { if (jointNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(9)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(9));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(10)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(10));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -261,8 +261,8 @@ bool daNpcAshB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jointNo == 10 || jointNo == 19) && (mAnmFlags & ANM_PLAY_BCK)) { if ((jointNo == 10 || jointNo == 19) && (mAnmFlags & ANM_PLAY_BCK)) {
J3DAnmTransform* bckAnm = mBckAnm.getBckAnm(); J3DAnmTransform* bckAnm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(bckAnm); mAnm_p->changeAnm(bckAnm);
} }
return true; return true;
@@ -393,7 +393,7 @@ void daNpcAshB_c::playMotion() {
/* 80961574-80961770 003814 01FC+00 1/1 0/0 0/0 .text lookat__11daNpcAshB_cFv */ /* 80961574-80961770 003814 01FC+00 1/1 0/0 0/0 .text lookat__11daNpcAshB_cFv */
void daNpcAshB_c::lookat() { void daNpcAshB_c::lookat() {
fopAc_ac_c* actor = NULL; fopAc_ac_c* actor = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL snap = false; BOOL snap = false;
f32 body_angleX_min = mpHIO->m.common.body_angleX_min; f32 body_angleX_min = mpHIO->m.common.body_angleX_min;
@@ -520,7 +520,7 @@ bool daNpcAshB_c::setExpressionBtp(int i_idx) {
if (btpAnm == NULL) { if (btpAnm == NULL) {
return true; return true;
} }
if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) {
mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP;
if (i_idx == 0) { if (i_idx == 0) {
mAnmFlags |= ANM_FLAG_800; mAnmFlags |= ANM_FLAG_800;
@@ -568,7 +568,7 @@ void daNpcAshB_c::setMotionAnm(int i_idx, f32 i_morf) {
mMotionLoops = 0; mMotionLoops = 0;
} }
if (btkAnm && setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0, iVar4)) { if (btkAnm && setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0, iVar4)) {
mAnmFlags |= 0x12; mAnmFlags |= 0x12;
} }
} }
@@ -1010,14 +1010,14 @@ BOOL daNpcAshB_c::EvCut_Appear(int i_staffID) {
break; break;
case '0005': case '0005':
if (mMotionPhase > 1) { if (mMotionPhase > 1) {
mpMorf->getModel()->getModelData()->getMaterialNodePointer(4)->getShape()->hide(); mAnm_p->getModel()->getModelData()->getMaterialNodePointer(4)->getShape()->hide();
return TRUE; return TRUE;
} }
if (mMotionPhase == 1) { if (mMotionPhase == 1) {
setExpression(6, 0.0f); setExpression(6, 0.0f);
f32 subtract = mpMorf->getEndFrame() - 1.0f; f32 subtract = mAnm_p->getEndFrame() - 1.0f;
if (mpMorf->getFrame() > subtract) { if (mAnm_p->getFrame() > subtract) {
field_0xded = 1; field_0xded = 1;
} }
} }
@@ -1129,7 +1129,7 @@ void daNpcAshB_c::setAttnPos() {
lookat(); lookat();
cXyz vec(10.0f, 10.0f, 0.0f); cXyz vec(10.0f, 10.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(10)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(10));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&vec, &eyePos); mDoMtx_stack_c::multVec(&vec, &eyePos);
vec.x = 0.0f; vec.x = 0.0f;
@@ -1162,7 +1162,7 @@ void daNpcAshB_c::setAttnPos() {
/* 80961770-809617F8 003A10 0088+00 1/0 0/0 0/0 .text drawOtherMdls__11daNpcAshB_cFv */ /* 80961770-809617F8 003A10 0088+00 1/0 0/0 0/0 .text drawOtherMdls__11daNpcAshB_cFv */
void daNpcAshB_c::drawOtherMdls() { void daNpcAshB_c::drawOtherMdls() {
if (field_0xded != 0) { if (field_0xded != 0) {
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
MtxP src = model->getAnmMtx(24); MtxP src = model->getAnmMtx(24);
mDoMtx_stack_c::copy(src); mDoMtx_stack_c::copy(src);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
src/d/actor/d_a_npc_blue_ns.cpp
+23 -23
View File
@@ -65,7 +65,7 @@ daNpcBlueNS_c::~daNpcBlueNS_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -148,8 +148,8 @@ int daNpcBlueNS_c::Create() {
mTwilight = dKy_darkworld_check(); mTwilight = dKy_darkworld_check();
mpMorf->getModel()->getModelData(); mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeFar(this, 3.0f);
fopAcM_setCullSizeBox(this, -120.0f, -10.0f, -120.0f, 120.0f, 220.0f, 120.0f); fopAcM_setCullSizeBox(this, -120.0f, -10.0f, -120.0f, 120.0f, 220.0f, 120.0f);
@@ -188,17 +188,17 @@ int daNpcBlueNS_c::CreateHeap() {
J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 0x10); J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 0x10);
JUT_ASSERT(406, NULL != mdlData_p); JUT_ASSERT(406, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
J3DModel* mdl_p = mpMorf->getModel(); J3DModel* mdl_p = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -383,7 +383,7 @@ int daNpcBlueNS_c::Draw() {
return 1; return 1;
} }
J3DModel* mdl_p = mpMorf->getModel(); J3DModel* mdl_p = mAnm_p->getModel();
mdl_p->getModelData(); mdl_p->getModelData();
tevStr.TevColor.r = 0; tevStr.TevColor.r = 0;
@@ -395,12 +395,12 @@ int daNpcBlueNS_c::Draw() {
g_env_light.settingTevStruct(2, &current.pos, &tevStr); g_env_light.settingTevStruct(2, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mdl_p, &tevStr); g_env_light.setLightTevColorType_MAJI(mdl_p, &tevStr);
dComIfGd_setListDark(); dComIfGd_setListDark();
mpMorf->entryDL(); mAnm_p->entryDL();
dComIfGd_setList(); dComIfGd_setList();
} else { } else {
g_env_light.settingTevStruct(2, &current.pos, &tevStr); g_env_light.settingTevStruct(2, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mdl_p, &tevStr); g_env_light.setLightTevColorType_MAJI(mdl_p, &tevStr);
mpMorf->entryDL(); mAnm_p->entryDL();
} }
mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mdl_p, &current.pos, daNpcBlueNS_Param_c::m.common.real_shadow_size, 20.0f + tREG_F(3), current.pos.y, mGroundH, mGndChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mdl_p, &current.pos, daNpcBlueNS_Param_c::m.common.real_shadow_size, 20.0f + tREG_F(3), current.pos.y, mGroundH, mGndChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
@@ -414,13 +414,13 @@ int daNpcBlueNS_c::ctrlJoint(J3DJoint* param_0, J3DModel* i_model) {
int spC[] = {1, 3, 4}; int spC[] = {1, 3, 4};
if (jnt_no == 0) { if (jnt_no == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -616,7 +616,7 @@ void daNpcBlueNS_c::setAttnPos() {
cXyz sp20(10.0f, 15.0f, 0.0f); cXyz sp20(10.0f, 15.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&sp20, &eyePos); mDoMtx_stack_c::multVec(&sp20, &eyePos);
sp20.x = 0.0f; sp20.x = 0.0f;
@@ -628,7 +628,7 @@ void daNpcBlueNS_c::setAttnPos() {
attention_info.position.set(mHeadPos.x, mHeadPos.y + daNpcBlueNS_Param_c::m.common.attention_offset, mHeadPos.z); attention_info.position.set(mHeadPos.x, mHeadPos.y + daNpcBlueNS_Param_c::m.common.attention_offset, mHeadPos.z);
cXyz cyl_center; cXyz cyl_center;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&cyl_center); mDoMtx_stack_c::multVecZero(&cyl_center);
cyl_center.y = current.pos.y; cyl_center.y = current.pos.y;
@@ -782,7 +782,7 @@ void daNpcBlueNS_c::setLookMode(int i_lookMode) {
/* 8096A81C-8096A9FC 001F9C 01E0+00 1/1 0/0 0/0 .text lookat__13daNpcBlueNS_cFv */ /* 8096A81C-8096A9FC 001F9C 01E0+00 1/1 0/0 0/0 .text lookat__13daNpcBlueNS_cFv */
void daNpcBlueNS_c::lookat() { void daNpcBlueNS_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model_p = mpMorf->getModel(); J3DModel* model_p = mAnm_p->getModel();
int var_r28 = 0; int var_r28 = 0;
f32 body_angleX_min = daNpcBlueNS_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpcBlueNS_Param_c::m.common.body_angleX_min;
@@ -925,7 +925,7 @@ int daNpcBlueNS_c::down(int param_0) {
field_0xdc0 = 2; field_0xdc0 = 2;
break; break;
case 2: case 2:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
setAction(&daNpcBlueNS_c::wait); setAction(&daNpcBlueNS_c::wait);
} }
break; break;
@@ -1184,7 +1184,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi_CutMain(const int& i_cutId) {
} }
break; break;
case 20: case 20:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
ChgPtclDisp(); ChgPtclDisp();
rt = 1; rt = 1;
} }
@@ -1266,7 +1266,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu_CutMain(const int& i_cutId) {
} }
break; break;
case 20: case 20:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
ChgPtclDisp(); ChgPtclDisp();
rt = 1; rt = 1;
} }
@@ -1348,7 +1348,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo_CutMain(const int& i_cutId) {
} }
break; break;
case 20: case 20:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
ChgPtclDisp(); ChgPtclDisp();
rt = 1; rt = 1;
} }
@@ -1430,7 +1430,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo_CutMain(const int& i_cutId) {
} }
break; break;
case 20: case 20:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
ChgPtclDisp(); ChgPtclDisp();
rt = 1; rt = 1;
} }
src/d/actor/d_a_npc_bouS.cpp
+19 -19
View File
@@ -286,7 +286,7 @@ daNpcBouS_c::~daNpcBouS_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
#if DEBUG #if DEBUG
@@ -362,8 +362,8 @@ cPhs__Step daNpcBouS_c::Create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
@@ -400,17 +400,17 @@ int daNpcBouS_c::CreateHeap() {
JUT_ASSERT(393, NULL != mdlData_p); JUT_ASSERT(393, NULL != mdlData_p);
u32 i_differedDlistFlag = 0x11020284; u32 i_differedDlistFlag = 0x11020284;
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, i_differedDlistFlag); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, i_differedDlistFlag);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
mdl_p = mpMorf->getModel(); mdl_p = mAnm_p->getModel();
for (u16 i = 0; i <mdlData_p->getJointNum(); i++) { for (u16 i = 0; i <mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -448,7 +448,7 @@ int daNpcBouS_c::Draw() {
return 1; return 1;
} }
J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
mdlData_p->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); mdlData_p->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
draw(FALSE, FALSE, mHIO->m.common.real_shadow_size, NULL, FALSE); draw(FALSE, FALSE, mHIO->m.common.real_shadow_size, NULL, FALSE);
return 1; return 1;
@@ -460,11 +460,11 @@ int daNpcBouS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
if (jntNo == 0) { if (jntNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -496,8 +496,8 @@ int daNpcBouS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK)) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK)) {
J3DAnmTransform* anm = mBckAnm.getBckAnm(); J3DAnmTransform* anm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(anm); mAnm_p->changeAnm(anm);
} }
return 1; return 1;
@@ -600,7 +600,7 @@ bool daNpcBouS_c::setExpressionBtp(int i_idx) {
return true; return true;
} }
if (setBtpAnm(btp, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { if (setBtpAnm(btp, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) {
mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP;
if (i_idx == EXPR_BTP_BOU) { if (i_idx == EXPR_BTP_BOU) {
@@ -635,7 +635,7 @@ void daNpcBouS_c::setMotionAnm(int i_idx, f32 i_morf) {
mMotionLoops = 0; mMotionLoops = 0;
} }
if (btk != NULL && setBtkAnm(btk, mpMorf->getModel()->getModelData(), 1.0f, btkAttr)) { if (btk != NULL && setBtkAnm(btk, mAnm_p->getModel()->getModelData(), 1.0f, btkAttr)) {
mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK;
} }
} }
@@ -895,7 +895,7 @@ void daNpcBouS_c::setAttnPos() {
setMtx(); setMtx();
lookat(); lookat();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
eyeOffset.y = 0.0f; eyeOffset.y = 0.0f;
@@ -933,7 +933,7 @@ void daNpcBouS_c::setAttnPos() {
/* 809778D8-80977AB8 004478 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcBouS_cFv */ /* 809778D8-80977AB8 004478 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcBouS_cFv */
void daNpcBouS_c::lookat() { void daNpcBouS_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* mdl_p = mpMorf->getModel(); J3DModel* mdl_p = mAnm_p->getModel();
BOOL i_snap = FALSE; BOOL i_snap = FALSE;
f32 body_angleX_min = mHIO->m.common.body_angleX_min; f32 body_angleX_min = mHIO->m.common.body_angleX_min;
f32 body_angleX_max = mHIO->m.common.body_angleX_max; f32 body_angleX_max = mHIO->m.common.body_angleX_max;
src/d/actor/d_a_npc_chat.cpp
+31 -31
View File
@@ -2239,7 +2239,7 @@ daNpcChat_c::~daNpcChat_c() {
removeResrc(mType, mObjNum); removeResrc(mType, mObjNum);
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -2323,13 +2323,13 @@ BOOL daNpcChat_c::NpcCreate(int type) {
J3DAnmTexPattern* texAnmP = getTexAnmP(type); J3DAnmTexPattern* texAnmP = getTexAnmP(type);
u32 uVar1 = texAnmP != NULL ? 0x11020084 : 0x11000084; u32 uVar1 = texAnmP != NULL ? 0x11020084 : 0x11000084;
mpMorf = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); mAnm_p = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return FALSE; return FALSE;
} }
@@ -2367,14 +2367,14 @@ BOOL daNpcChat_c::NpcCreate(int type) {
}; };
cXyz i_scale(a_transScaleTbl[type]); cXyz i_scale(a_transScaleTbl[type]);
mpMorf->offTranslate(); mAnm_p->offTranslate();
mpMorf->setTranslateScale(i_scale); mAnm_p->setTranslateScale(i_scale);
J3DJointCallBack jointCallBack = a_mdlData_p->getJointNodePointer(0)->getCallBack(); J3DJointCallBack jointCallBack = a_mdlData_p->getJointNodePointer(0)->getCallBack();
uintptr_t userArea = mpMorf->getModel()->getUserArea(); uintptr_t userArea = mAnm_p->getModel()->getUserArea();
for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) {
a_mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); a_mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
mpMorf->getModel()->setUserArea((uintptr_t)this); mAnm_p->getModel()->setUserArea((uintptr_t)this);
if (!setExpressionBtp(type)) { if (!setExpressionBtp(type)) {
return FALSE; return FALSE;
@@ -2385,7 +2385,7 @@ BOOL daNpcChat_c::NpcCreate(int type) {
for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) {
a_mdlData_p->getJointNodePointer(i)->setCallBack(jointCallBack); a_mdlData_p->getJointNodePointer(i)->setCallBack(jointCallBack);
} }
mpMorf->getModel()->setUserArea(userArea); mAnm_p->getModel()->setUserArea(userArea);
return TRUE; return TRUE;
} }
@@ -2524,11 +2524,11 @@ J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) {
/* 80981108-80981140 0009A8 0038+00 5/5 0/0 0/0 .text isM___11daNpcChat_cFv */ /* 80981108-80981140 0009A8 0038+00 5/5 0/0 0/0 .text isM___11daNpcChat_cFv */
bool daNpcChat_c::isM_() { bool daNpcChat_c::isM_() {
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return mType < 16; return mType < 16;
} }
u16 a_jntNum = mpMorf->getModel()->getModelData()->getJointNum(); u16 a_jntNum = mAnm_p->getModel()->getModelData()->getJointNum();
JUT_ASSERT(738, (a_jntNum == JntM_NUM_e) || (a_jntNum == JntW_NUM_e)); JUT_ASSERT(738, (a_jntNum == JntM_NUM_e) || (a_jntNum == JntW_NUM_e));
return a_jntNum == JntM_NUM_e; return a_jntNum == JntM_NUM_e;
} }
@@ -2674,7 +2674,7 @@ BOOL daNpcChat_c::setAttention(int param_1) {
}; };
int jointNo = isM_() ? JNTM_HEAD : JNTW_HEAD; int jointNo = isM_() ? JNTM_HEAD : JNTW_HEAD;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo));
mDoMtx_stack_c::multVec(&a_eyeOfsTbl[param_1], &eyePos); mDoMtx_stack_c::multVec(&a_eyeOfsTbl[param_1], &eyePos);
mBaseAttnPos.set(current.pos.x, current.pos.y + AtnOfs(param_1), current.pos.z); mBaseAttnPos.set(current.pos.x, current.pos.y + AtnOfs(param_1), current.pos.z);
@@ -2756,8 +2756,8 @@ cPhs__Step daNpcChat_c::Create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -40.0f, -10.0f, -30.0f, 30.0f, 190.0f, 40.0f); fopAcM_setCullSizeBox(this, -40.0f, -10.0f, -30.0f, 30.0f, 190.0f, 40.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
mSound.setMdlType(mType, false, mTwilight & 0xFF); mSound.setMdlType(mType, false, mTwilight & 0xFF);
@@ -2807,14 +2807,14 @@ BOOL daNpcChat_c::CreateHeap() {
mObjModel = model; mObjModel = model;
rv = model != NULL; rv = model != NULL;
if (!rv) { if (!rv) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} else if (field_0xe51 == 1) { } else if (field_0xe51 == 1) {
model = ChairCreate(ObjScale(mType)); model = ChairCreate(ObjScale(mType));
mObjModel = model; mObjModel = model;
rv = model != NULL; rv = model != NULL;
if (!rv) { if (!rv) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} else { } else {
mObjModel = NULL; mObjModel = NULL;
@@ -2839,19 +2839,19 @@ int daNpcChat_c::Execute() {
return 1; return 1;
} }
J3DModelData* a_mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* a_mdlData_p = mAnm_p->getModel()->getModelData();
J3DJointCallBack callBack = a_mdlData_p->getJointNodePointer(0)->getCallBack(); J3DJointCallBack callBack = a_mdlData_p->getJointNodePointer(0)->getCallBack();
u32 userArea = mpMorf->getModel()->getUserArea(); u32 userArea = mAnm_p->getModel()->getUserArea();
for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) {
a_mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); a_mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
mpMorf->getModel()->setUserArea((uintptr_t)this); mAnm_p->getModel()->setUserArea((uintptr_t)this);
execute(); execute();
for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) {
a_mdlData_p->getJointNodePointer(i)->setCallBack(callBack); a_mdlData_p->getJointNodePointer(i)->setCallBack(callBack);
} }
mpMorf->getModel()->setUserArea(userArea); mAnm_p->getModel()->setUserArea(userArea);
return 1; return 1;
} }
@@ -2864,7 +2864,7 @@ int daNpcChat_c::Draw() {
/* 8098250C-80982780 001DAC 0274+00 1/1 0/0 0/0 .text draw__11daNpcChat_cFiifP11_GXColorS10i */ /* 8098250C-80982780 001DAC 0274+00 1/1 0/0 0/0 .text draw__11daNpcChat_cFiifP11_GXColorS10i */
int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) { int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
J3DModelData* a_mdlData_p = model->getModelData(); J3DModelData* a_mdlData_p = model->getModelData();
if (i_color != NULL) { if (i_color != NULL) {
@@ -2904,10 +2904,10 @@ int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_colo
if (mTwilight) { if (mTwilight) {
dComIfGd_setListDark(); dComIfGd_setListDark();
mpMorf->entryDL(); mAnm_p->entryDL();
dComIfGd_setList(); dComIfGd_setList();
} else { } else {
mpMorf->entryDL(); mAnm_p->entryDL();
} }
if ((mAnmFlags & ANM_PLAY_BTP) != 0) { if ((mAnmFlags & ANM_PLAY_BTP) != 0) {
@@ -3168,7 +3168,7 @@ void daNpcChat_c::setAttnPos() {
daNpcF_c::setMtx(); daNpcF_c::setMtx();
cXyz sp28(10.0f, 15.0f, 0.0f); cXyz sp28(10.0f, 15.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&sp28, &eyePos); mDoMtx_stack_c::multVec(&sp28, &eyePos);
sp28.x = 0.0f; sp28.x = 0.0f;
@@ -3187,7 +3187,7 @@ bool daNpcChat_c::setExpressionBtp(int i_index) {
return true; return true;
} }
J3DModelData* a_mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* a_mdlData_p = mAnm_p->getModel()->getModelData();
if (setBtpAnm(i_btp, a_mdlData_p, 1.0f, J3DFrameCtrl::EMode_LOOP)) { if (setBtpAnm(i_btp, a_mdlData_p, 1.0f, J3DFrameCtrl::EMode_LOOP)) {
mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP; mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP;
return true; return true;
@@ -3578,7 +3578,7 @@ void daNpcChat_c::drawOtherMdls() {
if (mObjModel != NULL && jntNo >= 0) { if (mObjModel != NULL && jntNo >= 0) {
if (!chkAction(&daNpcChat_c::fear)) { if (!chkAction(&daNpcChat_c::fear)) {
g_env_light.setLightTevColorType_MAJI(mObjModel, &tevStr); g_env_light.setLightTevColorType_MAJI(mObjModel, &tevStr);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jntNo)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jntNo));
mDoMtx_stack_c::scaleM(objScale, objScale, objScale); mDoMtx_stack_c::scaleM(objScale, objScale, objScale);
mObjModel->setBaseTRMtx(mDoMtx_stack_c::get()); mObjModel->setBaseTRMtx(mDoMtx_stack_c::get());
mDoExt_modelUpdateDL(mObjModel); mDoExt_modelUpdateDL(mObjModel);
@@ -3862,7 +3862,7 @@ void daNpcChat_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
} }
mExpressionMorf = 0.0f; mExpressionMorf = 0.0f;
mpMorf->setMorf(i_morf); mAnm_p->setMorf(i_morf);
} }
} }
@@ -4033,7 +4033,7 @@ bool daNpcChat_c::fear(void* param_1) {
case 2: case 2:
if (mMotionAnm == ANM_SURPRISE) { if (mMotionAnm == ANM_SURPRISE) {
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
setMotion(MOT_TO_WOLF, -1.0f, 0); setMotion(MOT_TO_WOLF, -1.0f, 0);
mPlayerAngleY = fopAcM_searchPlayerAngleY(this) + 0x8000; mPlayerAngleY = fopAcM_searchPlayerAngleY(this) + 0x8000;
} }
@@ -4043,7 +4043,7 @@ bool daNpcChat_c::fear(void* param_1) {
setAngle(shape_angle.y); setAngle(shape_angle.y);
} }
if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) {
mSound.playVoice(2); mSound.playVoice(2);
} }
} }
src/d/actor/d_a_npc_doorboy.cpp
+18 -18
View File
@@ -137,7 +137,7 @@ daNpcDoorBoy_c::~daNpcDoorBoy_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -198,7 +198,7 @@ cPhs__Step daNpcDoorBoy_c::Create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -50.0f, -10.0f, -50.0f, 50.0f, 210.0f, 50.0f); fopAcM_setCullSizeBox(this, -50.0f, -10.0f, -50.0f, 50.0f, 210.0f, 50.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
mSound.setMdlType(5, false, dKy_darkworld_check()); mSound.setMdlType(5, false, dKy_darkworld_check());
@@ -233,24 +233,24 @@ int daNpcDoorBoy_c::CreateHeap() {
JUT_ASSERT(292, NULL != mdlData_p); JUT_ASSERT(292, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
cXyz translateScale(1.0f, 1.0820773f, 1.0f); cXyz translateScale(1.0f, 1.0820773f, 1.0f);
mpMorf->offTranslate(); mAnm_p->offTranslate();
mpMorf->setTranslateScale(translateScale); mAnm_p->setTranslateScale(translateScale);
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
mpMorf->getModel()->setUserArea((uintptr_t)this); mAnm_p->getModel()->setUserArea((uintptr_t)this);
setMotion(MOT_WAIT_A, -1.0f, 0); setMotion(MOT_WAIT_A, -1.0f, 0);
@@ -282,11 +282,11 @@ int daNpcDoorBoy_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD}; int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD};
if (jointNo == JNT_CENTER) { if (jointNo == JNT_CENTER) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -367,7 +367,7 @@ void daNpcDoorBoy_c::reset() {
J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 7); J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 7);
mAnmFlags &= 0xFFFFF57F; mAnmFlags &= 0xFFFFF57F;
if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, 2)) { if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, 2)) {
mAnmFlags |= 0xA80; mAnmFlags |= 0xA80;
} }
@@ -430,7 +430,7 @@ inline void daNpcDoorBoy_c::playMotion() {
/* 809ACE18-809ACFF8 002278 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcDoorBoy_cFv */ /* 809ACE18-809ACFF8 002278 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcDoorBoy_cFv */
inline void daNpcDoorBoy_c::lookat() { inline void daNpcDoorBoy_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model_p = mpMorf->getModel(); J3DModel* model_p = mAnm_p->getModel();
int iVar1 = 0; int iVar1 = 0;
f32 body_angleX_min = daNpcDoorBoy_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpcDoorBoy_Param_c::m.common.body_angleX_min;
@@ -639,7 +639,7 @@ bool daNpcDoorBoy_c::fear(void* param_1) {
break; break;
case 2: case 2:
if (mpMorf->checkFrame(1.0f)) { if (mAnm_p->checkFrame(1.0f)) {
mSound.playVoice(2); mSound.playVoice(2);
} }
break; break;
@@ -851,7 +851,7 @@ void daNpcDoorBoy_c::setAttnPos() {
setMtx(); setMtx();
lookat(); lookat();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
cXyz sp1c(23.0f, 15.0f, 0.0f); cXyz sp1c(23.0f, 15.0f, 0.0f);
mDoMtx_stack_c::multVec(&sp1c, &eyePos); mDoMtx_stack_c::multVec(&sp1c, &eyePos);
@@ -863,7 +863,7 @@ void daNpcDoorBoy_c::setAttnPos() {
mDoMtx_stack_c::multVec(&attention_info.position, &attention_info.position); mDoMtx_stack_c::multVec(&attention_info.position, &attention_info.position);
cXyz sp28; cXyz sp28;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE));
mDoMtx_stack_c::multVecZero(&sp28); mDoMtx_stack_c::multVecZero(&sp28);
sp28.y = current.pos.y; sp28.y = current.pos.y;
src/d/actor/d_a_npc_gra.cpp
+73 -73
View File
@@ -367,7 +367,7 @@ daNpc_grA_c::~daNpc_grA_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
#if DEBUG #if DEBUG
@@ -410,9 +410,9 @@ BOOL daNpc_grA_c::create() {
if (!fopAcM_entrySolidHeap(this, &daNpc_grA_c::createHeapCallBack, 0x800045d0)) { if (!fopAcM_entrySolidHeap(this, &daNpc_grA_c::createHeapCallBack, 0x800045d0)) {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
unused = mpMorf->getModel()->getModelData(); unused = mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
mCreature.init(&current.pos, &eyePos, 3, 1); mCreature.init(&current.pos, &eyePos, 3, 1);
@@ -462,15 +462,15 @@ BOOL daNpc_grA_c::CreateHeap() {
} }
JUT_ASSERT(774, NULL != mdlData_p); JUT_ASSERT(774, NULL != mdlData_p);
int v = 0x11020284; int v = 0x11020284;
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, v); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, v);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return FALSE; return FALSE;
} }
mdlData2_p = mpMorf->getModel(); mdlData2_p = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -553,11 +553,11 @@ BOOL daNpc_grA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int jntNo = joint->getJntNo(); int jntNo = joint->getJntNo();
int arr[] = {1, 3, 4}; int arr[] = {1, 3, 4};
if (jntNo == 0) { if (jntNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -584,8 +584,8 @@ BOOL daNpc_grA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if (jntNo == 4 || jntNo == 7) { if (jntNo == 4 || jntNo == 7) {
if ((mAnmFlags & 0x100) != 0) { if ((mAnmFlags & 0x100) != 0) {
J3DAnmTransform* a = mBckAnm.getBckAnm(); J3DAnmTransform* a = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(a); mAnm_p->changeAnm(a);
} }
} }
return TRUE; return TRUE;
@@ -824,7 +824,7 @@ void daNpc_grA_c::setParam() {
/* 809C0038-809C0298 0017D8 0260+00 1/0 0/0 0/0 .text main__11daNpc_grA_cFv */ /* 809C0038-809C0298 0017D8 0260+00 1/0 0/0 0/0 .text main__11daNpc_grA_cFv */
BOOL daNpc_grA_c::main() { BOOL daNpc_grA_c::main() {
int a = 0xffff; int a = 0xffff;
JUT_ASSERT(1367, mpMorf != NULL); // TODO: update "mpMorf" to "mAnm_p" JUT_ASSERT(1367, mAnm_p != NULL); // TODO: update "mAnm_p" to "mAnm_p"
if (doEvent() == 0) { if (doEvent() == 0) {
if (hitChk2(&field_0xC98, TRUE, FALSE)) { if (hitChk2(&field_0xC98, TRUE, FALSE)) {
setDamage(GET_HIO(mNpcFParams.damage_time), 0x17, 0); setDamage(GET_HIO(mNpcFParams.damage_time), 0x17, 0);
@@ -868,7 +868,7 @@ BOOL daNpc_grA_c::main() {
} }
playExpression(); playExpression();
playMotion(); playMotion();
JUT_ASSERT(1487, mpMorf != NULL); // TODO: update "mpMorf" to "mAnm_p" JUT_ASSERT(1487, mAnm_p != NULL);
return TRUE; return TRUE;
} }
@@ -902,14 +902,14 @@ void daNpc_grA_c::setAttnPos() {
mLookatAngle[i].setall(0); mLookatAngle[i].setall(0);
} }
} }
J3DModelData* modelData = mpMorf->getModel()->getModelData(); J3DModelData* modelData = mAnm_p->getModel()->getModelData();
for (u16 i = 0; i < modelData->getJointNum(); i++) { for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(&daNpc_grA_c::ctrlJointCallBack); modelData->getJointNodePointer(i)->setCallBack(&daNpc_grA_c::ctrlJointCallBack);
} }
setMtx(); setMtx();
setOtherObjMtx(); setOtherObjMtx();
lookat(); lookat();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
mDoMtx_stack_c::multVec(&eyeOffset, &offset); mDoMtx_stack_c::multVec(&eyeOffset, &offset);
@@ -1133,7 +1133,7 @@ bool daNpc_grA_c::setExpressionBtp(int i_expression) {
if (bck == NULL) { if (bck == NULL) {
return true; return true;
} }
if (setBtpAnm(bck, mpMorf->getModel()->getModelData(), 1.0f, attr)) { if (setBtpAnm(bck, mAnm_p->getModel()->getModelData(), 1.0f, attr)) {
mAnmFlags |= 0x280; mAnmFlags |= 0x280;
if (i_expression == 0) { if (i_expression == 0) {
mAnmFlags |= 0x800; mAnmFlags |= 0x800;
@@ -1228,7 +1228,7 @@ void daNpc_grA_c::setMotionAnm(int i_motion, f32 i_morf) {
if (l_btkGetParamList[btkIndex][0] >= 0) { if (l_btkGetParamList[btkIndex][0] >= 0) {
btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[btkIndex][1]], l_btkGetParamList[btkIndex][0]); btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[btkIndex][1]], l_btkGetParamList[btkIndex][0]);
} }
if (btk != NULL && setBtkAnm(btk, mpMorf->getModel()->getModelData(), 1.0f, attr)) { if (btk != NULL && setBtkAnm(btk, mAnm_p->getModel()->getModelData(), 1.0f, attr)) {
mAnmFlags |= 0x12; mAnmFlags |= 0x12;
} }
if (bck != NULL && setMcaMorfAnm(bck, 1.0f, i_morf, attr2, 0, -1)) { if (bck != NULL && setMcaMorfAnm(bck, 1.0f, i_morf, attr2, 0, -1)) {
@@ -1312,7 +1312,7 @@ void daNpc_grA_c::drawOtherMdls() {
case 8: case 8:
case 9: case 9:
case 10: case 10:
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(17)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(17));
mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::scaleM(scale);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
J3DModelData* data = mpModel->getModelData(); J3DModelData* data = mpModel->getModelData();
@@ -1995,7 +1995,7 @@ void daNpc_grA_c::setLookMode(int i_lookMode) {
/* 809C3094-809C3424 004834 0390+00 1/1 0/0 0/0 .text lookat__11daNpc_grA_cFv */ /* 809C3094-809C3424 004834 0390+00 1/1 0/0 0/0 .text lookat__11daNpc_grA_cFv */
void daNpc_grA_c::lookat() { void daNpc_grA_c::lookat() {
fopAc_ac_c* player = NULL; fopAc_ac_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL r27 = FALSE; BOOL r27 = FALSE;
f32 bodyAngleXMin = GET_HIO(mNpcFParams.body_angleX_min); f32 bodyAngleXMin = GET_HIO(mNpcFParams.body_angleX_min);
f32 bodyAngleXMax = GET_HIO(mNpcFParams.body_angleX_max); f32 bodyAngleXMax = GET_HIO(mNpcFParams.body_angleX_max);
@@ -2050,12 +2050,12 @@ void daNpc_grA_c::lookat() {
mNpcfLookAt.setAttnPos(&mLookPos); mNpcfLookAt.setAttnPos(&mLookPos);
} else if (mLookMode == 7) { } else if (mLookMode == 7) {
cXyz f(0.0f, 0.0f, 300.0f); cXyz f(0.0f, 0.0f, 300.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVec(&f, &mLookPos); mDoMtx_stack_c::multVec(&f, &mLookPos);
mNpcfLookAt.setAttnPos(&mLookPos); mNpcfLookAt.setAttnPos(&mLookPos);
} else if (mLookMode == 8) { } else if (mLookMode == 8) {
cXyz f(0.0f, 0.0f, -300.0f); cXyz f(0.0f, 0.0f, -300.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVec(&f, &mLookPos); mDoMtx_stack_c::multVec(&f, &mLookPos);
mNpcfLookAt.setAttnPos(&mLookPos); mNpcfLookAt.setAttnPos(&mLookPos);
} else { } else {
@@ -2221,7 +2221,7 @@ void daNpc_grA_c::setOtherObjMtx() {
switch (mType) { switch (mType) {
case 7: case 7:
cXyz pos = current.pos; cXyz pos = current.pos;
pos.y += l_offsetHeight[(u32)mpMorf->getFrame() % 0x1f]; // maybe meant to be & 0x1f pos.y += l_offsetHeight[(u32)mAnm_p->getFrame() % 0x1f]; // maybe meant to be & 0x1f
mDoMtx_stack_c::transS(pos); mDoMtx_stack_c::transS(pos);
mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::ZXYrotM(mCurAngle);
mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::scaleM(scale);
@@ -2353,9 +2353,9 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) {
} break; } break;
case 0x1e: case 0x1e:
if (field_0x14D8 == 0x1b) { if (field_0x14D8 == 0x1b) {
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
r28 = 1; r28 = 1;
} else if (mpMorf->checkFrame(14.0f)) { } else if (mAnm_p->checkFrame(14.0f)) {
cXyz c(0.0f, 0.0f, 20.0f); cXyz c(0.0f, 0.0f, 20.0f);
mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(mCurAngle.y); mDoMtx_stack_c::YrotM(mCurAngle.y);
@@ -2367,22 +2367,22 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) {
break; break;
case 0x28: case 0x28:
if (field_0x14D8 == 0x1a) { if (field_0x14D8 == 0x1a) {
mpMorf->setEndFrame(29.0f); mAnm_p->setEndFrame(29.0f);
if (field_0x14D4 < 3.0f) { if (field_0x14D4 < 3.0f) {
field_0x14D4 += 0.2f; field_0x14D4 += 0.2f;
} }
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
speedF = 0.0f; speedF = 0.0f;
} }
r28 = 1; r28 = 1;
break; break;
case 0x2d: case 0x2d:
if (field_0x14D8 == 0x1a) { if (field_0x14D8 == 0x1a) {
mpMorf->setEndFrame(29.0f); mAnm_p->setEndFrame(29.0f);
if (field_0x14D4 < 3.0f) { if (field_0x14D4 < 3.0f) {
field_0x14D4 += 0.2f; field_0x14D4 += 0.2f;
} }
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
speedF = field_0x14D4 * GET_HIO(mRotationalSpeed); speedF = field_0x14D4 * GET_HIO(mRotationalSpeed);
} }
r28 = 1; r28 = 1;
@@ -2391,23 +2391,23 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) {
if (field_0x14D8 == 0x1a) { if (field_0x14D8 == 0x1a) {
if (field_0x14D4 > 1.0f) { if (field_0x14D4 > 1.0f) {
field_0x14D4 -= 0.25f; field_0x14D4 -= 0.25f;
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
speedF = field_0x14D4 * GET_HIO(mRotationalSpeed); speedF = field_0x14D4 * GET_HIO(mRotationalSpeed);
} else { } else {
if (mpMorf->getFrame() >= 0.0f && mpMorf->getFrame() <= 5.0f) { if (mAnm_p->getFrame() >= 0.0f && mAnm_p->getFrame() <= 5.0f) {
setMotion(0x14, -1.0f, 0); setMotion(0x14, -1.0f, 0);
field_0x14D4 = 0.0f; field_0x14D4 = 0.0f;
} }
speedF = 0.0f; speedF = 0.0f;
} }
} else if (field_0x14D8 == 0x19) { } else if (field_0x14D8 == 0x19) {
if (mpMorf->checkFrame(12.0f)) { if (mAnm_p->checkFrame(12.0f)) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x1a)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x1a));
mDoMtx_stack_c::multVecZero(&mParticleManager[1].mPos); mDoMtx_stack_c::multVecZero(&mParticleManager[1].mPos);
mParticleManager[1].mPos.y = current.pos.y; mParticleManager[1].mPos.y = current.pos.y;
mParticleManager[1].mAngle = mCurAngle; mParticleManager[1].mAngle = mCurAngle;
mParticleManager[1].field_0x0 = 1; mParticleManager[1].field_0x0 = 1;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x17)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x17));
mDoMtx_stack_c::multVecZero(&mParticleManager[2].mPos); mDoMtx_stack_c::multVecZero(&mParticleManager[2].mPos);
mParticleManager[2].mPos.y = current.pos.y; mParticleManager[2].mPos.y = current.pos.y;
mParticleManager[2].mAngle = mCurAngle; mParticleManager[2].mAngle = mCurAngle;
@@ -2441,8 +2441,8 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) {
if (field_0x14D8 == 0x16 && fopAcM_searchPlayerAngleY(this) == mCurAngle.y) { if (field_0x14D8 == 0x16 && fopAcM_searchPlayerAngleY(this) == mCurAngle.y) {
r28 = 1; r28 = 1;
} }
if (field_0x14D8 == 0x1f && mpMorf->getFrame() >= 10.0f && if (field_0x14D8 == 0x1f && mAnm_p->getFrame() >= 10.0f &&
mpMorf->getFrame() < 11.0f) mAnm_p->getFrame() < 11.0f)
{ {
mCreature.startCreatureVoice(Z2SE_GORON_V_SMR_REPLY, -1); mCreature.startCreatureVoice(Z2SE_GORON_V_SMR_REPLY, -1);
} }
@@ -2507,7 +2507,7 @@ BOOL daNpc_grA_c::ECut_grDSGate(int i_staffID) {
if (mMotion != 5) { if (mMotion != 5) {
if (field_0x14D8 != 0x17) { if (field_0x14D8 != 0x17) {
cLib_chasePosXZ(&current.pos, field_0x148C, 30.f / 11.f); cLib_chasePosXZ(&current.pos, field_0x148C, 30.f / 11.f);
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
setMotion(5, -1.0f, 0); setMotion(5, -1.0f, 0);
home.pos = field_0x148C; home.pos = field_0x148C;
home.angle = field_0x1498; home.angle = field_0x1498;
@@ -2606,7 +2606,7 @@ BOOL daNpc_grA_c::ECut_teachElevator(int i_staffID) {
if (mMotion != 5) { if (mMotion != 5) {
if (field_0x14D8 != 0x17) { if (field_0x14D8 != 0x17) {
cLib_chasePosXZ(&current.pos, field_0x148C, 30.0f / 11.0f); cLib_chasePosXZ(&current.pos, field_0x148C, 30.0f / 11.0f);
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
setMotion(5, -1.0f, 0); setMotion(5, -1.0f, 0);
home.pos = field_0x148C; home.pos = field_0x148C;
home.angle = field_0x1498; home.angle = field_0x1498;
@@ -2656,7 +2656,7 @@ BOOL daNpc_grA_c::ECut_kickOut(int i_staffID) {
setExpression(0x17, -1.0f); setExpression(0x17, -1.0f);
setMotion(1, -1.0f, 0); setMotion(1, -1.0f, 0);
speedF = GET_HIO(mWalkingSpeed); speedF = GET_HIO(mWalkingSpeed);
mpMorf->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed)); mAnm_p->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed));
break; break;
case 0x1e: case 0x1e:
Z2GetAudioMgr()->seStart(0x600b2, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); Z2GetAudioMgr()->seStart(0x600b2, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -2680,7 +2680,7 @@ BOOL daNpc_grA_c::ECut_kickOut(int i_staffID) {
break; break;
case 0x14: case 0x14:
speedF = GET_HIO(mWalkingSpeed); speedF = GET_HIO(mWalkingSpeed);
mpMorf->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed)); mAnm_p->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed));
r28 = 1; r28 = 1;
break; break;
case 0x1e: case 0x1e:
@@ -2799,13 +2799,13 @@ BOOL daNpc_grA_c::ECut_rescueRock(int i_staffID) {
} }
} else { } else {
cLib_chaseF(&field_0x14D4, 1.0f, 0.03f); cLib_chaseF(&field_0x14D4, 1.0f, 0.03f);
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
mpMorf->setEndFrame(27.0f); mAnm_p->setEndFrame(27.0f);
} }
break; break;
case 0xa: case 0xa:
if (field_0x14D8 == 0x19) { if (field_0x14D8 == 0x19) {
if (mpMorf->getFrame() >= 8.0f) { if (mAnm_p->getFrame() >= 8.0f) {
setExpression(0x17, -1.0f); setExpression(0x17, -1.0f);
setMotion(0x1c, -1.0f, 0); setMotion(0x1c, -1.0f, 0);
} }
@@ -2818,13 +2818,13 @@ BOOL daNpc_grA_c::ECut_rescueRock(int i_staffID) {
r28 = 1; r28 = 1;
} }
if (mAcch.ChkGroundLanding()) { if (mAcch.ChkGroundLanding()) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x1a)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x1a));
mDoMtx_stack_c::multVecZero(&mParticleManager[1].mPos); mDoMtx_stack_c::multVecZero(&mParticleManager[1].mPos);
mParticleManager[1].mPos.y = current.pos.y; mParticleManager[1].mPos.y = current.pos.y;
mParticleManager[1].mAngle = mCurAngle; mParticleManager[1].mAngle = mCurAngle;
mParticleManager[1].field_0x0 = 1; mParticleManager[1].field_0x0 = 1;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x17)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x17));
mDoMtx_stack_c::multVecZero(&mParticleManager[2].mPos); mDoMtx_stack_c::multVecZero(&mParticleManager[2].mPos);
mParticleManager[2].mPos.y = current.pos.y; mParticleManager[2].mPos.y = current.pos.y;
mParticleManager[2].mAngle = mCurAngle; mParticleManager[2].mAngle = mCurAngle;
@@ -2867,7 +2867,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
setMotion(0x19, -1.0f, 0); setMotion(0x19, -1.0f, 0);
setLookMode(0); setLookMode(0);
cXyz c; cXyz c;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&c); mDoMtx_stack_c::multVecZero(&c);
} break; } break;
case 0xa: case 0xa:
@@ -2901,7 +2901,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
break; break;
case 0x3c: case 0x3c:
field_0x14D4 = 0.0f; field_0x14D4 = 0.0f;
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
mEventTimer = 0x12c; mEventTimer = 0x12c;
break; break;
case 0x41: case 0x41:
@@ -2930,12 +2930,12 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
switch (sp30) { switch (sp30) {
case 0: case 0:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
r28 = 1; r28 = 1;
} else { } else {
JPABaseEmitter* sp28 = 0; JPABaseEmitter* sp28 = 0;
cXyz c; cXyz c;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&c); mDoMtx_stack_c::multVecZero(&c);
field_0x151C = dComIfGp_particle_set(field_0x151C, 0x2a3, &c, &tevStr, &current.angle, NULL, 0xff, field_0x151C = dComIfGp_particle_set(field_0x151C, 0x2a3, &c, &tevStr, &current.angle, NULL, 0xff,
NULL, -1, NULL, NULL, NULL); NULL, -1, NULL, NULL, NULL);
@@ -2984,11 +2984,11 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
break; break;
case 0x32: case 0x32:
if (field_0x14D8 == 0x1b) { if (field_0x14D8 == 0x1b) {
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
r28 = 1; r28 = 1;
setMotion(0x13, -1.0f, 0); setMotion(0x13, -1.0f, 0);
mCreature.startCreatureVoice(Z2SE_GRA_V_ROLLING, -1); mCreature.startCreatureVoice(Z2SE_GRA_V_ROLLING, -1);
} else if (mpMorf->checkFrame(14.0f)) { } else if (mAnm_p->checkFrame(14.0f)) {
cXyz c(0.0f, 0.0f, 20.0f); cXyz c(0.0f, 0.0f, 20.0f);
mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(mCurAngle.y); mDoMtx_stack_c::YrotM(mCurAngle.y);
@@ -2997,8 +2997,8 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
mParticleManager[0].field_0x0 = 1; mParticleManager[0].field_0x0 = 1;
} }
} else if (field_0x14D8 == 0x1a) { } else if (field_0x14D8 == 0x1a) {
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
mpMorf->setEndFrame(29.0f); mAnm_p->setEndFrame(29.0f);
r28 = 1; r28 = 1;
} }
break; break;
@@ -3012,7 +3012,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
setAngle(mCurAngle.y); setAngle(mCurAngle.y);
} }
cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f); cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f);
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
speedF = field_0x14D4 * 10.0f; speedF = field_0x14D4 * 10.0f;
} }
if (!cLib_calcTimer(&mEventTimer)) { if (!cLib_calcTimer(&mEventTimer)) {
@@ -3031,7 +3031,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
} }
if ((field_0x14D8 == 0x1a && field_0x14D4 >= 1.0f) || if ((field_0x14D8 == 0x1a && field_0x14D4 >= 1.0f) ||
field_0x14D8 == 0x28 && mpMorf->getFrame() >= 18.0f && mpMorf->getFrame() <= 20.0f) field_0x14D8 == 0x28 && mAnm_p->getFrame() >= 18.0f && mAnm_p->getFrame() <= 20.0f)
{ {
setRollPrtcl(current.pos, 1.0f); setRollPrtcl(current.pos, 1.0f);
if (field_0x14D8 == 0x1a) { if (field_0x14D8 == 0x1a) {
@@ -3085,7 +3085,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWaterFailure(int i_staffID) {
if (mMotion == 8) { if (mMotion == 8) {
if (mMotionPhase > 0) { if (mMotionPhase > 0) {
r28 = 1; r28 = 1;
} else if (mpMorf->checkFrame(21.0f)) { } else if (mAnm_p->checkFrame(21.0f)) {
cXyz c(0.0f, 0.0f, -150.0f); cXyz c(0.0f, 0.0f, -150.0f);
mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(mCurAngle.y); mDoMtx_stack_c::YrotM(mCurAngle.y);
@@ -3171,14 +3171,14 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) {
if (field_0x14D8 == 0x29) { if (field_0x14D8 == 0x29) {
r28 = 1; r28 = 1;
} else { } else {
if (mpMorf->getFrame() >= 79.0f) { if (mAnm_p->getFrame() >= 79.0f) {
field_0x150C = 0; field_0x150C = 0;
} else if (mpMorf->getFrame() >= 7.0f) { } else if (mAnm_p->getFrame() >= 7.0f) {
field_0x150C = 1; field_0x150C = 1;
} else { } else {
field_0x150C = 0; field_0x150C = 0;
} }
if (mpMorf->getFrame() >= 93.0f && mpMorf->getFrame() < 94.0f) { if (mAnm_p->getFrame() >= 93.0f && mAnm_p->getFrame() < 94.0f) {
mCreature.startCreatureVoice(Z2SE_GRA_V_SPAWATER_SHOUT, -1); mCreature.startCreatureVoice(Z2SE_GRA_V_SPAWATER_SHOUT, -1);
} }
} }
@@ -3200,9 +3200,9 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) {
break; break;
case 0x28: case 0x28:
if (field_0x14D8 == 0x1b) { if (field_0x14D8 == 0x1b) {
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
setMotion(0x13, -1.0f, 0); setMotion(0x13, -1.0f, 0);
} else if (mpMorf->checkFrame(14.0f)) { } else if (mAnm_p->checkFrame(14.0f)) {
cXyz c(0.0f, 0.0f, 20.0f); cXyz c(0.0f, 0.0f, 20.0f);
mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(mCurAngle.y); mDoMtx_stack_c::YrotM(mCurAngle.y);
@@ -3211,15 +3211,15 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) {
mParticleManager[0].field_0x0 = 1; mParticleManager[0].field_0x0 = 1;
} }
} else if (field_0x14D8 == 0x1a) { } else if (field_0x14D8 == 0x1a) {
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
mpMorf->setEndFrame(29.0f); mAnm_p->setEndFrame(29.0f);
r28 = 1; r28 = 1;
field_0x14D4 = 0.0f; field_0x14D4 = 0.0f;
} }
break; break;
case 0x32: case 0x32:
cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f); cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f);
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
speedF = field_0x14D4 * 10.0f; speedF = field_0x14D4 * 10.0f;
if (mAcch.ChkWallHit()) { if (mAcch.ChkWallHit()) {
r28 = 1; r28 = 1;
@@ -3227,7 +3227,7 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) {
break; break;
case 0x3c: case 0x3c:
cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f); cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f);
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
if (!cLib_calcTimer(&mEventTimer)) { if (!cLib_calcTimer(&mEventTimer)) {
r28 = 1; r28 = 1;
} }
@@ -3511,7 +3511,7 @@ BOOL daNpc_grA_c::waitGate(void*) {
cLib_chaseAngleS(&current.angle.y, home.angle.y, 0x400); cLib_chaseAngleS(&current.angle.y, home.angle.y, 0x400);
setAngle(current.angle.y); setAngle(current.angle.y);
cLib_chasePosXZ(&current.pos, field_0x148C, 30.f / 11.f); cLib_chasePosXZ(&current.pos, field_0x148C, 30.f / 11.f);
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
field_0x14D1 = 1; field_0x14D1 = 1;
setMotion(5, -1.0f, 0); setMotion(5, -1.0f, 0);
home.pos = field_0x148C; home.pos = field_0x148C;
@@ -3592,7 +3592,7 @@ BOOL daNpc_grA_c::waitKickOut(void*) {
} else { } else {
s16 r27 = cLib_targetAngleY(&current.pos, &c); s16 r27 = cLib_targetAngleY(&current.pos, &c);
speedF = 5.0f; speedF = 5.0f;
mpMorf->setPlaySpeed(speedF * GET_HIO(mWalkingAnimationSpeed)); mAnm_p->setPlaySpeed(speedF * GET_HIO(mWalkingAnimationSpeed));
cLib_addCalcAngleS2(&current.angle.y, r27, GET_HIO(mWalkingRotationDivisions), cLib_addCalcAngleS2(&current.angle.y, r27, GET_HIO(mWalkingRotationDivisions),
GET_HIO(mWalkingRotationSpeed)); GET_HIO(mWalkingRotationSpeed));
setAngle(current.angle.y); setAngle(current.angle.y);
@@ -3951,8 +3951,8 @@ BOOL daNpc_grA_c::crashRoll(void*) {
field_0x1486 = 2; field_0x1486 = 2;
} }
field_0x14D4 = 5.0f; field_0x14D4 = 5.0f;
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
mpMorf->setEndFrame(29.0f); mAnm_p->setEndFrame(29.0f);
if (field_0x14D8 == 0x1a) { if (field_0x14D8 == 0x1a) {
if (field_0x14D4 >= 1.0f) { if (field_0x14D4 >= 1.0f) {
setRollPrtcl(current.pos, 1.0f); setRollPrtcl(current.pos, 1.0f);
@@ -3981,8 +3981,8 @@ BOOL daNpc_grA_c::crashRollWait(void*) {
// fallthrough // fallthrough
case 2: case 2:
field_0x14D4 = 5.0f; field_0x14D4 = 5.0f;
mpMorf->setPlaySpeed(field_0x14D4); mAnm_p->setPlaySpeed(field_0x14D4);
mpMorf->setEndFrame(29.0f); mAnm_p->setEndFrame(29.0f);
if (field_0x14D8 == 0x1a) { if (field_0x14D8 == 0x1a) {
if (field_0x14D4 >= 1.0f) { if (field_0x14D4 >= 1.0f) {
cXyz c(0.0f, 0.0f, 0.0f); cXyz c(0.0f, 0.0f, 0.0f);
src/d/actor/d_a_npc_grc.cpp
+19 -19
View File
@@ -257,7 +257,7 @@ daNpc_grC_c::~daNpc_grC_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -334,7 +334,7 @@ cPhs__Step daNpc_grC_c::create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
@@ -377,17 +377,17 @@ int daNpc_grC_c::CreateHeap() {
JUT_ASSERT(452, NULL != mdlData_p); JUT_ASSERT(452, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -426,11 +426,11 @@ int daNpc_grC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
if (jntNo == 0) { if (jntNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -457,8 +457,8 @@ int daNpc_grC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) {
J3DAnmTransform* anm = mBckAnm.getBckAnm(); J3DAnmTransform* anm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(anm); mAnm_p->changeAnm(anm);
} }
return 1; return 1;
@@ -578,7 +578,7 @@ void daNpc_grC_c::setAttnPos() {
} }
} }
J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -587,7 +587,7 @@ void daNpc_grC_c::setAttnPos() {
lookat(); lookat();
setPrtcl(); setPrtcl();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
mDoMtx_stack_c::multVec(&eyeOffset, &sp94); mDoMtx_stack_c::multVec(&eyeOffset, &sp94);
@@ -623,7 +623,7 @@ void daNpc_grC_c::setAttnPos() {
} }
mCyl.SetCoSPrm(0x79); mCyl.SetCoSPrm(0x79);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&sp7c); mDoMtx_stack_c::multVecZero(&sp7c);
sp7c.y = current.pos.y; sp7c.y = current.pos.y;
mCyl.SetC(sp7c); mCyl.SetC(sp7c);
@@ -756,7 +756,7 @@ bool daNpc_grC_c::setExpressionBtp(int i_idx) {
return true; return true;
} }
if (setBtpAnm(anm, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { if (setBtpAnm(anm, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) {
mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP;
if (i_idx == EXPR_BTP_GRC_A) { if (i_idx == EXPR_BTP_GRC_A) {
@@ -828,7 +828,7 @@ void daNpc_grC_c::setMotionAnm(int i_idx, f32 i_morf) {
i_btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].fileIdx); i_btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].fileIdx);
} }
if (i_btk != NULL && setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { if (i_btk != NULL && setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) {
mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK;
} }
@@ -1190,7 +1190,7 @@ void daNpc_grC_c::setLookMode(int i_lookMode) {
/* 809CDD74-809CDFFC 002994 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grC_cFv */ /* 809CDD74-809CDFFC 002994 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grC_cFv */
void daNpc_grC_c::lookat() { void daNpc_grC_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL i_snap = FALSE; BOOL i_snap = FALSE;
f32 body_angleX_min = daNpc_grC_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpc_grC_Param_c::m.common.body_angleX_min;
f32 body_angleX_max = daNpc_grC_Param_c::m.common.body_angleX_max; f32 body_angleX_max = daNpc_grC_Param_c::m.common.body_angleX_max;
src/d/actor/d_a_npc_grr.cpp
+19 -19
View File
@@ -229,7 +229,7 @@ daNpc_grR_c::~daNpc_grR_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
#ifdef DEBUG #ifdef DEBUG
@@ -314,8 +314,8 @@ cPhs__Step daNpc_grR_c::create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
@@ -351,17 +351,17 @@ int daNpc_grR_c::CreateHeap() {
JUT_ASSERT(458, NULL != mdlData_p); JUT_ASSERT(458, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -394,7 +394,7 @@ int daNpc_grR_c::Execute() {
/* 809E0450-809E04E0 000C70 0090+00 1/1 0/0 0/0 .text Draw__11daNpc_grR_cFv */ /* 809E0450-809E04E0 000C70 0090+00 1/1 0/0 0/0 .text Draw__11daNpc_grR_cFv */
int daNpc_grR_c::Draw() { int daNpc_grR_c::Draw() {
mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
return draw(chkAction(&daNpc_grR_c::test), FALSE, daNpc_grR_Param_c::m.common.real_shadow_size, NULL, FALSE); return draw(chkAction(&daNpc_grR_c::test), FALSE, daNpc_grR_Param_c::m.common.real_shadow_size, NULL, FALSE);
} }
@@ -404,11 +404,11 @@ int daNpc_grR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int i_jointList[3] = {1, 3, 4}; int i_jointList[3] = {1, 3, 4};
if (jntNo == 0) { if (jntNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -435,8 +435,8 @@ int daNpc_grR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jntNo == 4 || jntNo == 7) && (mAnmFlags & ANM_PLAY_BCK) != 0) { if ((jntNo == 4 || jntNo == 7) && (mAnmFlags & ANM_PLAY_BCK) != 0) {
J3DAnmTransform* anm = mBckAnm.getBckAnm(); J3DAnmTransform* anm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(anm); mAnm_p->changeAnm(anm);
} }
return 1; return 1;
@@ -589,7 +589,7 @@ void daNpc_grR_c::setAttnPos() {
setMtx(); setMtx();
lookat(); lookat();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
eyeOffset.x = 0.0f; eyeOffset.x = 0.0f;
@@ -748,7 +748,7 @@ bool daNpc_grR_c::setExpressionBtp(int i_idx) {
return true; return true;
} }
if (setBtpAnm(anm, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { if (setBtpAnm(anm, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) {
mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP;
if (i_idx == 0) { if (i_idx == 0) {
@@ -814,7 +814,7 @@ void daNpc_grR_c::setMotionAnm(int i_idx, f32 i_morf) {
i_btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].fileIdx); i_btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].fileIdx);
} }
if (i_btk != NULL && setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { if (i_btk != NULL && setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) {
mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK;
} }
@@ -1171,7 +1171,7 @@ void daNpc_grR_c::setLookMode(int i_lookMode) {
/* 809E24A4-809E272C 002CC4 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grR_cFv */ /* 809E24A4-809E272C 002CC4 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grR_cFv */
void daNpc_grR_c::lookat() { void daNpc_grR_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL i_snap = FALSE; BOOL i_snap = FALSE;
f32 body_angleX_min = daNpc_grR_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpc_grR_Param_c::m.common.body_angleX_min;
f32 body_angleX_max = daNpc_grR_Param_c::m.common.body_angleX_max; f32 body_angleX_max = daNpc_grR_Param_c::m.common.body_angleX_max;
src/d/actor/d_a_npc_grz.cpp
+38 -38
View File
@@ -399,7 +399,7 @@ daNpc_Grz_c::~daNpc_Grz_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -486,7 +486,7 @@ cPhs__Step daNpc_Grz_c::create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
@@ -521,17 +521,17 @@ int daNpc_Grz_c::CreateHeap() {
JUT_ASSERT(556, NULL != mdlData_p); JUT_ASSERT(556, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -565,8 +565,8 @@ int daNpc_Grz_c::Execute() {
/* 809E9324-809E9568 001004 0244+00 1/1 0/0 0/0 .text Draw__11daNpc_Grz_cFv */ /* 809E9324-809E9568 001004 0244+00 1/1 0/0 0/0 .text Draw__11daNpc_Grz_cFv */
int daNpc_Grz_c::Draw() { int daNpc_Grz_c::Draw() {
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
if (checkHide()) { if (checkHide()) {
return 1; return 1;
@@ -601,7 +601,7 @@ int daNpc_Grz_c::Draw() {
mBrkAnm.entry(mdlData_p); mBrkAnm.entry(mdlData_p);
} }
mpMorf->entryDL(); mAnm_p->entryDL();
if ((mAnmFlags & ANM_PLAY_BTP) != 0) { if ((mAnmFlags & ANM_PLAY_BTP) != 0) {
mBtpAnm.remove(mdlData_p); mBtpAnm.remove(mdlData_p);
@@ -630,11 +630,11 @@ int daNpc_Grz_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
if (jntNo == JNT_CENTER) { if (jntNo == JNT_CENTER) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -661,8 +661,8 @@ int daNpc_Grz_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) {
J3DAnmTransform* anm = mBckAnm.getBckAnm(); J3DAnmTransform* anm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(anm); mAnm_p->changeAnm(anm);
} }
return 1; return 1;
@@ -813,7 +813,7 @@ void daNpc_Grz_c::setAttnPos() {
setMtx(); setMtx();
lookat(); lookat();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
eyeOffset.x = 0.0f; eyeOffset.x = 0.0f;
@@ -884,7 +884,7 @@ void daNpc_Grz_c::setAttnPos() {
/* 809EA1DC-809EA734 001EBC 0558+00 1/1 0/0 0/0 .text setCollisionPunch__11daNpc_Grz_cFv */ /* 809EA1DC-809EA734 001EBC 0558+00 1/1 0/0 0/0 .text setCollisionPunch__11daNpc_Grz_cFv */
void daNpc_Grz_c::setCollisionPunch() { void daNpc_Grz_c::setCollisionPunch() {
if (mType == TYPE_SMASH) { if (mType == TYPE_SMASH) {
f32 frame = mpMorf->getFrame(); f32 frame = mAnm_p->getFrame();
if (mAnm == ANM_PUNCHING && ((frame >= 15.0f && frame < 16.0f) || (frame >= 35.0f && frame < 36.0f))) { if (mAnm == ANM_PUNCHING && ((frame >= 15.0f && frame < 16.0f) || (frame >= 35.0f && frame < 36.0f))) {
daPy_py_c* player = daPy_getPlayerActorClass(); daPy_py_c* player = daPy_getPlayerActorClass();
@@ -910,7 +910,7 @@ void daNpc_Grz_c::setCollisionPunch() {
if (mAnm == ANM_PUNCHING && ((frame >= 10.0f && frame < 18.0f && i >= 2) || ((frame < 2.0f || frame >= 29.0f) && i < 2))) { if (mAnm == ANM_PUNCHING && ((frame >= 10.0f && frame < 18.0f && i >= 2) || ((frame < 2.0f || frame >= 29.0f) && i < 2))) {
cXyz sp60; cXyz sp60;
mSphs[i].OnAtSetBit(); mSphs[i].OnAtSetBit();
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
static int l_attack_jnt[4] = { static int l_attack_jnt[4] = {
JNT_ARML2, JNT_HANDL, JNT_ARMR2, JNT_HANDR, JNT_ARML2, JNT_HANDL, JNT_ARMR2, JNT_HANDR,
@@ -1089,7 +1089,7 @@ bool daNpc_Grz_c::setExpressionBtp(int i_index) {
return true; return true;
} }
if (setBtpAnm(btp, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { if (setBtpAnm(btp, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) {
mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP;
if (i_index == 0) { if (i_index == 0) {
@@ -1196,7 +1196,7 @@ void daNpc_Grz_c::setMotionAnm(int i_index, f32 i_morf) {
} }
if (btk != NULL) { if (btk != NULL) {
if (setBtkAnm(btk, mpMorf->getModel()->getModelData(), 1.0f, i_attr2)) { if (setBtkAnm(btk, mAnm_p->getModel()->getModelData(), 1.0f, i_attr2)) {
mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK;
} }
} }
@@ -1670,7 +1670,7 @@ void daNpc_Grz_c::setLookMode(int i_lookMode) {
/* 809EC188-809EC424 003E68 029C+00 1/1 0/0 0/0 .text lookat__11daNpc_Grz_cFv */ /* 809EC188-809EC424 003E68 029C+00 1/1 0/0 0/0 .text lookat__11daNpc_Grz_cFv */
void daNpc_Grz_c::lookat() { void daNpc_Grz_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL bVar1 = FALSE; BOOL bVar1 = FALSE;
f32 body_angleX_min = daNpc_Grz_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpc_Grz_Param_c::m.common.body_angleX_min;
f32 body_angleX_max = daNpc_Grz_Param_c::m.common.body_angleX_max; f32 body_angleX_max = daNpc_Grz_Param_c::m.common.body_angleX_max;
@@ -1865,7 +1865,7 @@ int daNpc_Grz_c::waitSmash(void* param_1) {
fopAcM_delete(this); fopAcM_delete(this);
} else { } else {
if (mAnm == ANM_PUNCHING) { if (mAnm == ANM_PUNCHING) {
f32 frame = mpMorf->getFrame(); f32 frame = mAnm_p->getFrame();
if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) { if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) {
mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1); mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1);
} }
@@ -2132,7 +2132,7 @@ int daNpc_Grz_c::doTalkStandCut(int i_staffId) {
switch (prm) { switch (prm) {
case 0: case 0:
if (mAnm == ANM_GETUP_2) { if (mAnm == ANM_GETUP_2) {
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
rv = 1; rv = 1;
} }
} }
@@ -2210,7 +2210,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) {
break; break;
case 21: case 21:
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
break; break;
case 99: case 99:
@@ -2346,8 +2346,8 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
break; break;
case 75: case 75:
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
mpMorf->setEndFrame(10.0f); mAnm_p->setEndFrame(10.0f);
break; break;
case 80: case 80:
@@ -2358,12 +2358,12 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
switch (prm) { switch (prm) {
case 0: case 0:
if (mpMorf->getFrame() == mpMorf->getStartFrame()) { if (mAnm_p->getFrame() == mAnm_p->getStartFrame()) {
field_0x1a9c++; field_0x1a9c++;
} }
if (field_0x1a9c >= 2) { if (field_0x1a9c >= 2) {
if (mpMorf->getFrame() >= 20.0f) { if (mAnm_p->getFrame() >= 20.0f) {
rv = 1; rv = 1;
} }
} else { } else {
@@ -2375,7 +2375,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
} }
if (mAnm == ANM_PUNCHING) { if (mAnm == ANM_PUNCHING) {
f32 frame = mpMorf->getFrame(); f32 frame = mAnm_p->getFrame();
if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) { if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) {
mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1); mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1);
} }
@@ -2383,12 +2383,12 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
break; break;
case 10: case 10:
if (mpMorf->getFrame() == mpMorf->getStartFrame()) { if (mAnm_p->getFrame() == mAnm_p->getStartFrame()) {
rv = 1; rv = 1;
} }
if (mAnm == ANM_PUNCHING) { if (mAnm == ANM_PUNCHING) {
f32 frame = mpMorf->getFrame(); f32 frame = mAnm_p->getFrame();
if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) { if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) {
mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1); mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1);
} }
@@ -2396,7 +2396,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
break; break;
case 20: case 20:
if (mpMorf->getFrame() >= 17.0f) { if (mAnm_p->getFrame() >= 17.0f) {
dComIfGp_getVibration().StopQuake(31); dComIfGp_getVibration().StopQuake(31);
rv = 1; rv = 1;
} }
@@ -2405,7 +2405,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
case 30: case 30:
if (mMotionPhase > 0) { if (mMotionPhase > 0) {
rv = 1; rv = 1;
} else if (mpMorf->getFrame() == 35.0f) { } else if (mAnm_p->getFrame() == 35.0f) {
dComIfGp_getVibration().StartShock(8, 15, cXyz(0.0f, 1.0f, 0.0f)); dComIfGp_getVibration().StartShock(8, 15, cXyz(0.0f, 1.0f, 0.0f));
daObjGrzRock_c* rock_p = (daObjGrzRock_c*)mActorMngrs[3].getActorP(); daObjGrzRock_c* rock_p = (daObjGrzRock_c*)mActorMngrs[3].getActorP();
if (rock_p != NULL) { if (rock_p != NULL) {
@@ -2448,7 +2448,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
if (mMotion == MOT_TO_STONE_NORMAL) { if (mMotion == MOT_TO_STONE_NORMAL) {
if (mMotionPhase > 0) { if (mMotionPhase > 0) {
rv = 1; rv = 1;
} else if (mpMorf->checkFrame(14.0f)) { } else if (mAnm_p->checkFrame(14.0f)) {
cXyz sp70(0.0f, 0.0f, 20.0f); cXyz sp70(0.0f, 0.0f, 20.0f);
mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(mCurAngle.y); mDoMtx_stack_c::YrotM(mCurAngle.y);
@@ -2466,9 +2466,9 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
mPath.getDstPos(current.pos, sp7c); mPath.getDstPos(current.pos, sp7c);
cLib_addCalcAngleS2(&mCurAngle.y, cLib_targetAngleY(&current.pos, &sp7c), 6, 0x400); cLib_addCalcAngleS2(&mCurAngle.y, cLib_targetAngleY(&current.pos, &sp7c), 6, 0x400);
setAngle(mCurAngle.y); setAngle(mCurAngle.y);
f32 playSpeed = mpMorf->getPlaySpeed(); f32 playSpeed = mAnm_p->getPlaySpeed();
cLib_addCalc2(&playSpeed, 1.0f, 0.1f, 0.1f); cLib_addCalc2(&playSpeed, 1.0f, 0.1f, 0.1f);
mpMorf->setPlaySpeed(playSpeed); mAnm_p->setPlaySpeed(playSpeed);
speedF = daNpc_Grz_Param_c::m.rotation_movement_speed * playSpeed; speedF = daNpc_Grz_Param_c::m.rotation_movement_speed * playSpeed;
} }
@@ -2480,7 +2480,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
break; break;
} }
if (mMotion == MOT_TO_STONE_NORMAL && mMotionPhase > 0 && mpMorf->getPlaySpeed() >= 0.5f) { if (mMotion == MOT_TO_STONE_NORMAL && mMotionPhase > 0 && mAnm_p->getPlaySpeed() >= 0.5f) {
JPABaseEmitter* emitter = NULL; JPABaseEmitter* emitter = NULL;
cXyz pos(current.pos); cXyz pos(current.pos);
cXyz scale(1.2f, 1.2f, 1.2f); cXyz scale(1.2f, 1.2f, 1.2f);
src/d/actor/d_a_npc_gwolf.cpp
+35 -35
View File
@@ -232,7 +232,7 @@ daNpc_GWolf_c::~daNpc_GWolf_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -322,8 +322,8 @@ cPhs__Step daNpc_GWolf_c::create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
mpMorf->getModel()->getModelData(); mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
@@ -360,17 +360,17 @@ int daNpc_GWolf_c::CreateHeap() {
JUT_ASSERT(538, NULL != mdlData_p); JUT_ASSERT(538, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -399,7 +399,7 @@ int daNpc_GWolf_c::Execute() {
/* 809F3C2C-809F3CBC 000C6C 0090+00 1/1 0/0 0/0 .text Draw__13daNpc_GWolf_cFv */ /* 809F3C2C-809F3CBC 000C6C 0090+00 1/1 0/0 0/0 .text Draw__13daNpc_GWolf_cFv */
int daNpc_GWolf_c::Draw() { int daNpc_GWolf_c::Draw() {
J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
mdlData_p->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); mdlData_p->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
return draw( return draw(
@@ -409,7 +409,7 @@ int daNpc_GWolf_c::Draw() {
/* 809F3CBC-809F3FB8 000CFC 02FC+00 1/1 0/0 0/0 .text draw__13daNpc_GWolf_cFiifP11_GXColorS10i */ /* 809F3CBC-809F3FB8 000CFC 02FC+00 1/1 0/0 0/0 .text draw__13daNpc_GWolf_cFiifP11_GXColorS10i */
int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) { int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
J3DModelData* mdlData_p = model->getModelData(); J3DModelData* mdlData_p = model->getModelData();
field_0x9f3 = 1; field_0x9f3 = 1;
@@ -457,7 +457,7 @@ int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_co
fopAcM_setEffectMtx(this, mdlData_p); fopAcM_setEffectMtx(this, mdlData_p);
} }
mpMorf->entryDL(); mAnm_p->entryDL();
if ((mAnmFlags & ANM_PLAY_BTP) != 0) { if ((mAnmFlags & ANM_PLAY_BTP) != 0) {
mBtpAnm.remove(mdlData_p); mBtpAnm.remove(mdlData_p);
@@ -487,11 +487,11 @@ int daNpc_GWolf_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int i_jointList[3] = {1, 3, 4}; int i_jointList[3] = {1, 3, 4};
if (jntNo == 0) { if (jntNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -518,8 +518,8 @@ int daNpc_GWolf_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jntNo == 4 || jntNo == 0xE) && (mAnmFlags & ANM_PLAY_BCK) != 0) { if ((jntNo == 4 || jntNo == 0xE) && (mAnmFlags & ANM_PLAY_BCK) != 0) {
J3DAnmTransform* anm = mBckAnm.getBckAnm(); J3DAnmTransform* anm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(anm); mAnm_p->changeAnm(anm);
} }
return 1; return 1;
@@ -682,7 +682,7 @@ void daNpc_GWolf_c::setAttnPos() {
setMtx(); setMtx();
lookat(); lookat();
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
eyeOffset.y = 0.0f; eyeOffset.y = 0.0f;
@@ -795,7 +795,7 @@ void daNpc_GWolf_c::setMotionAnm(int i_index, f32 i_morf) {
} }
if (i_btk != NULL) { if (i_btk != NULL) {
if (setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { if (setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) {
mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK;
} }
} }
@@ -807,7 +807,7 @@ void daNpc_GWolf_c::setMotionAnm(int i_index, f32 i_morf) {
if (i_brk != NULL) { if (i_brk != NULL) {
if (mBrkAnm.getBrkAnm() == i_brk) { if (mBrkAnm.getBrkAnm() == i_brk) {
mAnmFlags |= ANM_PLAY_BRK; mAnmFlags |= ANM_PLAY_BRK;
} else if (setBrkAnm(i_brk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { } else if (setBrkAnm(i_brk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) {
mAnmFlags |= ANM_PLAY_BRK | ANM_PAUSE_BRK; mAnmFlags |= ANM_PLAY_BRK | ANM_PAUSE_BRK;
} }
} }
@@ -1006,19 +1006,19 @@ void daNpc_GWolf_c::playMotion() {
if (mHide != true) { if (mHide != true) {
switch (mAnm) { switch (mAnm) {
case ANM_WAITSIT: case ANM_WAITSIT:
if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) {
mSound.startCreatureVoice(Z2SE_G_WLF_BREATH, -1); mSound.startCreatureVoice(Z2SE_G_WLF_BREATH, -1);
} }
break; break;
case ANM_JUMPAST: case ANM_JUMPAST:
if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) {
mSound.startCreatureVoice(Z2SE_G_WLF_JUMP, -1); mSound.startCreatureVoice(Z2SE_G_WLF_JUMP, -1);
} }
break; break;
case ANM_HOWLB: case ANM_HOWLB:
if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) {
mSound.startCreatureVoice(Z2SE_G_WLF_TRANSFORM, -1); mSound.startCreatureVoice(Z2SE_G_WLF_TRANSFORM, -1);
} }
break; break;
@@ -1199,7 +1199,7 @@ void daNpc_GWolf_c::setLookMode(int i_lookMode) {
/* 809F5B84-809F5E0C 002BC4 0288+00 1/1 0/0 0/0 .text lookat__13daNpc_GWolf_cFv */ /* 809F5B84-809F5E0C 002BC4 0288+00 1/1 0/0 0/0 .text lookat__13daNpc_GWolf_cFv */
void daNpc_GWolf_c::lookat() { void daNpc_GWolf_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL i_snap = FALSE; BOOL i_snap = FALSE;
f32 body_angleX_min = daNpc_GWolf_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpc_GWolf_Param_c::m.common.body_angleX_min;
f32 body_angleX_max = daNpc_GWolf_Param_c::m.common.body_angleX_max; f32 body_angleX_max = daNpc_GWolf_Param_c::m.common.body_angleX_max;
@@ -1356,11 +1356,11 @@ BOOL daNpc_GWolf_c::ECut_attackWarp(int i_staffId) {
case 30: case 30:
if (mMotion == MOT_ATTACKAST && mMotionPhase > 0) { if (mMotion == MOT_ATTACKAST && mMotionPhase > 0) {
if (mpMorf->getFrame() >= 3.0f) { if (mAnm_p->getFrame() >= 3.0f) {
if (speed.y > 5.0f) { if (speed.y > 5.0f) {
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
} else { } else {
mpMorf->setPlaySpeed(1.0f); mAnm_p->setPlaySpeed(1.0f);
} }
} }
@@ -1373,7 +1373,7 @@ BOOL daNpc_GWolf_c::ECut_attackWarp(int i_staffId) {
dStage_changeScene(mExitId, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); dStage_changeScene(mExitId, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
Z2GetAudioMgr()->seStart(Z2SE_SY_WARP_FADE_GW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); Z2GetAudioMgr()->seStart(Z2SE_SY_WARP_FADE_GW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
mpMorf->setPlaySpeed(0.5f); mAnm_p->setPlaySpeed(0.5f);
rv = TRUE; rv = TRUE;
} }
} }
@@ -1487,11 +1487,11 @@ BOOL daNpc_GWolf_c::ECut_attackWarpHorse(int i_staffId) {
case 30: case 30:
if (mMotion == MOT_ATTACKAST && mMotionPhase > 0) { if (mMotion == MOT_ATTACKAST && mMotionPhase > 0) {
if (mpMorf->getFrame() >= 3.0f && speed.y > 5.0f) { if (mAnm_p->getFrame() >= 3.0f && speed.y > 5.0f) {
if (speed.y > 5.0f) { if (speed.y > 5.0f) {
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
} else { } else {
mpMorf->setPlaySpeed(1.0f); mAnm_p->setPlaySpeed(1.0f);
} }
} }
@@ -1503,7 +1503,7 @@ BOOL daNpc_GWolf_c::ECut_attackWarpHorse(int i_staffId) {
} }
dStage_changeScene(mExitId, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); dStage_changeScene(mExitId, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
mpMorf->setPlaySpeed(1.0f); mAnm_p->setPlaySpeed(1.0f);
Z2GetAudioMgr()->seStart(Z2SE_SY_WARP_FADE_GW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); Z2GetAudioMgr()->seStart(Z2SE_SY_WARP_FADE_GW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
rv = TRUE; rv = TRUE;
} }
@@ -1585,8 +1585,8 @@ BOOL daNpc_GWolf_c::ECut_howlingSessionA(int i_staffId) {
switch (prm) { switch (prm) {
case 0: case 0:
if (mAnm == ANM_HOWLC) { if (mAnm == ANM_HOWLC) {
if (mpMorf->getFrame() >= 28.0f) { if (mAnm_p->getFrame() >= 28.0f) {
mpMorf->setLoopFrame(28.0f); mAnm_p->setLoopFrame(28.0f);
mBtpAnm.setLoopFrame(28.0f); mBtpAnm.setLoopFrame(28.0f);
rv = TRUE; rv = TRUE;
} }
@@ -1622,7 +1622,7 @@ BOOL daNpc_GWolf_c::ECut_howlingSessionA(int i_staffId) {
case 40: case 40:
if (mAnm == ANM_JUMPAST) { if (mAnm == ANM_JUMPAST) {
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
speedF = 20.0f; speedF = 20.0f;
if (speed.y <= 4.0f) { if (speed.y <= 4.0f) {
src/d/actor/d_a_npc_impal.cpp
+20 -20
View File
@@ -115,7 +115,7 @@ daNpcImpal_c::~daNpcImpal_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
#if DEBUG #if DEBUG
@@ -152,8 +152,8 @@ int daNpcImpal_c::Create() {
mFlowID = getMessageNo(); mFlowID = getMessageNo();
field_de2 = mFlowID; field_de2 = mFlowID;
J3DModelData* model_data = mpMorf->getModel()->getModelData(); J3DModelData* model_data = mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f);
mCreatureSound.init(&current.pos, &eyePos, 3, 1); mCreatureSound.init(&current.pos, &eyePos, 3, 1);
#if DEBUG #if DEBUG
@@ -176,7 +176,7 @@ int daNpcImpal_c::Create() {
mGroundH = mAcch.GetGroundH(); mGroundH = mAcch.GetGroundH();
setEnvTevColor(); setEnvTevColor();
setRoomNo(); setRoomNo();
mpMorf->modelCalc(); mAnm_p->modelCalc();
reset(); reset();
Execute(); Execute();
@@ -200,17 +200,17 @@ BOOL daNpcImpal_c::CreateHeap() {
mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 26)); mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 26));
JUT_ASSERT(349, 0 != mdlData_p); JUT_ASSERT(349, 0 != mdlData_p);
u32 reg_r23 = 0x11020284; u32 reg_r23 = 0x11020284;
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound,
0x80000, reg_r23); 0x80000, reg_r23);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return FALSE; return FALSE;
} }
model = mpMorf->getModel(); model = mAnm_p->getModel();
for (u16 jointNo = 0; jointNo < mdlData_p->getJointNum(); jointNo++) { for (u16 jointNo = 0; jointNo < mdlData_p->getJointNum(); jointNo++) {
mdlData_p->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack);
} }
@@ -249,7 +249,7 @@ int daNpcImpal_c::Draw() {
return 1; return 1;
} }
J3DModelData* model_data = mpMorf->getModel()->getModelData(); J3DModelData* model_data = mAnm_p->getModel()->getModelData();
model_data->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); model_data->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false); draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false);
@@ -264,11 +264,11 @@ bool daNpcImpal_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int lookatJoints[3] = {1, 3, 4}; int lookatJoints[3] = {1, 3, 4};
if (jointNo == 0) { if (jointNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -286,8 +286,8 @@ bool daNpcImpal_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jointNo == 4 || jointNo == 8) && (mAnmFlags & ANM_PLAY_BCK)) { if ((jointNo == 4 || jointNo == 8) && (mAnmFlags & ANM_PLAY_BCK)) {
J3DAnmTransform* bckAnm = mBckAnm.getBckAnm(); J3DAnmTransform* bckAnm = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(bckAnm); mAnm_p->changeAnm(bckAnm);
} }
return true; return true;
@@ -502,7 +502,7 @@ bool daNpcImpal_c::setExpressionBtp(int i_idx) {
return true; return true;
} }
if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) {
mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP;
if (i_idx == 0) { if (i_idx == 0) {
mAnmFlags |= ANM_FLAG_800; mAnmFlags |= ANM_FLAG_800;
@@ -554,7 +554,7 @@ void daNpcImpal_c::setMotionAnm(int i_idx, f32 i_morf) {
mMotionLoops = 0; mMotionLoops = 0;
} }
if (btkAnm && setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0f, iVar4)) { if (btkAnm && setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0f, iVar4)) {
mAnmFlags |= 0x12; mAnmFlags |= 0x12;
} }
} }
@@ -616,7 +616,7 @@ bool daNpcImpal_c::setAction(daNpcImpal_c::actionFunc i_actionFn) {
/* 80A0B76C-80A0B94C 003E6C 01E0+00 1/1 0/0 0/0 .text lookat__12daNpcImpal_cFv */ /* 80A0B76C-80A0B94C 003E6C 01E0+00 1/1 0/0 0/0 .text lookat__12daNpcImpal_cFv */
void daNpcImpal_c::lookat() { void daNpcImpal_c::lookat() {
fopAc_ac_c* actor = NULL; fopAc_ac_c* actor = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL snap = false; BOOL snap = false;
f32 body_angleX_min = mpHIO->m.common.body_angleX_min; f32 body_angleX_min = mpHIO->m.common.body_angleX_min;
@@ -1243,7 +1243,7 @@ void daNpcImpal_c::setAttnPos() {
lookat(); lookat();
cXyz local_1c(10.0f, 10.0f, 0.0f); cXyz local_1c(10.0f, 10.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&local_1c, &eyePos); mDoMtx_stack_c::multVec(&local_1c, &eyePos);
local_1c.x = 0.0f; local_1c.x = 0.0f;
src/d/actor/d_a_npc_ins.cpp
+26 -26
View File
@@ -312,7 +312,7 @@ daNpcIns_c::~daNpcIns_c() {
} }
if (heap != 0) { if (heap != 0) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -428,8 +428,8 @@ cPhs__Step daNpcIns_c::Create() {
mInsectMsgNo = getMessageNo(); mInsectMsgNo = getMessageNo();
field_0xe16 = mInsectMsgNo; field_0xe16 = mInsectMsgNo;
mpMorf->getModel()->getModelData(); mAnm_p->getModel()->getModelData();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
mAcchCir.SetWall(daNpcIns_Param_c::m.common.width, daNpcIns_Param_c::m.common.knee_length); mAcchCir.SetWall(daNpcIns_Param_c::m.common.width, daNpcIns_Param_c::m.common.knee_length);
@@ -449,7 +449,7 @@ cPhs__Step daNpcIns_c::Create() {
mGroundH = mAcch.GetGroundH(); mGroundH = mAcch.GetGroundH();
setEnvTevColor(); setEnvTevColor();
setRoomNo(); setRoomNo();
mpMorf->modelCalc(); mAnm_p->modelCalc();
reset(); reset();
Execute(); Execute();
} }
@@ -463,17 +463,17 @@ int daNpcIns_c::CreateHeap() {
JUT_ASSERT(424, NULL != mdlData_p); JUT_ASSERT(424, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -541,19 +541,19 @@ int daNpcIns_c::Execute() {
/* 80A0EF94-80A0F0BC 000E34 0128+00 1/1 0/0 0/0 .text Draw__10daNpcIns_cFv */ /* 80A0EF94-80A0F0BC 000E34 0128+00 1/1 0/0 0/0 .text Draw__10daNpcIns_cFv */
int daNpcIns_c::Draw() { int daNpcIns_c::Draw() {
mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
draw(FALSE, FALSE, daNpcIns_Param_c::m.common.real_shadow_size, NULL, FALSE); draw(FALSE, FALSE, daNpcIns_Param_c::m.common.real_shadow_size, NULL, FALSE);
if (mpUmbrellaModel != NULL) { if (mpUmbrellaModel != NULL) {
g_env_light.setLightTevColorType_MAJI(mpUmbrellaModel, &tevStr); g_env_light.setLightTevColorType_MAJI(mpUmbrellaModel, &tevStr);
mpUmbrellaModel->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(JNT_FINGERL)); mpUmbrellaModel->setBaseTRMtx(mAnm_p->getModel()->getAnmMtx(JNT_FINGERL));
mDoExt_modelUpdateDL(mpUmbrellaModel); mDoExt_modelUpdateDL(mpUmbrellaModel);
dComIfGd_addRealShadow(mShadowKey, mpUmbrellaModel); dComIfGd_addRealShadow(mShadowKey, mpUmbrellaModel);
} }
if (mpKagoModel != NULL) { if (mpKagoModel != NULL) {
g_env_light.setLightTevColorType_MAJI(mpKagoModel, &tevStr); g_env_light.setLightTevColorType_MAJI(mpKagoModel, &tevStr);
mpKagoModel->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(JNT_ARML2)); mpKagoModel->setBaseTRMtx(mAnm_p->getModel()->getAnmMtx(JNT_ARML2));
mDoExt_modelUpdateDL(mpKagoModel); mDoExt_modelUpdateDL(mpKagoModel);
dComIfGd_addRealShadow(mShadowKey, mpKagoModel); dComIfGd_addRealShadow(mShadowKey, mpKagoModel);
} }
@@ -567,11 +567,11 @@ int daNpcIns_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
if (jntNo == JNT_CENTER) { if (jntNo == JNT_CENTER) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -590,8 +590,8 @@ int daNpcIns_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) {
J3DAnmTransform* anmTransform = mBckAnm.getBckAnm(); J3DAnmTransform* anmTransform = mBckAnm.getBckAnm();
mBckAnm.changeBckOnly(mpMorf->getAnm()); mBckAnm.changeBckOnly(mAnm_p->getAnm());
mpMorf->changeAnm(anmTransform); mAnm_p->changeAnm(anmTransform);
} }
return 1; return 1;
@@ -837,7 +837,7 @@ bool daNpcIns_c::setExpressionBtp(int i_index) {
return true; return true;
} }
if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) {
mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP;
if (i_index == EXPR_BTP_INS) { if (i_index == EXPR_BTP_INS) {
@@ -876,7 +876,7 @@ void daNpcIns_c::setMotionAnm(int i_index, f32 i_morf) {
mMotionLoops = 0; mMotionLoops = 0;
} }
if (i_btk != NULL && setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, btk_attr)) { if (i_btk != NULL && setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, btk_attr)) {
mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK;
} }
} }
@@ -961,7 +961,7 @@ void daNpcIns_c::setAttnPos() {
setMtx(); setMtx();
lookat(); lookat();
cXyz sp2c(10.0f, 10.0f, 0.0f); cXyz sp2c(10.0f, 10.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&sp2c, &eyePos); mDoMtx_stack_c::multVec(&sp2c, &eyePos);
sp2c.x = 0.0f; sp2c.x = 0.0f;
@@ -990,7 +990,7 @@ void daNpcIns_c::setAttnPos() {
/* 80A131AC-80A1339C 00504C 01F0+00 1/1 0/0 0/0 .text lookat__10daNpcIns_cFv */ /* 80A131AC-80A1339C 00504C 01F0+00 1/1 0/0 0/0 .text lookat__10daNpcIns_cFv */
void daNpcIns_c::lookat() { void daNpcIns_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL i_snap = FALSE; BOOL i_snap = FALSE;
f32 body_angleX_min = daNpcIns_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpcIns_Param_c::m.common.body_angleX_min;
f32 body_angleX_max = daNpcIns_Param_c::m.common.body_angleX_max; f32 body_angleX_max = daNpcIns_Param_c::m.common.body_angleX_max;
@@ -1049,7 +1049,7 @@ void daNpcIns_c::lookat() {
/* 80A1339C-80A13460 00523C 00C4+00 1/0 0/0 0/0 .text setMtx__10daNpcIns_cFv */ /* 80A1339C-80A13460 00523C 00C4+00 1/0 0/0 0/0 .text setMtx__10daNpcIns_cFv */
void daNpcIns_c::setMtx() { void daNpcIns_c::setMtx() {
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
mDoMtx_stack_c::transS(current.pos.x, mCurrentPosY, current.pos.z); mDoMtx_stack_c::transS(current.pos.x, mCurrentPosY, current.pos.z);
mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::ZXYrotM(mCurAngle);
@@ -1057,16 +1057,16 @@ void daNpcIns_c::setMtx() {
model->setUserArea((uintptr_t)this); model->setUserArea((uintptr_t)this);
if (!cM3d_IsZero(mExpressionMorf)) { if (!cM3d_IsZero(mExpressionMorf)) {
mpMorf->onMorfNone(); mAnm_p->onMorfNone();
} else { } else {
mpMorf->offMorfNone(); mAnm_p->offMorfNone();
} }
if ((mAnmFlags & ANM_PLAY_BCK) != 0) { if ((mAnmFlags & ANM_PLAY_BCK) != 0) {
mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame());
} }
mpMorf->modelCalc(); mAnm_p->modelCalc();
} }
BOOL daNpcIns_c::setAction(actionFunc action) { BOOL daNpcIns_c::setAction(actionFunc action) {
src/d/actor/d_a_npc_kasi_hana.cpp
+25 -25
View File
@@ -606,7 +606,7 @@ daNpcKasiHana_c::~daNpcKasiHana_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -672,8 +672,8 @@ cPhs__Step daNpcKasiHana_c::Create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 160.0f, 60.0f); fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 160.0f, 60.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
@@ -706,21 +706,21 @@ int daNpcKasiHana_c::CreateHeap() {
JUT_ASSERT(950, NULL != mdlData_p); JUT_ASSERT(950, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
cXyz i_scale(1.0f, 0.8630768f, 1.0f); cXyz i_scale(1.0f, 0.8630768f, 1.0f);
mpMorf->offTranslate(); mAnm_p->offTranslate();
mpMorf->setTranslateScale(i_scale); mAnm_p->setTranslateScale(i_scale);
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -758,11 +758,11 @@ int daNpcKasiHana_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD}; int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD};
if (jntNo == JNT_CENTER) { if (jntNo == JNT_CENTER) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -885,7 +885,7 @@ void daNpcKasiHana_c::setAttnPos() {
cXyz sp1c(10.0f, 15.0f, 0.0f); cXyz sp1c(10.0f, 15.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&sp1c, &eyePos); mDoMtx_stack_c::multVec(&sp1c, &eyePos);
sp1c.x = 0.0f; sp1c.x = 0.0f;
@@ -897,7 +897,7 @@ void daNpcKasiHana_c::setAttnPos() {
cXyz sp28; cXyz sp28;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&sp28); mDoMtx_stack_c::multVecZero(&sp28);
sp28.y = current.pos.y; sp28.y = current.pos.y;
mCyl.SetC(sp28); mCyl.SetC(sp28);
@@ -977,7 +977,7 @@ void daNpcKasiHana_c::reset() {
J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 8); J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 8);
mAnmFlags &= 0xFFFFF57F; mAnmFlags &= 0xFFFFF57F;
if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) {
mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP; mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP;
} }
@@ -1078,7 +1078,7 @@ void daNpcKasiHana_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data)
} }
mExpressionMorf = 0.0f; mExpressionMorf = 0.0f;
mpMorf->setMorf(i_morf); mAnm_p->setMorf(i_morf);
} }
} }
@@ -1113,7 +1113,7 @@ void daNpcKasiHana_c::setLookMode(int i_lookMode) {
/* 80A1D848-80A1DA28 002988 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcKasiHana_cFv */ /* 80A1D848-80A1DA28 002988 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcKasiHana_cFv */
void daNpcKasiHana_c::lookat() { void daNpcKasiHana_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL i_snap = FALSE; BOOL i_snap = FALSE;
f32 body_angleX_min = daNpcKasiHana_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpcKasiHana_Param_c::m.common.body_angleX_min;
f32 body_angleX_max = daNpcKasiHana_Param_c::m.common.body_angleX_max; f32 body_angleX_max = daNpcKasiHana_Param_c::m.common.body_angleX_max;
@@ -1466,7 +1466,7 @@ int daNpcKasiHana_c::fear(int param_1) {
break; break;
case 3: case 3:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
setMotion(MOT_W_RUN_A, -1.0f, 0); setMotion(MOT_W_RUN_A, -1.0f, 0);
fopAcM_SetSpeedF(this, 15.0f); fopAcM_SetSpeedF(this, 15.0f);
mSound.startCreatureVoice(Z2SE_HANA_V_FEAR, -1); mSound.startCreatureVoice(Z2SE_HANA_V_FEAR, -1);
@@ -1476,7 +1476,7 @@ int daNpcKasiHana_c::fear(int param_1) {
case 4: { case 4: {
cXyz sp28; cXyz sp28;
mpMorf->setPlaySpeed(1.5f); mAnm_p->setPlaySpeed(1.5f);
if (mPath.getDstPos(current.pos, sp28)) { if (mPath.getDstPos(current.pos, sp28)) {
mEscape = true; mEscape = true;
@@ -1717,7 +1717,7 @@ int daNpcKasiHana_c::escape(int param_1) {
} else { } else {
_turn_pos(sp28, 0x600); _turn_pos(sp28, 0x600);
mKasiMng.calcEscapeForm(); mKasiMng.calcEscapeForm();
mpMorf->setPlaySpeed(1.75f); mAnm_p->setPlaySpeed(1.75f);
} }
break; break;
} }
@@ -1883,7 +1883,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutMain(int const& i_cutIndex) {
break; break;
case 21: case 21:
if (mMotion == MOT_MICH_KYA_TALK && (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f)) { if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) {
setMotion(MOT_W_WAIT_A, -1.0f, 0); setMotion(MOT_W_WAIT_A, -1.0f, 0);
} }
@@ -1976,7 +1976,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2)
break; break;
case 20: case 20:
if (mMotion == MOT_MICH_KYA_TALK && (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f)) { if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) {
setMotion(MOT_W_WAIT_A, -1.0f, 0); setMotion(MOT_W_WAIT_A, -1.0f, 0);
} }
@@ -2076,7 +2076,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutMain(int const& i_cutIndex) {
break; break;
case 21: case 21:
if (mMotion == MOT_MICH_KYA_TALK && (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f)) { if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) {
setMotion(MOT_W_WAIT_A, -1.0f, 0); setMotion(MOT_W_WAIT_A, -1.0f, 0);
} }
src/d/actor/d_a_npc_kasi_kyu.cpp
+30 -30
View File
@@ -160,7 +160,7 @@ daNpcKasiKyu_c::~daNpcKasiKyu_c() {
} }
if (heap != NULL) { if (heap != NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
} }
} }
@@ -224,8 +224,8 @@ cPhs__Step daNpcKasiKyu_c::Create() {
return cPhs_ERROR_e; return cPhs_ERROR_e;
} }
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 220.0f, 60.0f); fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 220.0f, 60.0f);
mSound.init(&current.pos, &eyePos, 3, 1); mSound.init(&current.pos, &eyePos, 3, 1);
@@ -258,21 +258,21 @@ int daNpcKasiKyu_c::CreateHeap() {
JUT_ASSERT(322, NULL != mdlData_p); JUT_ASSERT(322, NULL != mdlData_p);
mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084);
if (mpMorf != NULL && mpMorf->getModel() == NULL) { if (mAnm_p != NULL && mAnm_p->getModel() == NULL) {
mpMorf->stopZelAnime(); mAnm_p->stopZelAnime();
mpMorf = NULL; mAnm_p = NULL;
} }
if (mpMorf == NULL) { if (mAnm_p == NULL) {
return 0; return 0;
} }
cXyz i_scale(1.0f, 0.8630768f, 1.0f); cXyz i_scale(1.0f, 0.8630768f, 1.0f);
mpMorf->offTranslate(); mAnm_p->offTranslate();
mpMorf->setTranslateScale(i_scale); mAnm_p->setTranslateScale(i_scale);
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
} }
@@ -311,11 +311,11 @@ int daNpcKasiKyu_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int i_jointList[3] = {1, 2, 3}; int i_jointList[3] = {1, 2, 3};
if (jntNo == 0) { if (jntNo == 0) {
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&mLookatPos[0]); mDoMtx_stack_c::multVecZero(&mLookatPos[0]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2));
mDoMtx_stack_c::multVecZero(&mLookatPos[1]); mDoMtx_stack_c::multVecZero(&mLookatPos[1]);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mLookatPos[2]); mDoMtx_stack_c::multVecZero(&mLookatPos[2]);
} }
@@ -424,7 +424,7 @@ void daNpcKasiKyu_c::setAttnPos() {
cXyz sp1c(10.0f, 15.0f, 0.0f); cXyz sp1c(10.0f, 15.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3));
mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVecZero(&mHeadPos);
mDoMtx_stack_c::multVec(&sp1c, &eyePos); mDoMtx_stack_c::multVec(&sp1c, &eyePos);
sp1c.x = 0.0f; sp1c.x = 0.0f;
@@ -436,7 +436,7 @@ void daNpcKasiKyu_c::setAttnPos() {
cXyz sp28; cXyz sp28;
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1));
mDoMtx_stack_c::multVecZero(&sp28); mDoMtx_stack_c::multVecZero(&sp28);
sp28.y = current.pos.y; sp28.y = current.pos.y;
mCyl.SetC(sp28); mCyl.SetC(sp28);
@@ -514,7 +514,7 @@ void daNpcKasiKyu_c::reset() {
J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 7); J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 7);
mAnmFlags &= 0xFFFFF57F; mAnmFlags &= 0xFFFFF57F;
if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) {
mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP; mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP;
} }
@@ -620,7 +620,7 @@ void daNpcKasiKyu_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
} }
mExpressionMorf = 0.0f; mExpressionMorf = 0.0f;
mpMorf->setMorf(i_morf); mAnm_p->setMorf(i_morf);
} }
} }
@@ -655,7 +655,7 @@ void daNpcKasiKyu_c::setLookMode(int i_lookMode) {
/* 80A23350-80A23530 001A70 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcKasiKyu_cFv */ /* 80A23350-80A23530 001A70 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcKasiKyu_cFv */
void daNpcKasiKyu_c::lookat() { void daNpcKasiKyu_c::lookat() {
daPy_py_c* player = NULL; daPy_py_c* player = NULL;
J3DModel* model = mpMorf->getModel(); J3DModel* model = mAnm_p->getModel();
BOOL i_snap = FALSE; BOOL i_snap = FALSE;
f32 body_angleX_min = daNpcKasiKyu_Param_c::m.common.body_angleX_min; f32 body_angleX_min = daNpcKasiKyu_Param_c::m.common.body_angleX_min;
f32 body_angleX_max = daNpcKasiKyu_Param_c::m.common.body_angleX_max; f32 body_angleX_max = daNpcKasiKyu_Param_c::m.common.body_angleX_max;
@@ -869,7 +869,7 @@ int daNpcKasiKyu_c::fear(int param_1) {
break; break;
case 3: case 3:
if (mpMorf->isStop()) { if (mAnm_p->isStop()) {
setMotion(MOT_W_RUN_A, -1.0f, 0); setMotion(MOT_W_RUN_A, -1.0f, 0);
mSound.startCreatureVoice(Z2SE_KIU_V_FEAR, -1); mSound.startCreatureVoice(Z2SE_KIU_V_FEAR, -1);
fopAcM_SetSpeedF(this, 15.0f); fopAcM_SetSpeedF(this, 15.0f);
@@ -879,7 +879,7 @@ int daNpcKasiKyu_c::fear(int param_1) {
case 4: { case 4: {
cXyz sp28; cXyz sp28;
mpMorf->setPlaySpeed(1.5f); mAnm_p->setPlaySpeed(1.5f);
if (mPath.getDstPos(current.pos, sp28)) { if (mPath.getDstPos(current.pos, sp28)) {
mEscape = true; mEscape = true;
@@ -1142,7 +1142,7 @@ int daNpcKasiKyu_c::kya(int param_1) {
case 0: case 0:
setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); setMotion(MOT_MICH_KYA_TALK, -1.0f, 0);
speedF = 0.0f; speedF = 0.0f;
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
field_0x1460 = 8; field_0x1460 = 8;
mMode = 1; mMode = 1;
break; break;
@@ -1152,9 +1152,9 @@ int daNpcKasiKyu_c::kya(int param_1) {
field_0x1460--; field_0x1460--;
if (field_0x1460 == 0) { if (field_0x1460 == 0) {
mpMorf->setPlaySpeed(1.0f); mAnm_p->setPlaySpeed(1.0f);
} else { } else {
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
} }
} }
break; break;
@@ -1173,7 +1173,7 @@ int daNpcKasiKyu_c::kya2(int param_1) {
setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); setMotion(MOT_MICH_KYA_TALK, -1.0f, 0);
setLookMode(LOOK_NONE); setLookMode(LOOK_NONE);
speedF = 0.0f; speedF = 0.0f;
mpMorf->setPlaySpeed(1.0f); mAnm_p->setPlaySpeed(1.0f);
mMode = 1; mMode = 1;
break; break;
@@ -1200,7 +1200,7 @@ int daNpcKasiKyu_c::kya_stop(int param_1) {
break; break;
case 1: case 1:
if (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f) { if (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f) {
setAction(&daNpcKasiKyu_c::wait_dummy); setAction(&daNpcKasiKyu_c::wait_dummy);
} }
break; break;
@@ -1307,7 +1307,7 @@ int daNpcKasiKyu_c::escape(int param_1) {
case 2: case 2:
_turn_pos(mChacePos, 0x1000); _turn_pos(mChacePos, 0x1000);
mpMorf->setPlaySpeed(1.75f); mAnm_p->setPlaySpeed(1.75f);
break; break;
} }
@@ -1352,7 +1352,7 @@ int daNpcKasiKyu_c::cheer(int param_1) {
setLookMode(LOOK_PLAYER); setLookMode(LOOK_PLAYER);
fopAcM_SetSpeed(this, 0.0f, 0.0f, 0.0f); fopAcM_SetSpeed(this, 0.0f, 0.0f, 0.0f);
fopAcM_SetSpeedF(this, 0.0f); fopAcM_SetSpeedF(this, 0.0f);
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
mTalked = false; mTalked = false;
field_0x1460 = 12; field_0x1460 = 12;
mMode = 1; mMode = 1;
@@ -1363,9 +1363,9 @@ int daNpcKasiKyu_c::cheer(int param_1) {
field_0x1460--; field_0x1460--;
if (field_0x1460 == 0) { if (field_0x1460 == 0) {
mpMorf->setPlaySpeed(1.0f); mAnm_p->setPlaySpeed(1.0f);
} else { } else {
mpMorf->setPlaySpeed(0.0f); mAnm_p->setPlaySpeed(0.0f);
} }
} }

Some files were not shown because too many files have changed in this diff Show More