d_camera / m_Do_ext / d_particle + minor various wip (#210)

include/JSystem/J3DGraphAnimator/J3DJoint.h

@@ -63,6 +63,7 @@ public:
     Vec* getMax() { return &mMax; }
     Vec* getMin() { return &mMin; }
     void setCallBack(J3DJointCallBack callback) { mCallBack = callback; }
+    void setMtxCalc(J3DMtxCalc* i_mtxCalc) { mMtxCalc = i_mtxCalc; }
 
     static J3DMtxCalc* mCurrentMtxCalc;
 

include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h

@@ -33,6 +33,7 @@ public:
     JUTNameTab* getTextureName() const { return mTextureName; }
 
     u16 getMaterialNum() const { return mMaterialNum; }
+    bool isLocked() const { return field_0x1c == 1; }
 
 private:
     /* 0x04 */ u16 mMaterialNum;

include/JSystem/J3DGraphAnimator/J3DModel.h

@@ -28,12 +28,16 @@ typedef void (*J3DCalcCallBack)(J3DModel*, u32 timing);
 
 class J3DModel {
 public:
+    J3DModel() {
+        initialize();
+    }
+
     /* 800CFFF4 */ void setBaseTRMtx(f32 (*)[4]);
     /* 80327100 */ void initialize();
     /* 80327184 */ s32 entryModelData(J3DModelData*, u32, u32);
     /* 80327300 */ s32 createShapePacket(J3DModelData*);
     /* 803273CC */ s32 createMatPacket(J3DModelData*, u32);
-    /* 803275FC */ void newDifferedDisplayList(u32);
+    /* 803275FC */ s32 newDifferedDisplayList(u32);
     /* 8032767C */ void lock();
     /* 803276B4 */ void unlock();
     /* 803279A0 */ void diff();
@@ -60,6 +64,9 @@ public:
     void onFlag(u32 flag) { mFlags |= flag; }
     void offFlag(u32 flag) { mFlags &= ~flag; }
     bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; }
+
+    bool isCpuSkinningOn() const { return (mFlags & 4) && (mFlags & 8); }
+
     Mtx& getBaseTRMtx() { return mBaseTransformMtx; }
     void i_setBaseTRMtx(Mtx m) { PSMTXCopy(m, mBaseTransformMtx); }
     u32 getMtxCalcMode() const { return mFlags & 0x03; }
@@ -67,8 +74,10 @@ public:
     J3DShapePacket* getShapePacket(u16 idx) const { return &mShapePacket[idx]; }
     Mtx33* getBumpMtxPtr(int idx) const { return mMtxBuffer->getBumpMtxPtr(idx); }
     Mtx33* getNrmMtxPtr() const { return mMtxBuffer->getNrmMtxPtr(); }
+    Mtx* getDrawMtxPtr() const { return mMtxBuffer->getDrawMtxPtr(); }
     void setBaseScale(const Vec& scale) { mBaseScale = scale; }
     void setUserArea(u32 area) { mUserArea = area; }
+    u32 getUserArea() const { return mUserArea; }
     Vec* getBaseScale() { return &mBaseScale; }
 
     // is there a better way to handle inlines with same name as non-inlines?

include/JSystem/J3DGraphAnimator/J3DModelData.h

@@ -43,6 +43,7 @@ public:
     bool checkFlag(u32 flag) const { return !!(mFlags & flag); }
     bool checkBumpFlag() const { return mbHasBumpArray; }
     bool checkBBoardFlag() const { return mbHasBillboard == 1; }
+    bool isLocked() { return mMaterialTable.isLocked(); }
     void entryTexMtxAnimator(J3DAnmTextureSRTKey* anm) { mMaterialTable.entryTexMtxAnimator(anm); }
     void entryTevRegAnimator(J3DAnmTevRegKey* anm) { mMaterialTable.entryTevRegAnimator(anm); }
     int removeTexNoAnimator(J3DAnmTexPattern* anm) {

include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h

@@ -30,11 +30,24 @@ public:
     u32* getCurrentViewNoPtr() { return &mCurrentViewNo; }
     u8* getScaleFlagArray() const { return mScaleFlagArray; }
     Mtx** getDrawMtxPtrPtr() const { return mpDrawMtxArr; }
+    Mtx* getDrawMtxPtr() const { return mpDrawMtxArr[mCurrentViewNo]; }
     Mtx33** getNrmMtxPtrPtr() const { return mpNrmMtxArr; }
     Mtx33* getNrmMtxPtr() const { return mpNrmMtxArr[mCurrentViewNo]; }
     Mtx33** getBumpMtxPtrPtr() const { return mpBumpMtxArr; }
     Mtx33* getBumpMtxPtr(int idx) const { return mpBumpMtxArr[idx]; }
 
+    void swapDrawMtx() {
+        Mtx* tmp = mpOldDrawMtxArr[mCurrentViewNo];
+        mpOldDrawMtxArr[mCurrentViewNo] = mpDrawMtxArr[mCurrentViewNo];
+        mpDrawMtxArr[mCurrentViewNo] = tmp;
+    }
+
+    void swapNrmMtx() {
+        Mtx33* tmp = mpOldNrmMtxArr[mCurrentViewNo];
+        mpOldNrmMtxArr[mCurrentViewNo] = mpNrmMtxArr[mCurrentViewNo];
+        mpNrmMtxArr[mCurrentViewNo] = tmp;
+    }
+
     static Mtx sNoUseDrawMtx;
     static Mtx33 sNoUseNrmMtx;
     static Mtx* sNoUseDrawMtxPtr;
@@ -60,4 +73,7 @@ public:
     /* 803283B4 */ virtual ~J3DMtxBuffer();
 };
 
+void J3DCalcViewBaseMtx(f32 (*param_0)[4], Vec const& param_1, f32 const (&param_2)[3][4],
+                            f32 (*param_3)[4]);
+
 #endif /* J3DMTXBUFFER_H */