J3DJoint OK

4 files changed, 10 insertions, 0 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index dcb89894ac..12f2da776c 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -24,6 +24,7 @@ public:
 
     static J3DMtxBuffer* getMtxBuffer() { return mMtxBuffer; }
     static J3DJoint* getJoint() { return mJoint; }
+    static void setJoint(J3DJoint* joint) { mJoint = joint; }
 
     static J3DMtxBuffer* mMtxBuffer;
     static J3DJoint* mJoint;
@@ -63,7 +64,11 @@ public:
     Vec* getMax() { return &mMax; }
     Vec* getMin() { return &mMin; }
     void setCallBack(J3DJointCallBack callback) { mCallBack = callback; }
+    J3DJointCallBack getCallBack() { return mCallBack; }
     void setMtxCalc(J3DMtxCalc* i_mtxCalc) { mMtxCalc = i_mtxCalc; }
+    J3DMtxCalc* getMtxCalc() { return mMtxCalc; }
+    J3DMtxCalc* getCurrentMtxCalc() { return mCurrentMtxCalc; };
+    J3DJoint* getChild() { return mChild; }
 
     static J3DMtxCalc* mCurrentMtxCalc;
 
diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
index b4577c07cf..7f179e151e 100644
--- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
@@ -75,6 +75,7 @@ public:
     inline void calcZRatio();
     void setNonSort() { mSortType = 5; }
     void setZSort() { mSortType = 2; }
+    void setZMtx(MtxP mtx) { mpZMtx = mtx; }
 
 public:
     /* 0x00 */ J3DPacket** mpBuf;
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 3988dcf5bf..dd973c96bd 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -64,6 +64,8 @@ public:
     GXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); }
     J3DFog* getFog() { return mPEBlock->getFog(); }
     J3DTexMtx* getTexMtx(u32 idx) { return mTexGenBlock->getTexMtx(idx); }
+    u16 getIndex() { return mIndex; }
+    bool isDrawModeOpaTexEdge() { return (mMaterialMode & 3) == 0; }
 
     void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
     void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); }
diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h
index 00fa7590f0..790e734825 100644
--- a/include/JSystem/J3DGraphBase/J3DPacket.h
+++ b/include/JSystem/J3DGraphBase/J3DPacket.h
@@ -102,6 +102,7 @@ public:
     void lock() { onFlag(LOCKED); }
     void unlock() { offFlag(LOCKED); }
     J3DTexMtxObj* getTexMtxObj() const { return mpTexMtxObj; }
+    bool isLocked() const { return checkFlag(1); }
 
 public:
     /* 0x10 */ u32 mFlags;
@@ -150,6 +151,7 @@ public:
     J3DShapePacket* getShapePacket() const { return mpShapePacket; }
     void setShapePacket(J3DShapePacket* packet) { mpShapePacket = packet; }
     void setInitShapePacket(J3DShapePacket* packet) { mpInitShapePacket = packet; }
+    void setMaterialAnmID(J3DMaterialAnm* materialAnm) { mpMaterialAnm = materialAnm; }
     bool isChanged() const { return mDiffFlag & 0x80000000; }
 
     virtual ~J3DMatPacket();