From 617bc45ff84d05f966ed2435c2d15bb4cf410f0c Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Thu, 13 Mar 2025 10:02:17 +0000 Subject: [PATCH] d_a_obj_iron_stage ok --- .../rels/d_a_obj_iron_stageNP/splits.txt | 2 + .../rels/d_a_obj_iron_stageNP/symbols.txt | 27 ++++++++----- configure.py | 2 +- include/d/a/obj/d_a_obj_iron_stage.h | 12 ++++++ src/REL/d/a/obj/d_a_obj_iron_stage.cpp | 38 +++++++++++++++++++ 5 files changed, 71 insertions(+), 10 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_iron_stageNP/splits.txt b/config/SOUE01/rels/d_a_obj_iron_stageNP/splits.txt index 8e83dc13..c5b52ddd 100644 --- a/config/SOUE01/rels/d_a_obj_iron_stageNP/splits.txt +++ b/config/SOUE01/rels/d_a_obj_iron_stageNP/splits.txt @@ -11,3 +11,5 @@ REL/executor.c: REL/d/a/obj/d_a_obj_iron_stage.cpp: .text start:0x00000070 end:0x00000364 + .rodata start:0x00000000 end:0x0000001C + .data start:0x00000000 end:0x000000E8 diff --git a/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt b/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt index 6845765f..279393a3 100644 --- a/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_iron_stageNP/symbols.txt @@ -2,15 +2,24 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global _epilog = .text:0x00000030; // type:function size:0x2C scope:global _unresolved = .text:0x00000060; // type:function size:0x4 scope:global dAcOironStage_c_classInit__Fv = .text:0x00000070; // type:function size:0x64 -AcOironStage__initModels = .text:0x000000E0; // type:function size:0xF0 -AcOironStage__init = .text:0x000001D0; // type:function size:0xD0 -fn_362_2A0 = .text:0x000002A0; // type:function size:0x8 -fn_362_2B0 = .text:0x000002B0; // type:function size:0x8 -AcOironStage__draw = .text:0x000002C0; // type:function size:0x28 +createHeap__15dAcOironStage_cFv = .text:0x000000E0; // type:function size:0xF0 +create__15dAcOironStage_cFv = .text:0x000001D0; // type:function size:0xD0 +doDelete__15dAcOironStage_cFv = .text:0x000002A0; // type:function size:0x8 +actorExecute__15dAcOironStage_cFv = .text:0x000002B0; // type:function size:0x8 +draw__15dAcOironStage_cFv = .text:0x000002C0; // type:function size:0x28 __dt__15dAcOironStage_cFv = .text:0x000002F0; // type:function size:0x74 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_362_rodata_0 = .rodata:0x00000000; // type:object size:0x1C data:float -g_profile_OBJ_IRON_STAGE = .data:0x00000000; // type:object size:0x44 -lbl_362_data_44 = .data:0x00000044; // type:object size:0x24 -AcOironStage__vtable = .data:0x00000068; // type:object size:0x80 +@14058 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float +@14059 = .rodata:0x00000004; // type:object size:0x4 scope:local data:float +@14060 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float +@14061 = .rodata:0x0000000C; // type:object size:0x4 scope:local data:float +@14062 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float +@14063 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float +@14064 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float +g_profile_OBJ_IRON_STAGE = .data:0x00000000; // type:object size:0x10 +@14039 = .data:0x00000010; // type:object size:0xA scope:local data:string +@14040 = .data:0x0000001C; // type:object size:0x12 scope:local data:string +@14041 = .data:0x00000030; // type:object size:0x12 scope:local data:string +@14057 = .data:0x00000044; // type:object size:0x1D scope:local data:string +__vt__15dAcOironStage_c = .data:0x00000068; // type:object size:0x80 diff --git a/configure.py b/configure.py index 16e3edfc..44d40329 100644 --- a/configure.py +++ b/configure.py @@ -1454,7 +1454,7 @@ config.libs = [ Rel(NonMatching, "d_a_obj_impa_door", "REL/d/a/obj/d_a_obj_impa_door.cpp"), Rel(NonMatching, "d_a_obj_insect_island", "REL/d/a/obj/d_a_obj_insect_island.cpp"), Rel(NonMatching, "d_a_obj_into_hole", "REL/d/a/obj/d_a_obj_into_hole.cpp"), - Rel(NonMatching, "d_a_obj_iron_stage", "REL/d/a/obj/d_a_obj_iron_stage.cpp"), + Rel(Matching, "d_a_obj_iron_stage", "REL/d/a/obj/d_a_obj_iron_stage.cpp"), Rel(NonMatching, "d_a_obj_island_LOD", "REL/d/a/obj/d_a_obj_island_LOD.cpp"), Rel(Matching, "d_a_obj_island_nusi", "REL/d/a/obj/d_a_obj_island_nusi.cpp"), Rel( diff --git a/include/d/a/obj/d_a_obj_iron_stage.h b/include/d/a/obj/d_a_obj_iron_stage.h index d28905de..935ca30a 100644 --- a/include/d/a/obj/d_a_obj_iron_stage.h +++ b/include/d/a/obj/d_a_obj_iron_stage.h @@ -2,11 +2,23 @@ #define D_A_OBJ_IRON_STAGE_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/bg/d_bg_w.h" +#include "m/m3d/m_smdl.h" +#include "nw4r/g3d/res/g3d_resfile.h" class dAcOironStage_c : public dAcObjBase_c { public: dAcOironStage_c() {} + virtual int create() override; + virtual int doDelete() override; + virtual int draw() override; + virtual bool createHeap() override; virtual ~dAcOironStage_c() {} + virtual int actorExecute() override; + + nw4r::g3d::ResFile mResFile; + m3d::smdl_c mModel; + dBgW mCollision; private: }; diff --git a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp index 37f0bc7e..9ee35a1f 100644 --- a/src/REL/d/a/obj/d_a_obj_iron_stage.cpp +++ b/src/REL/d/a/obj/d_a_obj_iron_stage.cpp @@ -1,3 +1,41 @@ #include "d/a/obj/d_a_obj_iron_stage.h" +#include "d/col/bg/d_bg_s.h" +#include "f/f_base.h" + SPECIAL_ACTOR_PROFILE(OBJ_IRON_STAGE, dAcOironStage_c, fProfile::OBJ_IRON_STAGE, 0x1CE, 0, 3); + +bool dAcOironStage_c::createHeap() { + mResFile = nw4r::g3d::ResFile(getOarcResFile("IronStage")); + nw4r::g3d::ResMdl mdl = mResFile.GetResMdl("IronStage"); + TRY_CREATE(mModel.create(mdl, &heap_allocator, 0x120)); + cBgD_t *dzb = (cBgD_t *)getOarcFile("IronStage", "dzb/IronStage.dzb"); + PLC *plc = (PLC *)getOarcFile("IronStage", "dat/IronStage.plc"); + updateMatrix(); + mModel.setLocalMtx(mWorldMtx); + TRY_CREATE(!mCollision.Set(dzb, plc, cBgW::MOVE_BG_e, &mWorldMtx, &mScale)); + mCollision.Lock(); + return true; +} + +int dAcOironStage_c::create() { + CREATE_ALLOCATOR(dAcOironStage_c); + dBgS::GetInstance()->Regist(&mCollision, this); + mModel.setPriorityDraw(0x1C, 0x9); + boundingBox.Set(mVec3_c(-460.0f, -210.0f, -260.0f), mVec3_c(460.0f, 210.0f, 260.0f)); + mCullingDistance = 15000.0; + return SUCCEEDED; +} + +int dAcOironStage_c::doDelete() { + return SUCCEEDED; +} + +int dAcOironStage_c::actorExecute() { + return SUCCEEDED; +} + +int dAcOironStage_c::draw() { + drawModelType1(&mModel); + return SUCCEEDED; +}