mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-30 02:58:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

J2DWindow fakematch

Browse Source 
found by Cuyler
This commit is contained in:
Jasper St. Pierre
2024-01-21 14:44:39 -08:00
parent fbc3906a1d
commit d9b844f714
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -847,7 +847,7 @@ config.libs = [
Object(Matching, "JSystem/J2DGraph/J2DPrint.cpp"),
Object(Matching, "JSystem/J2DGraph/J2DPane.cpp"),
Object(Matching, "JSystem/J2DGraph/J2DScreen.cpp"),
Object(NonMatching, "JSystem/J2DGraph/J2DWindow.cpp"),
Object(Matching, "JSystem/J2DGraph/J2DWindow.cpp"),
Object(Matching, "JSystem/J2DGraph/J2DPicture.cpp"),
Object(Matching, "JSystem/J2DGraph/J2DTextBox.cpp"),
],
include/JSystem/J2DGraph/J2DPane.h
+6 -1
View File
@@ -49,8 +49,13 @@ public:
virtual u16 getTypeID() { return 0x10; }
virtual void move(f32 x, f32 y);
virtual void add(f32 x, f32 y);
// fakematch, this getter doesn't exist
f32 resize__getMinX() const { return mBounds.i.x; }
virtual void resize(f32 w, f32 h) {
mBounds.f.x = mBounds.i.x + w;
f32 x = resize__getMinX();
x += w;
mBounds.f.x = x;
mBounds.f.y = mBounds.i.y + h;
}
virtual bool setConnectParent(bool connected) {
include/JSystem/J2DGraph/J2DPicture.h
+7
View File
@@ -103,6 +103,13 @@ public:
u8 getNumTexture() { return mNumTexture; }
void setBinding(J2DBinding v) { mBinding = v; }
void setMirror(J2DMirror v) {} // untested { mFlag = (mFlag & ~0x03) | v; }
J2DMirror getMirror() const { return J2DMirror(mFlag & 0x03); }
void setTumble(bool v) {} // untested { mFlag = (mFlag & ~0x04) | (v << 2); }
bool isTumble() const { return mFlag >> 2 & 1; }
private:
/* 0x0CC */ JUTTexture* mpTexture[4];
/* 0x0DC */ u8 mNumTexture;
src/JSystem/J2DGraph/J2DPicture.cpp
+1 -1
View File
@@ -232,7 +232,7 @@ void J2DPicture::drawSelf(f32 x, f32 y, Mtx* mtx) {
if (!mpTexture[0]) {
return;
}
drawFullSet(mScreenBounds.i.x + x, mScreenBounds.i.y + y, mBounds.getWidth(), mBounds.getHeight(), J2DBinding(mBinding), J2DMirror(mFlag & 3), mFlag >> 2 & 1, mtx);
drawFullSet(mScreenBounds.i.x + x, mScreenBounds.i.y + y, mBounds.getWidth(), mBounds.getHeight(), J2DBinding(mBinding), getMirror(), isTumble(), mtx);
}
/* 802D3D54-802D4074 .text drawFullSet__10J2DPictureFffff10J2DBinding9J2DMirrorbPA3_A4_f */