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

d_a_obj_Ygush00 closer

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-09-10 23:47:13 -07:00
parent 55524697a1
commit b637eaf4eb
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_a_obj.h
+2 -3
View File
@@ -3,10 +3,9 @@
#include "f_op/f_op_actor_mng.h"
class daObj {
public:
namespace daObj {
template <typename T>
static int PrmAbstract(const fopAc_ac_c* actor, T width, T shift) {
int PrmAbstract(const fopAc_ac_c* actor, T width, T shift) {
return ((1 << width) - 1) & (fopAcM_GetParam(actor) >> shift);
}
};
include/m_Do/m_Do_ext.h
+3 -3
View File
@@ -15,7 +15,7 @@ class J3DTexMtxAnm;
class mDoExt_baseAnm {
public:
mDoExt_baseAnm() {}
mDoExt_baseAnm() { mpFrameCtrl = NULL; }
virtual ~mDoExt_baseAnm() {}
int initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF);
@@ -43,7 +43,7 @@ private:
class mDoExt_btkAnm : public mDoExt_baseAnm {
public:
mDoExt_btkAnm() { mpAnm = 0; }
mDoExt_btkAnm() { mpTexMtxAnm = NULL; }
int init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay,
int i_attribute, f32 i_rate, s16 i_start, s16 i_end, bool i_modify, bool i_entry);
void entry(J3DMaterialTable* i_matTable, f32 i_frame);
@@ -74,7 +74,7 @@ class J3DTevColorAnm;
class J3DTevKColorAnm;
class mDoExt_brkAnm : public mDoExt_baseAnm {
public:
mDoExt_brkAnm() { mpAnm = 0; }
mDoExt_brkAnm() { mpAnm = NULL; }
/* 8000D70C */ int init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, int i_anmPlay,
int i_attribute, f32 i_rate, s16 i_start, s16 i_end, bool i_modify, int i_entry);
/* 8000D7A8 */ void entry(J3DMaterialTable* i_matTable, f32 i_frame);
include/m_Do/m_Do_mtx.h
+1 -7
View File
@@ -133,13 +133,7 @@ public:
* Translates the `now` Matrix by the given cXyz
* @param xyz The xyz translation vector
*/
/* 8000CD64 */ static void transS(cXyz const& xyz);
/**
* Translates a new Matrix by the given cXyz and then concatenates it with the `now` matrix
* @param xyz The xyz translation vector
*/
/* 8000CDD4 */ static void transM(cXyz const& xyz);
/* 8000CD64 */ static inline void transS(cXyz const& xyz) { MTXTrans(now, xyz.x, xyz.y, xyz.z); }
/**
* Translates a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix
src/d/actor/d_a_obj_Ygush00.cpp
+33 -26
View File
@@ -11,7 +11,7 @@
#include "d/d_kankyo.h"
#include "d/d_procname.h"
#include "m_Do/m_Do_ext.h"
#include "dolphin/mtx/mtx.h"
#include "m_Do/m_Do_mtx.h"
struct daObjGryw00_c {
public:
@@ -41,7 +41,9 @@ public:
daObjGryw00_c * mpGryw00;
};
STATIC_ASSERT(sizeof(mDoExt_btkAnm) == 0x14);
namespace {
static const char l_arcname[] = "Ygush00";
};
/* 00000078-0000009C .text solidHeapCB__14daObjYgush00_cFP10fopAc_ac_c */
s32 daObjYgush00_c::solidHeapCB(fopAc_ac_c* ac) {
@@ -50,17 +52,20 @@ s32 daObjYgush00_c::solidHeapCB(fopAc_ac_c* ac) {
/* 0000009C-00000250 .text create_heap__14daObjYgush00_cFv */
s32 daObjYgush00_c::create_heap() {
static const u32 mdl_table[] = { 0x0A, 0x09, 0x09, 0x09 };
static const u32 btk_table[] = { 0x0E, 0x0D, 0x0D, 0x0D };
static const u32 bck_table[] = { 0x06, 0x05, 0x05, 0x05 };
static u32 mdl_table[] = { 0x0A, 0x09, 0x09, 0x09 };
static u32 btk_table[] = { 0x0E, 0x0D, 0x0D, 0x0D };
static u32 bck_table[] = { 0x06, 0x05, 0x05, 0x05 };
J3DModelData * pModelData = (J3DModelData *)dComIfG_getObjectRes("Ygush00", mdl_table[mType]);
J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Ygush00", btk_table[mType]);
J3DAnmTransform * pBck = (J3DAnmTransform *)dComIfG_getObjectRes("Ygush00", bck_table[mType]);
s32 ret = 1;
J3DModelData * pModelData = (J3DModelData *)dComIfG_getObjectRes(l_arcname, mdl_table[mType]);
J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes(l_arcname, btk_table[mType]);
J3DAnmTransform * pBck = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, bck_table[mType]);
if (!pModelData || !pBtk || !pBck) {
JUT_ASSERT(207, 0);
return 0;
ret = 0;
return ret;
}
mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222);
@@ -68,41 +73,43 @@ s32 daObjYgush00_c::create_heap() {
s32 bckRet = mBckAnm.init(pModelData, pBck, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false);
if (!mpModel || !btkRet || !bckRet)
return 0;
ret = 0;
return 1;
return ret;
}
/* 00000250-000003F4 .text _create__14daObjYgush00_cFv */
s32 daObjYgush00_c::_create() {
const char * arcname = l_arcname;
fopAcM_SetupActor(this, daObjYgush00_c);
if (fpcM_IsFirstCreating(this)) {
u32 type = daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S);
if (type >= 0 && type <= 2) {
mType = type;
} else {
mType = type;
if ((int)mType < 0 || 4 <= (int)mType)
mType = 0;
}
}
if (dComIfG_resLoad(&mPhs, "Ygush00") == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)solidHeapCB, 0x740))
if (dComIfG_resLoad(&mPhs, arcname) == cPhs_COMPLEATE_e) {
if (fopAcM_entrySolidHeap(this, (heapCallbackFunc)solidHeapCB, 0x740) == 1) {
mpModel->setBaseScale(mScale);
mDoMtx_stack_c::transS(getPosition());
mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
fopAcM_setCullSizeBox(this,
mScale.x * -80.0f, 0.0f, mScale.z * -80.0f,
mScale.x * 80.0f, mScale.y * 125.0f, mScale.z * 80.0f);
} else {
return cPhs_ERROR_e;
J3DModel * pModel = mpModel;
pModel->setBaseScale(mScale);
// mDoMtx_stack_c::transS(getPosition());
// pModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
fopAcM_setCullSizeBox(this, mScale.x * -80.0f, 0.0f, -mScale.z * -80.0f,
mScale.x * 80.0f, mScale.y * 125.0f, mScale.z * 80.0f);
}
}
}
/* 000004F4-00000524 .text _delete__14daObjYgush00_cFv */
s32 daObjYgush00_c::_delete() {
dComIfG_resDelete(&mPhs, "Ygush00");
dComIfG_resDelete(&mPhs, l_arcname);
return 1;
}