Merge pull request #283 from swekka/d_a_obj_grass_coil

d_a_obj_grass_coil OK

1 files changed, 32 insertions, 1 deletions

diff --git a/include/d/a/obj/d_a_obj_grass_coil.h b/include/d/a/obj/d_a_obj_grass_coil.h
index b557c3e0..db611207 100644
--- a/include/d/a/obj/d_a_obj_grass_coil.h
+++ b/include/d/a/obj/d_a_obj_grass_coil.h
@@ -2,6 +2,11 @@
 #define D_A_OBJ_GRASS_COIL_H
 
 #include "d/a/obj/d_a_obj_base.h"
+#include "d/col/cc/d_cc_d.h"
+#include "m/m3d/m_smdl.h"
+#include "m/m_angle.h"
+#include "m/m_vec.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
 #include "s/s_StateMgr.hpp"
 
@@ -10,10 +15,36 @@ public:
     dAcOgrassCoil_c() : mStateMgr(*this, sStateID::null) {}
     virtual ~dAcOgrassCoil_c() {}
 
+    virtual bool createHeap() override;
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
+
     STATE_FUNC_DECLARE(dAcOgrassCoil_c, Wait);
 
+    STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcOgrassCoil_c);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcOgrassCoil_c);
+    /* 0x330 */ nw4r::g3d::ResFile mResFile;
+    /* 0x334 */ m3d::smdl_c mMdl[2]; ///< Indexed by `mCut` to differentiate between noncut/cut models
+    /* 0x36C */ STATE_MGR_DECLARE(dAcOgrassCoil_c);
+    /* 0x3A8 */ dCcD_Cyl mCollider;
+    /* 0x4F8 */ mVec3_c mSpawnPos; ///< Spawn Position used for when an item is dropped
+    /* 0x504 */ mAng3_c mEffectRot;
+    /* 0x50A */ s16 mTargetRotX; ///< Used as target for swaying when disturbed
+    /* 0x50C */ s16 mTargetRotY; ///< Used as target for swaying when disturbed
+    /* 0x50E */ s16 mSwayAmt;    ///< Used to assist with the swaying when disturbed. Adjusts mTargetRotX
+    /* 0x510 */ mAng mSpawnRotY; ///< A copy of the spawned rotation so mRotation.y is free to adjust.
+                                 ///< The final Y-rotation is represented by `mSpawnRotY - mRotation.y`
+    /* 0x512 */ u8 _0x512;
+    /* 0x513 */ bool mCut;
+
+    static dCcD_SrcCyl sCylSrc;
+    static const u32 sCalcAngleRatio;
+    static const s16 sEffectRotIncrement;
+    static const float sSqDistThreshold;
+    static const u32 lbl_268_rodata_4C;
 };
 
 #endif