J3DModelData 99%

just one regswap

3 files changed, 17 insertions, 17 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DShapeDraw.h b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
index 2293fd63..0dbd4dc8 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeDraw.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
@@ -5,12 +5,10 @@
 
 class J3DShapeDraw {
 public:
-    /* 80314924 */ u32 countVertex(u32);
-    /* 80314974 */ void addTexMtxIndexInDL(u32, u32, u32);
-    /* 80314ABC */ J3DShapeDraw(u8 const*, u32);
-    /* 80314AD4 */ void draw() const;
+    J3DShapeDraw(u8 const*, u32);
+    void draw() const;
 
-    /* 80314B00 */ virtual ~J3DShapeDraw();
+    virtual ~J3DShapeDraw() {}
 
     u8* getDisplayList() const { return (u8*)mDisplayList; }
     u32 getDisplayListSize() const { return mDisplayListSize; }
diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index 5435ed7d..4a9c0c1e 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -39,7 +39,7 @@ public:
     void loadMtxIndx_NCPU(int, u16) const;
     void loadMtxIndx_PNCPU(int, u16) const;
 
-    virtual ~J3DShapeMtx();
+    virtual ~J3DShapeMtx() {}
     virtual u32 getType() const;
     virtual u32 getUseMtxNum() const;
     virtual u32 getUseMtxIndex(u16) const;
@@ -64,7 +64,7 @@ public:
 
     J3DShapeMtxImm(u16 useMtxIndex) : J3DShapeMtx(useMtxIndex) {}
 
-    virtual ~J3DShapeMtxImm();
+    virtual ~J3DShapeMtxImm() {}
     virtual u32 getType() const;
     virtual void load() const;
     virtual void loadNrmMtx(int, u16) const;
@@ -82,7 +82,7 @@ class J3DShapeMtxMultiImm : public J3DShapeMtxImm {
 public:
     J3DShapeMtxMultiImm(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
 
-    virtual ~J3DShapeMtxMultiImm();
+    virtual ~J3DShapeMtxMultiImm() {}
     virtual u32 getType() const;
     virtual u32 getUseMtxNum() const;
     virtual u32 getUseMtxIndex(u16) const;
@@ -94,13 +94,13 @@ private:
     /* 0x8 */ u16* mUseMtxIndexTable;
 };
 
-class J3DShapeMtxConcatView : public J3DShapeMtx {
+class J3DShapeMtxConcatView : public J3DShapeMtxImm {
 public:
     typedef void (J3DShapeMtxConcatView::*MtxLoadConcatView)(int mtxNo, u16 index) const;
 
-    J3DShapeMtxConcatView(u16 useMtxIndex) : J3DShapeMtx(useMtxIndex) {}
+    J3DShapeMtxConcatView(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
 
-    virtual ~J3DShapeMtxConcatView();
+    virtual ~J3DShapeMtxConcatView() {}
     virtual u32 getType() const;
     virtual void load() const;
     virtual void loadNrmMtx(int, u16) const;
@@ -120,7 +120,7 @@ class J3DShapeMtxBBoardImm : public J3DShapeMtxImm {
 public:
     J3DShapeMtxBBoardImm(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
 
-    virtual ~J3DShapeMtxBBoardImm();
+    virtual ~J3DShapeMtxBBoardImm() {}
     virtual u32 getType() const;
     virtual void load() const;
 };
@@ -129,7 +129,7 @@ class J3DShapeMtxYBBoardImm : public J3DShapeMtxImm {
 public:
     J3DShapeMtxYBBoardImm(u16 useMtxIndex) : J3DShapeMtxImm(useMtxIndex) {}
 
-    virtual ~J3DShapeMtxYBBoardImm();
+    virtual ~J3DShapeMtxYBBoardImm() {}
     virtual u32 getType() const;
     virtual void load() const;
 };
@@ -138,7 +138,7 @@ class J3DShapeMtxYBBoardConcatView : public J3DShapeMtxConcatView {
 public:
     J3DShapeMtxYBBoardConcatView(u16 useMtxIndex) : J3DShapeMtxConcatView(useMtxIndex) {}
 
-    virtual ~J3DShapeMtxYBBoardConcatView();
+    virtual ~J3DShapeMtxYBBoardConcatView() {}
     virtual u32 getType() const;
     virtual void load() const;
 };
@@ -147,7 +147,7 @@ class J3DShapeMtxBBoardConcatView : public J3DShapeMtxConcatView {
 public:
     J3DShapeMtxBBoardConcatView(u16 useMtxIndex) : J3DShapeMtxConcatView(useMtxIndex) {}
 
-    virtual ~J3DShapeMtxBBoardConcatView();
+    virtual ~J3DShapeMtxBBoardConcatView() {}
     virtual u32 getType() const;
     virtual void load() const;
 };
@@ -157,7 +157,7 @@ public:
     J3DShapeMtxMulti(u16 useMtxIndex, u16 useMtxNum, u16* useMtxIndexTable)
         : J3DShapeMtx(useMtxIndex), mUseMtxNum(useMtxNum), mUseMtxIndexTable(useMtxIndexTable) {}
 
-    virtual ~J3DShapeMtxMulti();
+    virtual ~J3DShapeMtxMulti() {}
     virtual u32 getType() const;
     virtual u32 getUseMtxNum() const;
     virtual u32 getUseMtxIndex(u16) const;
@@ -175,7 +175,7 @@ public:
         : J3DShapeMtxConcatView(useMtxIndex), mUseMtxNum(useMtxNum),
           mUseMtxIndexTable(useMtxIndexTable) {}
 
-    virtual ~J3DShapeMtxMultiConcatView();
+    virtual ~J3DShapeMtxMultiConcatView() {}
     virtual u32 getType() const;
     virtual u32 getUseMtxNum() const;
     virtual u32 getUseMtxIndex(u16) const;
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 5598f491..f6252a53 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -24,6 +24,8 @@ public:
     J3DVertexData();
     ~J3DVertexData();
 
+    inline void clear() { mPacketNum = 0; }
+
     void* getVtxPosArray() const { return mVtxPosArray; }
     void* getVtxNrmArray() const { return mVtxNrmArray; }
     GXColor* getVtxColorArray(u8 idx) const { return mVtxColorArray[idx]; }