d_a_sail amendment

zeldaret · Sep 8, 2024 · 06e8f92 · 06e8f92
1 parent 86ed152
commit 06e8f92
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 99 deletions.
diff --git a/include/d/actor/d_a_sail.h b/include/d/actor/d_a_sail.h
@@ -15,26 +15,27 @@ class daSail_packet_c : public J3DPacket {
         m1C36 = 0;
         m1C3B = 1;
     }
-    
-    void getMtx() {}
-    void getNrm() {}
-    void getPos() {}
-    void getPosSpd() {}
-    void getStickMtx() {}
-    void getTexMtx() {}
-    void setTevStr(dKy_tevstr_c*) {}
+
+    Mtx* getMtx() { return &mMtx; }
+    cXyz* getNrm() { return m0C74 + (0x54 * m1C3A); }
+    cXyz* getPos() { return m00A4 + (0x54 * m1C3A); }
+    cXyz* getPosSpd() { return m0884; }
+    Mtx* getStickMtx() { return &mStickMtx; }
+    Mtx* getTexMtx() { return &mTexMtx; }
+    void setTevStr(dKy_tevstr_c* tevStr) { mTevStr = tevStr; }
 
     void setCorrectNrmAngle(s16, f32);
     void setNrmMtx();
     void setBackNrm();
     void setNrmVtx(cXyz*, int, int);
     virtual void draw();
+    virtual ~daSail_packet_c() {}
 
 public:
-    /* 0x0010 */ Mtx m0010;
-    /* 0x0040 */ Mtx m0040;
-    /* 0x0070 */ Mtx m0070;
-    /* 0x00A0 */ dKy_tevstr_c *mA0;
+    /* 0x0010 */ Mtx mMtx;
+    /* 0x0040 */ Mtx mTexMtx;
+    /* 0x0070 */ Mtx mStickMtx;
+    /* 0x00A0 */ dKy_tevstr_c* mTevStr;
     /* 0x00A4 */ cXyz m00A4[0x54 * 2];
     /* 0x0884 */ cXyz m0884[0x54];
     /* 0x0C74 */ cXyz m0C74[0x54 * 2];
@@ -44,29 +45,19 @@ class daSail_packet_c : public J3DPacket {
     /* 0x1C38 */ s16 m1C38;
     /* 0x1C3A */ u8 m1C3A;
     /* 0x1C3B */ u8 m1C3B;
-    /* 0x1C3C */ J3DModel* m1C3C;
+    /* 0x1C3C */ J3DModel* mStickModel;
     /* 0x1C40 */ s32 m1C40;
     /* 0x1C44 */ f32 m1C44;
     /* 0x1C48 */ f32 m1C48;
     /* 0x1C4C */ f32 m1C4C;
     /* 0x1C50 */ s16 m1C50;
     /* 0x1C52 */ s16 m1C52;
-
-    inline Mtx *get_m0010() { return &this->m0010; }
-    inline Mtx *get_m0070() { return &this->m0070; }
-
-    inline cXyz* get_pos(s32 idx) {
-        return this->m00A4 + 0x54 * this->m1C3A + 0x54 * idx;
-    }
-    inline cXyz* get_nrm1(s32 idx) {
-        return this->m0C74 + 0x54 * this->m1C3A + 0x54 * idx;
-    }
-    inline cXyz* get_nrm2(s32 idx) {
-        return this->m1454 + 0x54 * this->m1C3A + 0x54 * idx;
-    }
 };
 
 class sail_class : public fopAc_ac_c {
+public:
+    sail_class() {}
+
 public:
     /* 0x0290 */ request_of_phase_process_class mClothPhase;
     /* 0x0298 */ request_of_phase_process_class mKaizokusenPhase;