Merge pull request #196 from swekka/d_a_obj_blade

d_a_obj_blade OK

config/SOUE01/rels/d_a_obj_bladeNP/symbols.txt

@@ -2,18 +2,18 @@ _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
 dAcOblade_c_classInit__Fv = .text:0x00000070; // type:function size:0x90
-fn_382_100 = .text:0x00000100; // type:function size:0x98
-fn_382_1A0 = .text:0x000001A0; // type:function size:0xC4
-fn_382_270 = .text:0x00000270; // type:function size:0x8
-fn_382_280 = .text:0x00000280; // type:function size:0x30
-fn_382_2B0 = .text:0x000002B0; // type:function size:0x28
+createHeap__11dAcOblade_cFv = .text:0x00000100; // type:function size:0x98
+create__11dAcOblade_cFv = .text:0x000001A0; // type:function size:0xC4
+doDelete__11dAcOblade_cFv = .text:0x00000270; // type:function size:0x8
+actorExecute__11dAcOblade_cFv = .text:0x00000280; // type:function size:0x30
+draw__11dAcOblade_cFv = .text:0x000002B0; // type:function size:0x28
 __dt__11dAcOblade_cFv = .text:0x000002E0; // type:function size:0x68
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
-lbl_382_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float
-lbl_382_rodata_4 = .rodata:0x00000004; // type:object size:0x4 align:4 data:float
+lbl_382_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float
+lbl_382_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float
 g_profile_OBJ_BLADE = .data:0x00000000; // type:object size:0x10
-lbl_382_data_10 = .data:0x00000010; // type:object size:0x10 data:string
-lbl_382_data_20 = .data:0x00000020; // type:object size:0x10
-lbl_382_data_30 = .data:0x00000030; // type:object size:0x20
-lbl_382_data_50 = .data:0x00000050; // type:object size:0x80
+lbl_382_data_10 = .data:0x00000010; // type:object size:0x10 scope:local data:string
+lbl_382_data_20 = .data:0x00000020; // type:object size:0x10 scope:local
+lbl_382_data_30 = .data:0x00000030; // type:object size:0x20 scope:local
+__vt__11dAcOblade_c = .data:0x00000050; // type:object size:0x80

configure.py

@@ -1959,7 +1959,7 @@ config.libs = [
     ),
     Rel(Matching, "d_a_obj_bird_sp", "REL/d/a/obj/d_a_obj_bird_sp.cpp"),
     Rel(Matching, "d_a_obj_bird_statue", "REL/d/a/obj/d_a_obj_bird_statue.cpp"),
-    Rel(NonMatching, "d_a_obj_blade", "REL/d/a/obj/d_a_obj_blade.cpp"),
+    Rel(Matching, "d_a_obj_blade", "REL/d/a/obj/d_a_obj_blade.cpp"),
     Rel(NonMatching, "d_a_obj_blast_rock", "REL/d/a/obj/d_a_obj_blast_rock.cpp"),
     Rel(NonMatching, "d_a_obj_block_rope", "REL/d/a/obj/d_a_obj_block_rope.cpp"),
     Rel(

include/d/a/obj/d_a_obj_blade.h

@@ -2,13 +2,23 @@
 #define D_A_OBJ_BLADE_H
 
 #include "d/a/obj/d_a_obj_base.h"
+#include "m/m3d/m_anmmdl.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 
 class dAcOblade_c : public dAcObjBase_c {
 public:
     dAcOblade_c() {}
     virtual ~dAcOblade_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::mdlAnmChr mMdl;
 };
 
 #endif

src/REL/d/a/obj/d_a_obj_blade.cpp

@@ -1,3 +1,42 @@
 #include "d/a/obj/d_a_obj_blade.h"
 
+#include "d/a/obj/d_a_obj_base.h"
+#include "d/d_stage.h"
+#include "f/f_base.h"
+#include "m/m_vec.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
+#include "toBeSorted/arc_managers/current_stage_arc_manager.h"
+
 SPECIAL_ACTOR_PROFILE(OBJ_BLADE, dAcOblade_c, fProfile::OBJ_BLADE, 0x1E4, 0, 4);
+
+bool dAcOblade_c::createHeap() {
+    void *data = CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres");
+    mResFile = nw4r::g3d::ResFile(data);
+    dStage_c::bindStageResToFile(&mResFile);
+    dStage_c::bindSkyCmnToResFile(&mResFile);
+    TRY_CREATE(mMdl.create(data, "StageF000Blade", "StageF000Blade", &heap_allocator, 0x120));
+    return true;
+}
+
+int dAcOblade_c::create() {
+    CREATE_ALLOCATOR(dAcOblade_c);
+    mMdl.setAnm("StageF000Blade", m3d::PLAY_MODE_4);
+    updateMatrix();
+    mMdl.getModel().setLocalMtx(mWorldMtx);
+    boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f));
+    return SUCCEEDED;
+}
+
+int dAcOblade_c::doDelete() {
+    return SUCCEEDED;
+}
+
+int dAcOblade_c::actorExecute() {
+    mMdl.play();
+    return SUCCEEDED;
+}
+
+int dAcOblade_c::draw() {
+    drawModelType1(&mMdl.getModel());
+    return SUCCEEDED;
+}