Work on J3DSkinDeform

5 files changed, 46 insertions, 15 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index dc74089af3..3697cdb62b 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -45,13 +45,14 @@ public:
     u16 getJointNum() const { return mJointNum; }
     u16 getDrawMtxNum() const { return mDrawMtxData.mEntryNum; }
     u8 getDrawMtxFlag(u16 idx) const { return mDrawMtxData.mDrawMtxFlag[idx]; }
-    u8 getDrawMtxIndex(u16 idx) const { return mDrawMtxData.mDrawMtxIndex[idx]; }
+    u16 getDrawMtxIndex(u16 idx) const { return mDrawMtxData.mDrawMtxIndex[idx]; }
     JUTNameTab* getJointName() const { return mJointName; }
     J3DJoint* getRootNode() { return mRootNode; }
     J3DJoint* getJointNodePointer(u16 idx) const { return mJointNodePointer[idx]; }
     J3DMtxCalc* getBasicMtxCalc() const { return mBasicMtxCalc; }
     Mtx& getInvJointMtx(s32 idx) const { return mInvJointMtx[idx]; }
     u32 getModelDataType() const { return mModelDataType; }
+    bool checkFlag(u32 flag) { return mFlags & flag; }
 
 private:
     /* 0x04 */ J3DModelHierarchy* mHierarchy;
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 80176968f8..d5610fc11b 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -79,6 +79,7 @@ public:
     J3DVertexBuffer* getVertexBuffer() const { return (J3DVertexBuffer*)&mVertexBuffer; }
     J3DMatPacket* getMatPacket(u16 idx) const { return &mMatPacket[idx]; }
     J3DShapePacket* getShapePacket(u16 idx) const { return &mShapePacket[idx]; }
+    J3DMtxBuffer* getMtxBuffer() const { return mMtxBuffer; }
     Mtx33* getBumpMtxPtr(int idx) const { return mMtxBuffer->getBumpMtxPtr(idx); }
     Mtx33* getNrmMtxPtr() const { return mMtxBuffer->getNrmMtxPtr(); }
     Mtx* getDrawMtxPtr() const { return mMtxBuffer->getDrawMtxPtr(); }
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 441b2fdebd..ca2d8ee971 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -34,6 +34,10 @@ public:
     J3DMaterial* getMaterialNodePointer(u16 idx) const {
         return mMaterialTable.getMaterialNodePointer(idx);
     }
+    u32 getVtxNum() const { return mVertexData.getVtxNum(); }
+    u32 getNrmNum() const { return mVertexData.getNrmNum(); }
+    u8 getDrawMtxFlag(u16 idx) const { return mJointTree.getDrawMtxFlag(idx); }
+    u16 getDrawMtxIndex(u16 idx) const { return mJointTree.getDrawMtxIndex(idx); }
     J3DShape* getShapeNodePointer(u16 idx) const { return mShapeTable.getShapeNodePointer(idx); }
     J3DJoint* getJointNodePointer(u16 idx) const { return mJointTree.getJointNodePointer(idx); }
     J3DJointTree& getJointTree() { return mJointTree; }
@@ -42,6 +46,9 @@ public:
     J3DTexture* getTexture() const { return mMaterialTable.getTexture(); }
     JUTNameTab* getTextureName() const { return mMaterialTable.getTextureName(); }
     u16 getWEvlpMtxNum() const { return mJointTree.getWEvlpMtxNum(); }
+    u16* getWEvlpMixMtxIndex() const { return mJointTree.getWEvlpMixIndex(); }
+    f32* getWEvlpMixWeight() const { return mJointTree.getWEvlpMixWeight(); }
+    u8 getWEvlpMixMtxNum(u16 idx) const { return mJointTree.getWEvlpMixMtxNum(idx); }
     u32 getModelDataType() const { return mJointTree.getModelDataType(); }
     void* getVtxPosArray() const { return mVertexData.getVtxPosArray(); }
     void* getVtxNrmArray() const { return mVertexData.getVtxNrmArray(); }
diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
index c709985d7c..4aece3b46d 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
@@ -26,11 +26,13 @@ public:
 
     MtxP getAnmMtx(int idx) const { return mpAnmMtx[idx]; }
     void setAnmMtx(int i, Mtx m) { PSMTXCopy(m, (MtxP)mpAnmMtx[i]); }
+    MtxP getWeightAnmMtx(int idx) const { return mpWeightEvlpMtx[idx]; }
 
     void setScaleFlag(int idx, u8 flag) { mpScaleFlagArr[idx] = flag; }
     u32* getCurrentViewNoPtr() { return &mCurrentViewNo; }
     u8* getScaleFlagArray() const { return mpScaleFlagArr; }
-    u8 getScaleFlag(u16 idx) const { return mpScaleFlagArr[idx]; }
+    u8 getScaleFlag(int idx) const { return mpScaleFlagArr[idx]; }
+    u8 getEnvScaleFlag(int idx) const { return mpEvlpScaleFlagArr[idx]; }
     Mtx** getDrawMtxPtrPtr() const { return mpDrawMtxArr[1]; }
     Mtx* getDrawMtxPtr() const { return mpDrawMtxArr[1][mCurrentViewNo]; }
     Mtx* getDrawMtx(u16 idx) const { return &mpDrawMtxArr[1][mCurrentViewNo][idx]; }
@@ -39,6 +41,7 @@ public:
     Mtx33* getNrmMtx(u16 idx) const { return &mpNrmMtxArr[1][mCurrentViewNo][idx]; }
     Mtx33*** getBumpMtxPtrPtr() const { return mpBumpMtxArr[1]; }
     Mtx33* getBumpMtxPtr(int idx) const { return mpBumpMtxArr[1][idx][mCurrentViewNo]; }
+    J3DJointTree* getJointTree() const { return mJointTree; }
 
     void swapDrawMtx() {
         Mtx* tmp = mpDrawMtxArr[0][mCurrentViewNo];
diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
index 63d138b1c2..520e0f67fd 100644
--- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
@@ -5,6 +5,7 @@
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
+#include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "dolphin/types.h"
 
 class J3DModel;
@@ -38,10 +39,10 @@ struct J3DSkinNList {
     /* 8032C85C */ void calcSkin_VtxPosF32(f32 (*)[4], void*, void*);
     /* 8032C8E4 */ void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*);
 
-    /* 0x00 */ int field_0x0;
-    /* 0x04 */ int field_0x4;
-    /* 0x08 */ int field_0x8;
-    /* 0x0C */ int field_0xc;
+    /* 0x00 */ u16* field_0x0;
+    /* 0x04 */ u16* field_0x4;
+    /* 0x08 */ f32* field_0x8;
+    /* 0x0C */ f32* field_0xc;
     /* 0x10 */ u16 field_0x10;
     /* 0x12 */ u16 field_0x12;
 };  // Size: 0x14
@@ -50,7 +51,7 @@ class J3DSkinDeform {
 public:
     /* 8032C96C */ J3DSkinDeform();
     /* 8032C9B0 */ void initSkinInfo(J3DModelData*);
-    /* 8032CF44 */ void initMtxIndexArray(J3DModelData*);
+    /* 8032CF44 */ int initMtxIndexArray(J3DModelData*);
     /* 8032D378 */ void changeFastSkinDL(J3DModelData*);
     /* 8032D5C4 */ void calcNrmMtx(J3DMtxBuffer*);
     /* 8032D738 */ void transformVtxPosNrm(J3DModelData*);
@@ -62,25 +63,32 @@ public:
     /* 8032DDB8 */ void deformVtxNrm_F32(J3DVertexBuffer*) const;
     /* 8032DEBC */ void deformVtxNrm_S16(J3DVertexBuffer*) const;
     /* 8032DFDC */ void deform(J3DModel*);
+    void setNrmMtx(int i, MtxP mtx) {
+        J3DPSMtx33CopyFrom34(mtx, (Mtx3P)mNrmMtx[i]);
+    }
+    Mtx3P getNrmMtx(int i) { return mNrmMtx[i]; }
+    void onFlag(u32 flag) { mFlags |= flag; }
+    void offFlag(u32 flag) { mFlags &= ~flag; }
+    bool checkFlag(u32 flag) { return mFlags & flag; }
 
     /* 8032E064 */ virtual void deform(J3DVertexBuffer*, J3DMtxBuffer*);
     /* 8032E1B0 */ virtual ~J3DSkinDeform();
 
-    static u8 sWorkArea_WEvlpMixMtx[4096];
-    static u8 sWorkArea_WEvlpMixWeight[4096];
-    static u8 sWorkArea_MtxReg[2048 + 8 /* padding */];
+    static u16* sWorkArea_WEvlpMixMtx[1024];
+    static f32* sWorkArea_WEvlpMixWeight[1024];
+    static u16 sWorkArea_MtxReg[1024 + 4 /* padding */];
 
 private:
-    /* 0x04 */ void** mPosData;
-    /* 0x08 */ void** field_0x8;
-    /* 0x0C */ void** field_0xc;
-    /* 0x10 */ Mtx** mNrmMtx;
+    /* 0x04 */ u16* mPosData;
+    /* 0x08 */ u16* mNrmData;
+    /* 0x0C */ Mtx* mPosMtx;
+    /* 0x10 */ Mtx33* mNrmMtx;
     /* 0x14 */ u32 mFlags;
     /* 0x18 */ u8 field_0x18;
     /* 0x19 */ u8 field_0x19;
     /* 0x1C */ int field_0x1c;
     /* 0x20 */ int field_0x20;
-    /* 0x24 */ J3DSkinNList** mSkinNList;
+    /* 0x24 */ J3DSkinNList* mSkinNList;
 };
 
 class J3DDeformer {
@@ -100,4 +108,15 @@ private:
     /* 0x10 */ u32 mFlags;
 };  // Size: 0x14
 
+inline void J3DFillZero32B(register void* param_0, register u32 param_1) {
+    asm {
+        srwi param_1, param_1, 5
+        mtctr param_1
+    lbl_8032D948:
+    	dcbz 0, param_0
+    	addi param_0, param_0, 0x20
+    	bdnz lbl_8032D948
+    }
+}
+
 #endif /* J3DSKINDEFORM_H */