summaryrefslogtreecommitdiff
path: root/include/JSystem
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2023-06-30 19:29:50 +0300
committerTal Hayon <talhayon1@gmail.com>2023-06-30 19:29:50 +0300
commitbf7e686ef72fd203c0bd9543c6cad8f8e8c54fda (patch)
treebf54b74c160e369764cf4d18fddd8729172387f2 /include/JSystem
parent7150d8e25de6baa4237c971ffa6ecfc7f03d9395 (diff)
Work on d_a_mirror
Diffstat (limited to 'include/JSystem')
-rw-r--r--include/JSystem/J3DGraphBase/J3DMatBlock.h10
-rw-r--r--include/JSystem/J3DGraphBase/J3DMaterial.h1
2 files changed, 6 insertions, 5 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index 73209b64a0..c7c28056f5 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -727,7 +727,7 @@ public:
/* 80317314 */ virtual s32 countDLSize();
virtual u32 getType() = 0;
/* 8000E0A0 */ virtual void setIndTexStageNum(u8);
- /* 8000DF7C */ virtual bool getIndTexStageNum() const;
+ /* 8000DF7C */ virtual u8 getIndTexStageNum() const;
/* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder);
/* 8031740C */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
/* 8000DF74 */ virtual bool getIndTexOrder(u32);
@@ -750,7 +750,7 @@ public:
/* 80317BDC */ virtual s32 countDLSize();
/* 80323390 */ virtual u32 getType();
/* 8032339C */ virtual void setIndTexStageNum(u8);
- /* 803233A4 */ virtual bool getIndTexStageNum() const;
+ /* 803233A4 */ virtual u8 getIndTexStageNum() const;
/* 803233AC */ virtual void setIndTexOrder(u32, J3DIndTexOrder);
/* 803233C0 */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
/* 803233D4 */ virtual bool getIndTexOrder(u32);
@@ -820,7 +820,7 @@ public:
/* 8000DFF0 */ virtual bool getAmbColor(u32);
/* 8000E0E0 */ virtual void setColorChanNum(u8);
/* 8031744C */ virtual void setColorChanNum(u8 const*);
- /* 8000E008 */ virtual bool getColorChanNum() const;
+ /* 8000E008 */ virtual u8 getColorChanNum() const;
/* 8000E0D8 */ virtual void setColorChan(u32, J3DColorChan const&);
/* 80317450 */ virtual void setColorChan(u32, J3DColorChan const*);
/* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32);
@@ -860,7 +860,7 @@ public:
/* 80322F50 */ virtual bool getAmbColor(u32);
/* 80322F70 */ virtual void setColorChanNum(u8);
/* 80322F64 */ virtual void setColorChanNum(u8 const*);
- /* 80322F78 */ virtual bool getColorChanNum() const;
+ /* 80322F78 */ virtual u8 getColorChanNum() const;
/* 80322F94 */ virtual void setColorChan(u32, J3DColorChan const&);
/* 80322F80 */ virtual void setColorChan(u32, J3DColorChan const*);
/* 80322FA8 */ virtual J3DColorChan* getColorChan(u32);
@@ -905,7 +905,7 @@ public:
/* 803231B0 */ virtual GXColor* getMatColor(u32);
/* 803231D0 */ virtual void setColorChanNum(u8);
/* 803231C4 */ virtual void setColorChanNum(u8 const*);
- /* 803231D8 */ virtual bool getColorChanNum() const;
+ /* 803231D8 */ virtual u8 getColorChanNum() const;
/* 803231F4 */ virtual void setColorChan(u32, J3DColorChan const&);
/* 803231E0 */ virtual void setColorChan(u32, J3DColorChan const*);
/* 80323208 */ virtual J3DColorChan* getColorChan(u32);
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index b2f67574c5..d3696d5a78 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -50,6 +50,7 @@ public:
J3DColorBlock* getColorBlock() const { return mColorBlock; }
J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; }
J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; }
+ J3DIndBlock* getIndBlock() const { return mIndBlock; }
J3DShape* getShape() { return mShape; }
J3DJoint* getJoint() { return mJoint; }
J3DMaterialAnm* getMaterialAnm() const {