mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 14:05:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_demo_barrel (#828)

Browse Source
This commit is contained in:
Maide
2025-08-03 03:21:45 +01:00
committed by GitHub
parent 9ee87682b1
commit bf6ab21944
3 changed files with 132 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1401,7 +1401,7 @@ config.libs = [
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_bscurtain", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_cafelmp"),
ActorRel(NonMatching, "d_a_obj_coming"),
ActorRel(NonMatching, "d_a_obj_demo_barrel"),
ActorRel(Matching, "d_a_obj_demo_barrel"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_doguu", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_doguu_demo"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gryw00", extra_cflags=['-pragma "nosyminline on"']),
include/d/actor/d_a_obj_demo_barrel.h
+14 -3
View File
@@ -3,6 +3,8 @@
#include "f_op/f_op_actor.h"
class mDoExt_McaMorf;
class daObj_Demo_Barrel_c : public fopAc_ac_c {
public:
inline cPhs_State _create();
@@ -14,10 +16,19 @@ public:
void setParticleHahen();
void setParticleSibuki();
void CreateHeap();
BOOL CreateHeap();
static const char M_arcname[];
public:
/* Place member variables here */
};
/* 0x290 */ request_of_phase_process_class mPhase;
/* 0x298 */ J3DModel* mpModel;
/* 0x29C */ mDoExt_McaMorf* mpMorf;
/* 0x2A0 */ u8 m2A0[0x2D0 - 0x2A0];
/* 0x2D0 */ cXyz m2D0;
/* 0x2DC */ s16 m2DC;
/* 0x2DE */ s16 m2DE;
/* 0x2E0 */ u8 m2E0[0x2E4 - 0x2E0];
}; // size = 0x2E4
#endif /* D_A_OBJ_DEMO_BARREL_H */
src/d/actor/d_a_obj_demo_barrel.cpp
+117 -19
View File
@@ -4,47 +4,147 @@
//
#include "d/actor/d_a_obj_demo_barrel.h"
#include "d/d_procname.h"
#include "d/d_bg_s_func.h"
#include "d/d_com_inf_game.h"
#include "d/d_priority.h"
#include "d/d_procname.h"
#include "d/res/res_dbarrel.h"
#include "f_op/f_op_actor_mng.h"
const char daObj_Demo_Barrel_c::M_arcname[] = "DBarrel";
/* 00000078-00000144 .text setParticleHahen__19daObj_Demo_Barrel_cFv */
void daObj_Demo_Barrel_c::setParticleHahen() {
/* Nonmatching */
JPABaseEmitter* emitter =
dComIfGp_particle_set(dPa_name::ID_COMMON_03E5, &current.pos, NULL, NULL, 0xFF, NULL, -1,
&tevStr.mColorK0, &tevStr.mColorK0, NULL);
if (emitter != NULL) {
static JGeometry::TVec3<f32> em_scl(1.0f, 0.8, 1.0f);
emitter->setEmitterScale(em_scl);
}
}
/* 00000144-00000378 .text setParticleSibuki__19daObj_Demo_Barrel_cFv */
void daObj_Demo_Barrel_c::setParticleSibuki() {
/* Nonmatching */
cXyz sp18 = current.pos;
sp18.y = 100.0f;
m2D0 = current.pos;
m2D0.y = dBgS_ObjGndChk_Wtr_Func(sp18);
dComIfGp_particle_set(dPa_name::ID_COMMON_003D, &m2D0);
dComIfGp_particle_set(dPa_name::ID_COMMON_003E, &m2D0);
dComIfGp_particle_set(dPa_name::ID_SCENE_80CB, &m2D0);
dComIfGp_particle_set(dPa_name::ID_SCENE_80CC, &m2D0);
dComIfGp_particle_set(dPa_name::ID_SCENE_80CE, &m2D0);
dComIfGp_particle_set(dPa_name::ID_SCENE_80DC, &m2D0);
dComIfGp_particle_set(dPa_name::ID_SCENE_80DD, &m2D0);
}
/* 00000378-00000398 .text CheckCreateHeap__FP10fopAc_ac_c */
static BOOL CheckCreateHeap(fopAc_ac_c*) {
/* Nonmatching */
static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
return ((daObj_Demo_Barrel_c*)a_this)->CreateHeap();
}
/* 00000398-00000538 .text CreateHeap__19daObj_Demo_Barrel_cFv */
void daObj_Demo_Barrel_c::CreateHeap() {
/* Nonmatching */
BOOL daObj_Demo_Barrel_c::CreateHeap() {
mpMorf = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectIDRes(M_arcname, DBARREL_BDL_KTARU_02), NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, DBARREL_BCK_02_TR_CD),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203);
if (mpMorf == NULL || mpMorf->getModel() == NULL) {
return FALSE;
}
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectIDRes(M_arcname, DBARREL_BCK_02_TR_CD), 0,
0.0f, 1.0f, 0.0f, -1.0f, NULL);
mpMorf->setFrame(mpMorf->getEndFrame() - 1.0f);
mpModel = mpMorf->getModel();
return TRUE;
}
cPhs_State daObj_Demo_Barrel_c::_create() {
#if VERSION == VERSION_DEMO
cPhs_State ret = dComIfG_resLoad(&mPhase, M_arcname);
if (ret == cPhs_COMPLEATE_e) {
fopAcM_SetupActor(this, daObj_Demo_Barrel_c);
#else
fopAcM_SetupActor(this, daObj_Demo_Barrel_c);
cPhs_State ret = dComIfG_resLoad(&mPhase, M_arcname);
if (ret == cPhs_COMPLEATE_e) {
#endif
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x22E0)) {
return cPhs_ERROR_e;
}
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
m2DC = 1;
m2DE = 0;
}
return ret;
}
/* 00000538-000005EC .text daObj_Demo_BarrelCreate__FPv */
static cPhs_State daObj_Demo_BarrelCreate(void*) {
/* Nonmatching */
static cPhs_State daObj_Demo_BarrelCreate(void* v_this) {
return ((daObj_Demo_Barrel_c*)v_this)->_create();
}
bool daObj_Demo_Barrel_c::_delete() {
dComIfG_resDeleteDemo(&mPhase, M_arcname);
return true;
}
/* 000005EC-0000061C .text daObj_Demo_BarrelDelete__FPv */
static BOOL daObj_Demo_BarrelDelete(void*) {
/* Nonmatching */
static BOOL daObj_Demo_BarrelDelete(void* v_this) {
return ((daObj_Demo_Barrel_c*)v_this)->_delete();
}
bool daObj_Demo_Barrel_c::_execute() {
if (demoActorID != 0) {
dDemo_actor_c* ac = dComIfGp_demo_getActor(demoActorID);
if (ac->checkEnable(dDemo_actor_c::ENABLE_UNK_e)) {
if ((m2DC == 1) && (ac->getPrm()->getId() == 1)) {
m2DC = 0;
dComIfGs_onCollect(3, 0);
dComIfGs_offCollect(0, 0);
dComIfGs_setSelectEquip(0, dItem_NONE_e);
setParticleHahen();
}
if (m2DE == 0 && ac->getPrm()->getId() == 2) {
setParticleSibuki();
m2DE = 1;
}
}
}
dDemo_setDemoData(this, dDemo_actor_c::ENABLE_ANM_FRAME_e | dDemo_actor_c::ENABLE_ANM_e | dDemo_actor_c::ENABLE_ROTATE_e | dDemo_actor_c::ENABLE_TRANS_e, mpMorf, "DBarrel");
mpModel->setBaseScale(scale);
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::XYZrotM(shape_angle.x, shape_angle.y, shape_angle.z);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
return false;
}
/* 0000061C-00000790 .text daObj_Demo_BarrelExecute__FPv */
static BOOL daObj_Demo_BarrelExecute(void*) {
/* Nonmatching */
static BOOL daObj_Demo_BarrelExecute(void* v_this) {
return ((daObj_Demo_Barrel_c*)v_this)->_execute();
}
bool daObj_Demo_Barrel_c::_draw() {
if (m2DC == 0) {
return false;
}
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
mpMorf->updateDL();
return true;
}
/* 00000790-00000814 .text daObj_Demo_BarrelDraw__FPv */
static BOOL daObj_Demo_BarrelDraw(void*) {
/* Nonmatching */
static BOOL daObj_Demo_BarrelDraw(void* v_this) {
return ((daObj_Demo_Barrel_c*)v_this)->_draw();
}
/* 00000814-0000081C .text daObj_Demo_BarrelIsDelete__FPv */
@@ -53,10 +153,8 @@ static BOOL daObj_Demo_BarrelIsDelete(void*) {
}
static actor_method_class daObj_Demo_BarrelMethodTable = {
(process_method_func)daObj_Demo_BarrelCreate,
(process_method_func)daObj_Demo_BarrelDelete,
(process_method_func)daObj_Demo_BarrelExecute,
(process_method_func)daObj_Demo_BarrelIsDelete,
(process_method_func)daObj_Demo_BarrelCreate, (process_method_func)daObj_Demo_BarrelDelete,
(process_method_func)daObj_Demo_BarrelExecute, (process_method_func)daObj_Demo_BarrelIsDelete,
(process_method_func)daObj_Demo_BarrelDraw,
};