Merge pull request #240 from TakaRikka/room

d_s_room / d_a_bg first pass

5 files changed, 29 insertions, 10 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index a3c6b90415..9034496b2c 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -368,6 +368,9 @@ public:
         calcTransform(getFrame(), param_0, pSRTInfo);
     }
 
+    u16 getUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx]; }
+    u16 getUpdateMaterialNum() const { return field_0x14 / 3; }
+
 private:
     /* 0x0C */ int field_0xc;
     /* 0x10 */ int field_0x10;
@@ -379,7 +382,7 @@ private:
     /* 0x20 */ int field_0x20;
     /* 0x24 */ int field_0x24;
     /* 0x28 */ u8 mUpdateTexMtxID[4];
-    /* 0x2C */ u16 mUpdateMaterialID[2];
+    /* 0x2C */ u16* mUpdateMaterialID;
     /* 0x30 */ JUTNameTab field_0x30;
     /* 0x40 */ int field_0x40;
     /* 0x44 */ u16 field_0x44;
@@ -427,6 +430,12 @@ public:
     /* 8032BD9C */ virtual ~J3DAnmTevRegKey();
     /* 8032BE24 */ virtual s32 getKind() const;
 
+    u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
+    u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; }
+
+    u16 getCRegUpdateMaterialID(u16 idx) const { return mCRegUpdateMaterialID[idx]; }
+    u16 getKRegUpdateMaterialID(u16 idx) const { return mKRegUpdateMaterialID[idx]; }
+
 private:
     /* 0x0C */ u16 mCRegUpdateMaterialNum;
     /* 0x0E */ u16 mKRegUpdateMaterialNum;
@@ -438,8 +447,10 @@ private:
     /* 0x1A */ u16 field_0x1a;
     /* 0x1C */ u16 field_0x1c;
     /* 0x1E */ u16 field_0x1e;
-    /* 0x20 */ u16 mCRegUpdateMaterialID[20];
-    /* 0x34 */ u16 mKRegUpdateMaterialID[20];
+    /* 0x20 */ u16* mCRegUpdateMaterialID;
+    /* 0x24 */ u8 field_0x24[0x34 - 0x24];
+    /* 0x34 */ u16* mKRegUpdateMaterialID;
+    /* 0x38 */ u8 field_0x38[0x48 - 0x38];
     /* 0x48 */ void* field_0x48;
     /* 0x4C */ void* field_0x4c;
     /* 0x50 */ int field_0x50;
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
index 2cbe551312..79ed0e592d 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
@@ -32,6 +32,8 @@ public:
     J3DTexture* getTexture() const { return mTexture; }
     JUTNameTab* getTextureName() const { return mTextureName; }
 
+    JUTNameTab* getMaterialName() const { return mMaterialName; }
+
     u16 getMaterialNum() const { return mMaterialNum; }
     bool isLocked() const { return field_0x1c == 1; }
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 1bc947fab4..766ae76a76 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -22,6 +22,7 @@ public:
     /* 8032617C */ virtual ~J3DModelData();
 
     J3DMaterialTable& getMaterialTable() { return mMaterialTable; }
+    JUTNameTab* getMaterialName() const { return mMaterialTable.getMaterialName(); }
     J3DVertexData& getVertexData() { return mVertexData; }
     u16 getShapeNum() const { return mShapeTable.getShapeNum(); }
     u16 getMaterialNum() const { return mMaterialTable.getMaterialNum(); }
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 3dae56cd03..0ab504da98 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -63,6 +63,8 @@ public:
     u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
 
     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); }
+    void setMaterialAnm(J3DMaterialAnm* i_anm) { mMaterialAnm = i_anm; }
 
 public:
     /* 0x04 */ J3DMaterial* mNext;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 3d26ef2d6b..ab571a668f 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -97,16 +97,19 @@ public:
     void setScaleFlagArray(u8* pScaleFlagArray) { mScaleFlagArray = pScaleFlagArray; }
     void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
     void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
+    void setTexMtxLoadType(u32 type) { mFlags = (mFlags & 0xFFFF0FFF) | type; }
     bool getNBTFlag() const { return mHasNBT; }
     u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
 
-    inline J3DMaterial* getMaterial() const { return mMaterial; }
-    inline u32 getIndex() const { return mIndex; }
-    inline u32 getPipeline() const { return (mFlags >> 2) & 0x07; }
-    inline u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
-    inline u32 getMtxGroupNum() const { return mMtxGroupNum; }
-    inline J3DShapeDraw* getShapeDraw(u32 idx) const { return mShapeDraw[idx]; }
-    inline J3DShapeMtx* getShapeMtx(u32 idx) const { return mShapeMtx[idx]; }
+    J3DMaterial* getMaterial() const { return mMaterial; }
+    u32 getIndex() const { return mIndex; }
+    u32 getPipeline() const { return (mFlags >> 2) & 0x07; }
+    u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
+    u32 getMtxGroupNum() const { return mMtxGroupNum; }
+    J3DShapeDraw* getShapeDraw(u32 idx) const { return mShapeDraw[idx]; }
+    J3DShapeMtx* getShapeMtx(u32 idx) const { return mShapeMtx[idx]; }
+    Vec* getMin() { return &mMin; }
+    Vec* getMax() { return &mMax; }
 
     static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }