mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-10 22:31:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

implement a few JSystem inlines

Browse Source
This commit is contained in:
Jcw87
2023-12-14 14:41:24 -08:00
parent 62b986dd94
commit 0549d5c189
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPane.h
+11 -4
View File
@@ -53,10 +53,17 @@ public:
mBounds.f.x = mBounds.i.x + w;
mBounds.f.y = mBounds.i.y + h;
}
virtual bool setConnectParent(bool connected);
virtual void calcMtx();
virtual void update();
virtual void drawSelf(f32 x, f32 y);
virtual bool setConnectParent(bool connected) {
mIsConnectParent = 0;
return false;
}
virtual void calcMtx() {
if (mPaneTree.mList) {
makeMatrix(mBounds.i.x, mBounds.i.y);
}
}
virtual void update() {}
virtual void drawSelf(f32 x, f32 y) {}
virtual void drawSelf(f32 x, f32 y, Mtx* mtx) {}
virtual J2DPane* search(u32 tag);
virtual void makeMatrix(f32, f32);
include/JSystem/J2DGraph/J2DPicture.h
+8 -2
View File
@@ -27,8 +27,14 @@ public:
virtual u16 getTypeID() { return 0x12; }
virtual void drawSelf(f32 x, f32 y);
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);
virtual void drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6) {
if (mpTexture[0]) {
drawOut(JGeometry::TBox2<f32>(p1, p2, p1 + p3, p2 + p4), JGeometry::TBox2<f32>(p5, p6, p5 + mpTexture[0]->getWidth(), p6 + mpTexture[0]->getHeight()));
}
}
virtual void drawOut(f32 p1, f32 p2, f32 p3, f32 p4, f32 p5, f32 p6, f32 p7, f32 p8) {
drawOut(JGeometry::TBox2<f32>(p1, p2, p1 + p3, p2 + p4), JGeometry::TBox2<f32>(p5, p6, p5 + p7, p6 + p8));
}
JUTTexture * getTexture(u8 idx) const {
return idx < mNumTexture ? mpTexture[idx] : NULL;
}
include/JSystem/JUtility/JUTFont.h
+3 -3
View File
@@ -83,9 +83,9 @@ public:
/* 0x3C */ virtual const ResFONT* getResFont() const = 0;
/* 0x40 */ virtual bool isLeadByte(int a1) const = 0;
static bool isLeadByte_1Byte(int b);
static bool isLeadByte_2Byte(int b);
static bool isLeadByte_ShiftJIS(int b);
static bool isLeadByte_1Byte(int b) { return false; }
static bool isLeadByte_2Byte(int b) { return true; }
static bool isLeadByte_ShiftJIS(int b) { return (b >= 0x81 && b <= 0x9f) || (b >= 0xe0 && b <= 0xfc);}
void initialize_state();
void setCharColor(JUtility::TColor col1);