diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-31 14:17:26 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2022-12-31 19:32:56 -0800 |
| commit | 6557ac8cd707d3cb62619bff02dc90f45b20adad (patch) | |
| tree | 1711bfbfbacd209ea74cef1f78297edb28ed13ab /include/JSystem/J3DGraphBase | |
| parent | b95aed1512b85e4d8d66b4b2a234f4d60c4f34c0 (diff) | |
more J3DDrawBuffer
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 12 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMaterial.h | 1 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DPacket.h | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 5097825618..c489742c32 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -148,7 +148,7 @@ public: /* 8031730C */ virtual bool countDLSize(); /* 80323544 */ virtual void setTexNo(u32, u16 const*); /* 8000E0AC */ virtual void setTexNo(u32, u16); - /* 8000DF94 */ virtual void getTexNo(u32) const; + /* 8000DF94 */ virtual u32 getTexNo(u32) const; /* 80323548 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 8000E0BC */ virtual void setTevOrder(u32, J3DTevOrder); /* 8000DFB8 */ virtual bool getTevOrder(u32); @@ -211,7 +211,7 @@ public: /* 80317BB4 */ virtual s32 countDLSize(); /* 803229D0 */ virtual void setTexNo(u32, u16 const*); /* 803229C0 */ virtual void setTexNo(u32, u16); - /* 803229E4 */ virtual void getTexNo(u32) const; + /* 803229E4 */ virtual u32 getTexNo(u32) const; /* 80322A08 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 803229F4 */ virtual void setTevOrder(u32, J3DTevOrder); /* 80322A1C */ virtual void getTevOrder(u32); @@ -275,7 +275,7 @@ public: /* 80317BCC */ virtual s32 countDLSize(); /* 8032202C */ virtual void setTexNo(u32, u16 const*); /* 8032201C */ virtual void setTexNo(u32, u16); - /* 80322040 */ virtual void getTexNo(u32) const; + /* 80322040 */ virtual u32 getTexNo(u32) const; /* 80322064 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80322050 */ virtual void setTevOrder(u32, J3DTevOrder); /* 80322078 */ virtual void getTevOrder(u32); @@ -345,7 +345,7 @@ public: /* 80317BC4 */ virtual s32 countDLSize(); /* 803223F0 */ virtual void setTexNo(u32, u16 const*); /* 803223E0 */ virtual void setTexNo(u32, u16); - /* 80322404 */ virtual void getTexNo(u32) const; + /* 80322404 */ virtual u32 getTexNo(u32) const; /* 80322428 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80322414 */ virtual void setTevOrder(u32, J3DTevOrder); /* 8032243C */ virtual void getTevOrder(u32); @@ -415,7 +415,7 @@ public: /* 80317BD4 */ virtual s32 countDLSize(); /* 80321C60 */ virtual void setTexNo(u32, u16 const*); /* 80321C50 */ virtual void setTexNo(u32, u16); - /* 80321C74 */ virtual void getTexNo(u32) const; + /* 80321C74 */ virtual u32 getTexNo(u32) const; /* 80321C98 */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 80321C84 */ virtual void setTevOrder(u32, J3DTevOrder); /* 80321CAC */ virtual void getTevOrder(u32); @@ -485,7 +485,7 @@ public: /* 80317BBC */ virtual s32 countDLSize(); /* 803227B4 */ virtual void setTexNo(u32, u16 const*); /* 803227A4 */ virtual void setTexNo(u32, u16); - /* 803227C8 */ virtual void getTexNo(u32) const; + /* 803227C8 */ virtual u32 getTexNo(u32) const; /* 803227EC */ virtual void setTevOrder(u32, J3DTevOrder const*); /* 803227D8 */ virtual void setTevOrder(u32, J3DTevOrder); /* 80322800 */ virtual void getTevOrder(u32); diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index d14c2fca4e..3dae56cd03 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -60,6 +60,7 @@ public: } } J3DNBTScale* getNBTScale() const { return mTexGenBlock->getNBTScale(); } + u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); } void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); } diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index 6b21f537ba..00fa7590f0 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -150,7 +150,7 @@ public: J3DShapePacket* getShapePacket() const { return mpShapePacket; } void setShapePacket(J3DShapePacket* packet) { mpShapePacket = packet; } void setInitShapePacket(J3DShapePacket* packet) { mpInitShapePacket = packet; } - bool isChanged() const { return mDiffFlag < 0; } + bool isChanged() const { return mDiffFlag & 0x80000000; } virtual ~J3DMatPacket(); virtual int entry(J3DDrawBuffer*); |