From 0b394bb2542be0a2b1afaf7f84168e8d4fc2857b Mon Sep 17 00:00:00 2001 From: Swekka Date: Sun, 1 Jun 2025 19:51:51 +0200 Subject: [PATCH 1/3] d_a_obj_rope_base OK --- .../rels/d_a_obj_rope_baseNP/symbols.txt | 16 +++---- include/d/a/obj/d_a_obj_rope_base.h | 13 ++++++ src/REL/d/a/obj/d_a_obj_rope_base.cpp | 46 +++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_rope_baseNP/symbols.txt b/config/SOUE01/rels/d_a_obj_rope_baseNP/symbols.txt index d9db9810..ec2cd910 100644 --- a/config/SOUE01/rels/d_a_obj_rope_baseNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_rope_baseNP/symbols.txt @@ -2,15 +2,15 @@ _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 dAcOropeBase_c_classInit__Fv = .text:0x00000070; // type:function size:0x5C -fn_431_D0 = .text:0x000000D0; // type:function size:0xD0 -fn_431_1A0 = .text:0x000001A0; // type:function size:0xBC -fn_431_260 = .text:0x00000260; // type:function size:0x8 -fn_431_270 = .text:0x00000270; // type:function size:0x28 -fn_431_2A0 = .text:0x000002A0; // type:function size:0x28 +createHeap__14dAcOropeBase_cFv = .text:0x000000D0; // type:function size:0xD0 +create__14dAcOropeBase_cFv = .text:0x000001A0; // type:function size:0xBC +doDelete__14dAcOropeBase_cFv = .text:0x00000260; // type:function size:0x8 +actorExecute__14dAcOropeBase_cFv = .text:0x00000270; // type:function size:0x28 +draw__14dAcOropeBase_cFv = .text:0x000002A0; // type:function size:0x28 __dt__14dAcOropeBase_cFv = .text:0x000002D0; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_431_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float +lbl_431_rodata_0 = .rodata:0x00000000; // type:object size:0x18 scope:local data:float g_profile_OBJ_ROPE_BASE = .data:0x00000000; // type:object size:0x38 -lbl_431_data_38 = .data:0x00000038; // type:object size:0x20 -lbl_431_data_58 = .data:0x00000058; // type:object size:0x80 +lbl_431_data_38 = .data:0x00000038; // type:object size:0x20 scope:local +__vt__14dAcOropeBase_c = .data:0x00000058; // type:object size:0x80 diff --git a/include/d/a/obj/d_a_obj_rope_base.h b/include/d/a/obj/d_a_obj_rope_base.h index 8c43a7c1..87b60f90 100644 --- a/include/d/a/obj/d_a_obj_rope_base.h +++ b/include/d/a/obj/d_a_obj_rope_base.h @@ -2,13 +2,26 @@ #define D_A_OBJ_ROPE_BASE_H #include "d/a/obj/d_a_obj_base.h" +#include "m/m3d/m_smdl.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" class dAcOropeBase_c : public dAcObjBase_c { public: dAcOropeBase_c() {} virtual ~dAcOropeBase_c() {} + virtual bool createHeap() override; + virtual int create() override; + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int draw() override; + private: + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mMdl; + /* 0x350 */ mVec3_c mVec; + /* 0x35C */ bool mBool; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_rope_base.cpp b/src/REL/d/a/obj/d_a_obj_rope_base.cpp index 9431e1cf..c6dee2e9 100644 --- a/src/REL/d/a/obj/d_a_obj_rope_base.cpp +++ b/src/REL/d/a/obj/d_a_obj_rope_base.cpp @@ -1,3 +1,49 @@ #include "d/a/obj/d_a_obj_rope_base.h" +#include "d/a/obj/d_a_obj_base.h" +#include "f/f_base.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" +#include "nw4r/g3d/res/g3d_resmdl.h" +#include "nw4r/g3d/res/g3d_resnode.h" + SPECIAL_ACTOR_PROFILE(OBJ_ROPE_BASE, dAcOropeBase_c, fProfile::OBJ_ROPE_BASE, 0x216, 0, 3); + +bool dAcOropeBase_c::createHeap() { + void *data = getOarcResFile("PracticeWood"); + mResFile = nw4r::g3d::ResFile(data); + nw4r::g3d::ResMdl mdl = mResFile.GetResMdl("RopeBase"); + TRY_CREATE(mMdl.create(mdl, &heap_allocator, 0x120, 1, nullptr)); + updateMatrix(); + mMdl.setLocalMtx(mWorldMtx); + mMdl.calc(true); + nw4r::g3d::ResNode resNode = mdl.GetResNode("rope_loc"); + mMdl.getNodeWorldMtxMultVecZero(resNode.GetID(), mVec); + return true; +} + +int dAcOropeBase_c::create() { + CREATE_ALLOCATOR(dAcOropeBase_c); + updateMatrix(); + mMdl.setLocalMtx(mWorldMtx); + boundingBox.Set(mVec3_c(-525.0f, -0.0f, -500.0f), mVec3_c(-325.0f, 700.0f, -300.0f)); + return SUCCEEDED; +} + +int dAcOropeBase_c::doDelete() { + return SUCCEEDED; +} + +int dAcOropeBase_c::actorExecute() { + if (checkObjectProperty(2)) { + mBool = true; + } else { + mBool = false; + } + return SUCCEEDED; +} + +int dAcOropeBase_c::draw() { + drawModelType1(&mMdl); + return SUCCEEDED; +} From 86b30f6e45c02d2d6d56109b49ffae5f7a3fa44e Mon Sep 17 00:00:00 2001 From: Swekka Date: Sun, 1 Jun 2025 19:53:45 +0200 Subject: [PATCH 2/3] mark file as matching --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index e01004f4..605c72ac 100644 --- a/configure.py +++ b/configure.py @@ -2190,7 +2190,7 @@ config.libs = [ Rel(NonMatching, "d_a_obj_rock_sky", "REL/d/a/obj/d_a_obj_rock_sky.cpp"), Rel(NonMatching, "d_a_obj_roll_pillar", "REL/d/a/obj/d_a_obj_roll_pillar.cpp"), Rel(NonMatching, "d_a_obj_roll_rock", "REL/d/a/obj/d_a_obj_roll_rock.cpp"), - Rel(NonMatching, "d_a_obj_rope_base", "REL/d/a/obj/d_a_obj_rope_base.cpp"), + Rel(Matching, "d_a_obj_rope_base", "REL/d/a/obj/d_a_obj_rope_base.cpp"), Rel(NonMatching, "d_a_obj_rope_igaiga", "REL/d/a/obj/d_a_obj_rope_igaiga.cpp"), Rel( NonMatching, "d_a_obj_rotation_light", "REL/d/a/obj/d_a_obj_rotation_light.cpp" From d78c0bf0ae06b9127ef17f349d30d1dc39a68793 Mon Sep 17 00:00:00 2001 From: Swekka Date: Sun, 1 Jun 2025 20:27:29 +0200 Subject: [PATCH 3/3] improve variable naming --- include/d/a/obj/d_a_obj_rope_base.h | 4 ++-- src/REL/d/a/obj/d_a_obj_rope_base.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/d/a/obj/d_a_obj_rope_base.h b/include/d/a/obj/d_a_obj_rope_base.h index 87b60f90..53c232b0 100644 --- a/include/d/a/obj/d_a_obj_rope_base.h +++ b/include/d/a/obj/d_a_obj_rope_base.h @@ -20,8 +20,8 @@ public: private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mMdl; - /* 0x350 */ mVec3_c mVec; - /* 0x35C */ bool mBool; + /* 0x350 */ mVec3_c mRopePos; + /* 0x35C */ bool field_0x35C; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_rope_base.cpp b/src/REL/d/a/obj/d_a_obj_rope_base.cpp index c6dee2e9..cbd1f0f5 100644 --- a/src/REL/d/a/obj/d_a_obj_rope_base.cpp +++ b/src/REL/d/a/obj/d_a_obj_rope_base.cpp @@ -18,7 +18,7 @@ bool dAcOropeBase_c::createHeap() { mMdl.setLocalMtx(mWorldMtx); mMdl.calc(true); nw4r::g3d::ResNode resNode = mdl.GetResNode("rope_loc"); - mMdl.getNodeWorldMtxMultVecZero(resNode.GetID(), mVec); + mMdl.getNodeWorldMtxMultVecZero(resNode.GetID(), mRopePos); return true; } @@ -36,9 +36,9 @@ int dAcOropeBase_c::doDelete() { int dAcOropeBase_c::actorExecute() { if (checkObjectProperty(2)) { - mBool = true; + field_0x35C = true; } else { - mBool = false; + field_0x35C = false; } return SUCCEEDED; }