diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-10-29 01:14:36 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2023-10-29 01:14:36 -0700 |
| commit | a3895538dd74e8a5f326802d4ffbf63d7c161824 (patch) | |
| tree | a13a38ae1e7670e66870c37c0004d0089f16917f /include/JSystem/J2DGraph | |
| parent | 77798e67066ccefdd3b3eaffa8870e60e12a5d8f (diff) | |
J2D work
Diffstat (limited to 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPicture.h | 9 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DTextBox.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index 89912640..20de10c0 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -29,14 +29,17 @@ public: virtual void drawSelf(f32 x, f32 y, Mtx* mtx); virtual void drawOut(f32, f32, f32, f32, f32, f32); virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32); + JUTTexture * getTexture(u8 idx) const { + return idx < mNumTexture ? mpTexture[idx] : NULL; + } void initiate(const ResTIMG*, const ResTLUT*); void private_initiate(const ResTIMG*, const ResTLUT*); void initinfo(); bool insert(const ResTIMG*, u8, f32); bool insert(const char*, u8, f32); bool remove(u8); - int changeTexture(const ResTIMG*, u8); - int changeTexture(const char*, u8); + const ResTIMG * changeTexture(const ResTIMG*, u8); + const ResTIMG * changeTexture(const char*, u8); void drawFullSet(f32, f32, f32, f32, J2DBinding, J2DMirror, bool, Mtx*); void draw(f32, f32, f32, f32, bool, bool, bool); void draw(f32 x, f32 y, bool, bool, bool) { @@ -87,7 +90,7 @@ public: private: /* 0x0CC */ JUTTexture* mpTexture[4]; /* 0x0DC */ u8 mNumTexture; - /* 0x0DD */ u8 field_0xdd; + /* 0x0DD */ u8 mValidTexture; /* 0x0DE */ u8 field_0xde; /* 0x0DF */ u8 field_0xdf; /* 0x0E0 */ f32 mBlendKonstColorF[4]; diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index 2ac26546..417a2eb3 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -66,7 +66,7 @@ public: virtual u16 getTypeID() { return 19; }; private: - /* 0xCC */ JUTResFont* mpFont; + /* 0xCC */ JUTFont* mpFont; /* 0xD0 */ JUtility::TColor mCharColor; /* 0xD4 */ JUtility::TColor mGradColor; /* 0xD8 */ f32 field_0xd8; |