mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-28 11:10:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

more misc. cleanup (#2232)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-31 20:36:11 -04:00
committed by GitHub
parent 30777a85b5
commit 09423b6fa0
121 changed files with 2254 additions and 17343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DAnimation.h
+1 -5
View File
@@ -151,12 +151,8 @@ public:
mTranslateValues = pTranslateValues;
mKind = KIND_TRANSFORM;
}
#ifdef __dt__15J2DAnmTransformFv_DEFINED
/* 80184370 */ virtual ~J2DAnmTransform();
#else
/* 80184370 */ virtual ~J2DAnmTransform() {}
#endif
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const;
/* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const; // {} (should be inline)
/* 0x10 */ f32* mScaleValues;
/* 0x14 */ s16* mRotationValues;
include/JSystem/J2DGraph/J2DPane.h
+8 -2
View File
@@ -88,13 +88,19 @@ public:
/* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode);
/* vt 0x24 */ virtual void setAlpha(u8);
/* vt 0x28 */ virtual bool setConnectParent(bool connected);
/* vt 0x2C */ virtual void calcMtx();
/* vt 0x2C */ virtual void calcMtx() {
if (mPaneTree.getParent() != NULL) {
makeMatrix(mTranslateX, mTranslateY);
}
}
/* vt 0x30 */ virtual void update();
/* vt 0x34 */ virtual void drawSelf(f32 arg1, f32 arg2);
/* vt 0x38 */ virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx);
/* vt 0x3C */ virtual J2DPane* search(u64 tag);
/* vt 0x40 */ virtual J2DPane* searchUserInfo(u64 tag);
/* vt 0x44 */ virtual void makeMatrix(f32, f32);
/* vt 0x44 */ virtual void makeMatrix(f32 a, f32 b) {
makeMatrix(a, b, -mBounds.i.x, -mBounds.i.y);
}
/* vt 0x48 */ virtual void makeMatrix(f32 a, f32 b, f32 c, f32 d);
/* vt 0x4C */ virtual bool isUsed(const ResTIMG* timg);
/* vt 0x50 */ virtual bool isUsed(const ResFONT* font);
include/JSystem/J2DGraph/J2DPicture.h
+13 -3
View File
@@ -106,9 +106,19 @@ public:
/* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
/* 800539DC */ virtual JUTTexture* getTexture(u8) const;
/* 802FF634 */ virtual u8 getTextureCount() const;
/* 80053C6C */ virtual bool setBlack(JUtility::TColor);
/* 80053C44 */ virtual bool setWhite(JUtility::TColor);
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white);
/* 80053C6C */ virtual bool setBlack(JUtility::TColor i_black) {
mBlack = i_black;
return true;
}
/* 80053C44 */ virtual bool setWhite(JUtility::TColor i_white) {
mWhite = i_white;
return true;
}
/* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
mBlack = i_black;
mWhite = i_white;
return true;
}
/* 801DFA4C */ virtual JUtility::TColor getBlack() const;
/* 801DFA40 */ virtual JUtility::TColor getWhite() const;
/* 8025603C */ virtual J2DMaterial* getMaterial() const { return NULL; }
include/JSystem/J2DGraph/J2DScreen.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
/* 802F90E0 */ virtual J2DPane* searchUserInfo(u64);
/* 802F9600 */ virtual bool isUsed(ResTIMG const*);
/* 802F9620 */ virtual bool isUsed(ResFONT const*);
/* 80053BA0 */ virtual void clearAnmTransform();
/* 80053BA0 */ virtual void clearAnmTransform() { J2DPane::clearAnmTransform(); }
/* 802F9704 */ virtual void setAnimation(J2DAnmColor*);
/* 80192414 */ virtual void setAnimation(J2DAnmTransform* i_bck) { J2DPane::setAnimation(i_bck); }
/* 802F9798 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
include/JSystem/J2DGraph/J2DTextBox.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
/* 80300278 */ virtual void setFont(JUTFont*);
/* 8021C7F4 */ virtual JUTFont* getFont() const { return mFont; }
/* 80254408 */ virtual bool setBlack(JUtility::TColor);
/* 80186C84 */ virtual bool setWhite(JUtility::TColor);
/* 80186C84 */ virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
/* 8019230C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
/* 801DFA34 */ virtual JUtility::TColor getBlack() const;
/* 801DFA28 */ virtual JUtility::TColor getWhite() const;