J3D debug (#3037)

* J3DGraphBase debug

* J3DGraphAnimator debug

* J3DGraphLoader debug

4 files changed, 18 insertions, 4 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index e3d8810c80..d5c0bc94c3 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -693,6 +693,17 @@ public:
     virtual s32 getKind() const { return 7; }
     virtual void getColor(u8, u16, GXColor*) const {}
 
+    u16 getAnmTableNum(u8 idx) {
+        J3D_ASSERT_RANGE(1333, idx < 2);
+        return mAnmTableNum[idx];
+    }
+
+    J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 p1, u16 p2) {
+        J3D_ASSERT_RANGE(1339, p1 < 2);
+        J3D_ASSERT_RANGE(1340, p2 < mAnmTableNum[p1]);
+        return mAnmVtxColorIndexData[p1] + p2;
+    }
+
     /* 0x0C */ u16 mAnmTableNum[2];
     /* 0x10 */ J3DAnmVtxColorIndexData* mAnmVtxColorIndexData[2];
 };  // Size: 0x18
@@ -897,7 +908,7 @@ public:
  */
 class J3DAnmVisibilityFull : public J3DAnmBase {
 public:
-    J3DAnmVisibilityFull() : J3DAnmBase(0) {
+    J3DAnmVisibilityFull() : J3DAnmBase() {
         mUpdateMaterialNum = 0;
         field_0xe = 0;
         mAnmTable = NULL;
diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/include/JSystem/J3DGraphAnimator/J3DCluster.h
index 83aec79dc1..969ad6ae71 100644
--- a/include/JSystem/J3DGraphAnimator/J3DCluster.h
+++ b/include/JSystem/J3DGraphAnimator/J3DCluster.h
@@ -32,7 +32,10 @@ public:
     }
 
     J3DDeformer* getDeformer() { return mDeformer; }
-    void setDeformer(J3DDeformer* deformer) { mDeformer = deformer; }
+    void setDeformer(J3DDeformer* deformer) {
+        J3D_ASSERT_NULLPTR(111, deformer);
+        mDeformer = deformer;
+    }
 
     /* 0x00 */ f32 mMaxAngle;
     /* 0x04 */ f32 mMinAngle;
diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index 53c93f810e..b4b3d5a1db 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -49,7 +49,7 @@ public:
     virtual void calc(J3DMtxBuffer*, Vec const&, f32 const (&)[3][4]);
     virtual ~J3DJointTree() {}
 
-    J3DModelHierarchy const* getHierarchy() { return mHierarchy; }
+    const J3DModelHierarchy* getHierarchy() const { return mHierarchy; }
     void setHierarchy(J3DModelHierarchy* hierarchy) { mHierarchy = hierarchy; }
     void setBasicMtxCalc(J3DMtxCalc* calc) { mBasicMtxCalc = calc; }
     u16 getWEvlpMtxNum() const { return mWEvlpMtxNum; }
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 7ae8ba2919..e4436ea064 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -45,7 +45,7 @@ public:
     J3DShape* getShapeNodePointer(u16 idx) const { return mShapeTable.getShapeNodePointer(idx); }
     J3DJoint* getJointNodePointer(u16 idx) const { return mJointTree.getJointNodePointer(idx); }
     J3DJointTree& getJointTree() { return mJointTree; }
-    J3DModelHierarchy const* getHierarchy() { return mJointTree.getHierarchy(); }
+    const J3DModelHierarchy* getHierarchy() const { return mJointTree.getHierarchy(); }
     void setHierarchy(J3DModelHierarchy* hierarchy) { mJointTree.setHierarchy(hierarchy); }
     void setBasicMtxCalc(J3DMtxCalc* calc) { mJointTree.setBasicMtxCalc(calc); }
     JUTNameTab* getJointName() const { return mJointTree.getJointName(); }