diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2025-04-09 16:45:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-09 13:45:30 -0700 |
| commit | c6f76e7240dde8bbcf40a88d6d88cf87cab616b4 (patch) | |
| tree | bf9afbb1c32e66f45bdba30f61a9e4f0d92f804a /include/JSystem/J3DGraphBase | |
| parent | 6672817e41064e04951ec28d51070b66fc8377ac (diff) | |
Various JSystem work (#2383)
* JKernel and JStudio cleanup
* JMessage cleanup
* JAudio cleanup
* JASBNKParser work
* functionvalue work
* fvb work
* J2D and J3D cleanup
* steal from tww
* J2DPictureEx mostly done
* fix build
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 7 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DTexture.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index ae838de450..6e6d20ef13 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -31,7 +31,8 @@ struct J3DGXColor : public GXColor { /* 8000E538 */ J3DGXColor() {} J3DGXColor(J3DGXColor const& other) { __memcpy(this, &other, sizeof(J3DGXColor)); } J3DGXColor(GXColor const& color) : GXColor(color) {} - J3DGXColor& operator=(const GXColor& color) { + // making color a reference breaks J3DColorBlockLightOff::initialize et al + J3DGXColor& operator=(GXColor color) { *(GXColor*)this = color; return *this; } @@ -1054,8 +1055,8 @@ public: /* 80317414 */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*) {} /* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx) {} /* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; } - /* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {} /* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {} + /* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {} /* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; } /* 8031726C */ virtual ~J3DIndBlock() {} }; @@ -1066,9 +1067,9 @@ public: */ class J3DIndBlockNull : public J3DIndBlock { public: - /* 803173A0 */ virtual void reset(J3DIndBlock*) {} /* 80317398 */ virtual void diff(u32) {} /* 8031739C */ virtual void load() {} + /* 803173A0 */ virtual void reset(J3DIndBlock*) {} /* 803173A4 */ virtual u32 getType() { return 'IBLN'; } /* 803173B0 */ virtual ~J3DIndBlockNull() {} }; diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 43a7c2edc2..3100e58ced 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -94,7 +94,7 @@ struct J3DTexCoord : public J3DTexCoordInfo { u8 getTexGenType() const { return mTexGenType; } u8 getTexGenSrc() const { return mTexGenSrc; } u8 getTexGenMtx() const { return mTexGenMtx; } - u16 getTexMtxReg() const { return mTexMtxReg & 0xff; } + u32 getTexMtxReg() const { return mTexMtxReg & 0xff; } void setTexGenMtx(u8 param_1) { mTexGenMtx = param_1; } void setTexMtxReg(u16 reg) { mTexMtxReg = reg; } J3DTexCoord& operator=(const J3DTexCoord& other) { |