From a4dc90c5ae9c0ec570a915d3dd9d4d061dd6412e Mon Sep 17 00:00:00 2001 From: Swekka Date: Sun, 22 Jun 2025 00:43:09 +0200 Subject: [PATCH] d_a_obj_oct_grass OK --- .../rels/d_a_obj_impa_doorNP/symbols.txt | 6 +- .../rels/d_a_obj_oct_grassNP/symbols.txt | 65 +++++++++------- configure.py | 2 +- include/d/a/obj/d_a_obj_oct_grass.h | 22 +++++- src/REL/d/a/obj/d_a_obj_oct_grass.cpp | 77 +++++++++++++++++++ 5 files changed, 139 insertions(+), 33 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_impa_doorNP/symbols.txt b/config/SOUE01/rels/d_a_obj_impa_doorNP/symbols.txt index 8798ffa7..b7c88acc 100644 --- a/config/SOUE01/rels/d_a_obj_impa_doorNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_impa_doorNP/symbols.txt @@ -40,10 +40,10 @@ isSameName__29sFStateID_c<14dAcOimpaDoor_c>CFPCc = .text:0x00000A20; // type:fun _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_421_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float scope:local +lbl_421_rodata_0 = .rodata:0x00000000; // type:object size:0x18 scope:local data:float g_profile_OBJ_IMPA_DOOR = .data:0x00000000; // type:object size:0x10 data:4byte lbl_421_data_10 = .data:0x00000010; // type:object size:0x8 scope:local -lbl_421_data_18 = .data:0x00000018; // type:object size:0x10 data:string scope:local +lbl_421_data_18 = .data:0x00000018; // type:object size:0x10 scope:local data:string lbl_421_data_28 = .data:0x00000028; // type:object size:0x20 scope:local lbl_421_data_48 = .data:0x00000048; // type:object size:0x80 lbl_421_data_C8 = .data:0x000000C8; // type:object size:0x30 @@ -53,4 +53,4 @@ lbl_421_data_140 = .data:0x00000140; // type:object size:0x5C lbl_421_data_19C = .data:0x0000019C; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_421_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local -lbl_421_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte scope:local +lbl_421_bss_18 = .bss:0x00000018; // type:object size:0x30 scope:local data:4byte diff --git a/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt b/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt index 876e5cf3..c5e34157 100644 --- a/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_oct_grassNP/symbols.txt @@ -8,16 +8,16 @@ __dt__27sFState_c<14dAcOOctGrass_c>Fv = .text:0x000001B0; // type:function size: __dt__30sFStateFct_c<14dAcOOctGrass_c>Fv = .text:0x00000210; // type:function size:0x6C __dt__83sStateMgr_c<14dAcOOctGrass_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000280; // type:function size:0xA0 __dt__53sFStateMgr_c<14dAcOOctGrass_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000320; // type:function size:0xA4 -AcOOctGrass__initModels = .text:0x000003D0; // type:function size:0xAC -AcOOctGrass__init = .text:0x00000480; // type:function size:0x130 +createHeap__14dAcOOctGrass_cFv = .text:0x000003D0; // type:function size:0xAC +create__14dAcOOctGrass_cFv = .text:0x00000480; // type:function size:0x130 changeState__83sStateMgr_c<14dAcOOctGrass_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x000005B0; // type:function size:0x10 -fn_289_5C0 = .text:0x000005C0; // type:function size:0x8 -fn_289_5D0 = .text:0x000005D0; // type:function size:0x8 -AcOOctGrass__draw = .text:0x000005E0; // type:function size:0x28 +doDelete__14dAcOOctGrass_cFv = .text:0x000005C0; // type:function size:0x8 +actorExecute__14dAcOOctGrass_cFv = .text:0x000005D0; // type:function size:0x8 +draw__14dAcOOctGrass_cFv = .text:0x000005E0; // type:function size:0x28 initializeState_Wait__14dAcOOctGrass_cFv = .text:0x00000610; // type:function size:0x4 executeState_Wait__14dAcOOctGrass_cFv = .text:0x00000620; // type:function size:0x4 finalizeState_Wait__14dAcOOctGrass_cFv = .text:0x00000630; // type:function size:0x4 -AcOOctGrass__spawnOcGrsL = .text:0x00000640; // type:function size:0x98 +spawnOcGrsL__14dAcOOctGrass_cFv = .text:0x00000640; // type:function size:0x98 __dt__14dAcOOctGrass_cFv = .text:0x000006E0; // type:function size:0xCC executeState__83sStateMgr_c<14dAcOOctGrass_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000007B0; // type:function size:0x10 getStateID__83sStateMgr_c<14dAcOOctGrass_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x000007C0; // type:function size:0x10 @@ -41,26 +41,37 @@ isSameName__29sFStateID_c<14dAcOOctGrass_c>CFPCc = .text:0x00000B00; // type:fun _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_289_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float +lbl_289_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local align:4 data:float +lbl_289_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local +lbl_289_rodata_8 = .rodata:0x00000008; // type:object size:0x4 scope:local +lbl_289_rodata_C = .rodata:0x0000000C; // type:object size:0x4 scope:local +lbl_289_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float +lbl_289_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local +lbl_289_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local g_profile_OBJ_OCT_GRASS = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_289_data_10 = .data:0x00000010; // type:object size:0xC -lbl_289_data_1C = .data:0x0000001C; // type:object size:0x10 -lbl_289_data_2C = .data:0x0000002C; // type:object size:0xC -lbl_289_data_38 = .data:0x00000038; // type:object size:0x10 -GRASS_OARCS = .data:0x00000048; // type:object size:0x10 -lbl_289_data_58 = .data:0x00000058; // type:object size:0x10 -lbl_289_data_68 = .data:0x00000068; // type:object size:0x10 -lbl_289_data_78 = .data:0x00000078; // type:object size:0x10 -lbl_289_data_88 = .data:0x00000088; // type:object size:0x10 -GRASS_CUT_MODELS = .data:0x00000098; // type:object size:0x10 -lbl_289_data_A8 = .data:0x000000A8; // type:object size:0x1C data:string -lbl_289_data_C4 = .data:0x000000C4; // type:object size:0xC -AcOOctGrass__vtable = .data:0x000000D0; // type:object size:0x80 -lbl_289_data_150 = .data:0x00000150; // type:object size:0x30 -lbl_289_data_180 = .data:0x00000180; // type:object size:0x30 -lbl_289_data_1B0 = .data:0x000001B0; // type:object size:0x18 -lbl_289_data_1C8 = .data:0x000001C8; // type:object size:0x5C -lbl_289_data_224 = .data:0x00000224; // type:object size:0x34 +lbl_289_data_10 = .data:0x00000010; // type:object size:0xC scope:local +lbl_289_data_1C = .data:0x0000001C; // type:object size:0x10 scope:local +lbl_289_data_2C = .data:0x0000002C; // type:object size:0xC scope:local +lbl_289_data_38 = .data:0x00000038; // type:object size:0x10 scope:local +GRASS_OARCS__14dAcOOctGrass_c = .data:0x00000048; // type:object size:0x10 +lbl_289_data_58 = .data:0x00000058; // type:object size:0x10 scope:local +lbl_289_data_68 = .data:0x00000068; // type:object size:0x10 scope:local +lbl_289_data_78 = .data:0x00000078; // type:object size:0x10 scope:local +lbl_289_data_88 = .data:0x00000088; // type:object size:0x10 scope:local +GRASS_CUT_MODELS__14dAcOOctGrass_c = .data:0x00000098; // type:object size:0x10 +lbl_289_data_A8 = .data:0x000000A8; // type:object size:0x1C scope:local data:string +lbl_289_data_C4 = .data:0x000000C4; // type:object size:0xC scope:local +__vt__14dAcOOctGrass_c = .data:0x000000D0; // type:object size:0x80 +__vt__53sFStateMgr_c<14dAcOOctGrass_c,20sStateMethodUsr_FI_c> = .data:0x00000150; // type:object size:0x30 +__vt__83sStateMgr_c<14dAcOOctGrass_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000180; // type:object size:0x30 +lbl_289_data_1B0 = .data:0x000001B0; // type:object size:0x18 scope:local +lbl_289_data_1C8 = .data:0x000001C8; // type:object size:0x18 scope:local +lbl_289_data_1E0 = .data:0x000001E0; // type:object size:0xC scope:local +lbl_289_data_1EC = .data:0x000001EC; // type:object size:0xC scope:local +lbl_289_data_1F8 = .data:0x000001F8; // type:object size:0xC scope:local +lbl_289_data_204 = .data:0x00000204; // type:object size:0x4 data:string +lbl_289_data_208 = .data:0x00000208; // type:object size:0x1C scope:local +__vt__29sFStateID_c<14dAcOOctGrass_c> = .data:0x00000224; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_289_bss_8 = .bss:0x00000008; // type:object size:0x10 -AcOOctGrass__StateID_Wait = .bss:0x00000018; // type:object size:0x30 data:4byte +lbl_289_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local +AcOOctGrass__StateID_Wait = .bss:0x00000018; // type:object size:0x30 scope:local data:4byte diff --git a/configure.py b/configure.py index 71c72273..aad168bd 100644 --- a/configure.py +++ b/configure.py @@ -2164,7 +2164,7 @@ config.libs = [ "d_a_obj_needle_underground", "REL/d/a/obj/d_a_obj_needle_underground.cpp", ), - Rel(NonMatching, "d_a_obj_oct_grass", "REL/d/a/obj/d_a_obj_oct_grass.cpp"), + Rel(Matching, "d_a_obj_oct_grass", "REL/d/a/obj/d_a_obj_oct_grass.cpp"), Rel( NonMatching, "d_a_obj_oct_grass_leaf", "REL/d/a/obj/d_a_obj_oct_grass_leaf.cpp" ), diff --git a/include/d/a/obj/d_a_obj_oct_grass.h b/include/d/a/obj/d_a_obj_oct_grass.h index 55366023..b60c2692 100644 --- a/include/d/a/obj/d_a_obj_oct_grass.h +++ b/include/d/a/obj/d_a_obj_oct_grass.h @@ -2,18 +2,36 @@ #define D_A_OBJ_OCT_GRASS_H #include "d/a/obj/d_a_obj_base.h" +#include "m/m3d/m_smdl.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOOctGrass_c : public dAcObjBase_c { public: dAcOOctGrass_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcOOctGrass_c() {} + virtual bool createHeap() override; + virtual int create() override; + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int draw() override; + + void spawnOcGrsL(); + STATE_FUNC_DECLARE(dAcOOctGrass_c, Wait); + void executeState() { + mStateMgr.executeState(); + } + private: - /* 0x??? */ STATE_MGR_DECLARE(dAcOOctGrass_c); + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mMdl; + /* 0x350 */ STATE_MGR_DECLARE(dAcOOctGrass_c); + + static const char *GRASS_OARCS[4]; + static const char *GRASS_CUT_MODELS[4]; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_oct_grass.cpp b/src/REL/d/a/obj/d_a_obj_oct_grass.cpp index c36f043a..ef7b8f67 100644 --- a/src/REL/d/a/obj/d_a_obj_oct_grass.cpp +++ b/src/REL/d/a/obj/d_a_obj_oct_grass.cpp @@ -1,9 +1,86 @@ #include "d/a/obj/d_a_obj_oct_grass.h" +#include "common.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/d_stage.h" +#include "f/f_base.h" +#include "f/f_profile_name.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" +#include "nw4r/g3d/res/g3d_resmdl.h" + SPECIAL_ACTOR_PROFILE(OBJ_OCT_GRASS, dAcOOctGrass_c, fProfile::OBJ_OCT_GRASS, 0x236, 0, 3); STATE_DEFINE(dAcOOctGrass_c, Wait); +const char *dAcOOctGrass_c::GRASS_OARCS[4] = { + "GrassOcta", + "GrassRollGrow", + "GrassGerm", + "GrassMain", +}; + +const char *dAcOOctGrass_c::GRASS_CUT_MODELS[4] = { + "GrassOctaCut", + "GrassRollCut", + "GrassGermCut", + "GrassMainCut", +}; + +bool dAcOOctGrass_c::createHeap() { + u8 typeIdx = getFromParams(0, 0xF); + void *data = getOarcResFile(GRASS_OARCS[typeIdx]); + mResFile = nw4r::g3d::ResFile(data); + if (typeIdx == 3) { + dStage_c::bindSkyCmnToResFile(&mResFile); + } + nw4r::g3d::ResMdl mdl = mResFile.GetResMdl(GRASS_CUT_MODELS[typeIdx]); + TRY_CREATE(mMdl.create(mdl, &heap_allocator, 0x120, 1, nullptr)); + return true; +} + +int dAcOOctGrass_c::create() { + CREATE_ALLOCATOR(dAcOOctGrass_c); + forwardAccel = 0.0f; + forwardMaxSpeed = -40.0f; + if ((params & 0xF) != 0) { + mMdl.setPriorityDraw(0x1C, 9); + } + updateMatrix(); + mMdl.setLocalMtx(mWorldMtx); + spawnOcGrsL(); + poscopy2 = position; + poscopy3 = position; + poscopy3.y += 20.0f; + mStateMgr.changeState(StateID_Wait); + boundingBox.Set(mVec3_c(-50.0f, -10.0f, -50.0f), mVec3_c(50.0f, 100.0f, 50.0f)); + return SUCCEEDED; +} + +int dAcOOctGrass_c::doDelete() { + return SUCCEEDED; +} + +int dAcOOctGrass_c::actorExecute() { + return SUCCEEDED; +} + +int dAcOOctGrass_c::draw() { + drawModelType1(&mMdl); + return SUCCEEDED; +} + void dAcOOctGrass_c::initializeState_Wait() {} void dAcOOctGrass_c::executeState_Wait() {} void dAcOOctGrass_c::finalizeState_Wait() {} + +void dAcOOctGrass_c::spawnOcGrsL() { + u32 type = getFromParams(0, 0xF); + if (type == 0xF) { + type = 0; + } + + dAcObjBase_c::create( + "OcGrsL", getRoomId(), type & 0xF, &position, nullptr, nullptr, getParams2_ignoreLower(), 0xFFFF, viewclip_index + ); +}