mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-07 13:23:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

J2DWindow::draw_private

Browse Source
This commit is contained in:
LagoLunatic
2024-01-07 01:54:47 -05:00
parent 2f21a354b5
commit 6ec8c70295
4 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DPane.h
+11 -2
View File
@@ -68,8 +68,8 @@ public:
virtual J2DPane* search(u32 tag);
virtual void makeMatrix(f32 x, f32 y);
f32 getWidth() const { return mBounds.getWidth(); }
f32 getHeight() const { return mBounds.getHeight(); }
f32 getWidth() { return mBounds.getWidth(); }
f32 getHeight() { return mBounds.getHeight(); }
JSUTree<J2DPane>* getFirstChild() { return mPaneTree.getFirstChild(); }
JSUTree<J2DPane>* getEndChild() { return mPaneTree.getEndChild(); }
const JSUTree<J2DPane>* getPaneTree() { return &mPaneTree; }
@@ -79,6 +79,15 @@ public:
void show() { mVisible = true; }
void hide() { mVisible = false; }
void getBounds() {}
void getGlbBounds() {}
void getRotate() const {}
void isVisible() {}
void place(const JGeometry::TBox2<f32>&) {}
void rotate(f32) {}
void rotate(f32, f32, J2DRotateAxis, f32) {}
void setInfluencedAlpha(bool) {}
public:
/* 0x04 */ u32 mMagic;
/* 0x08 */ int mTag;
include/JSystem/J2DGraph/J2DWindow.h
+16
View File
@@ -11,6 +11,14 @@ class JUTPalette;
class J2DWindow : public J2DPane {
public:
struct TContentsColor {
TContentsColor() {}
/* 0x0 */ JUtility::TColor mTL;
/* 0x4 */ JUtility::TColor mTR;
/* 0x8 */ JUtility::TColor mBL;
/* 0xC */ JUtility::TColor mBR;
}; // Size: 0x10
J2DWindow(J2DPane*, JSURandomInputStream*);
virtual ~J2DWindow();
@@ -28,6 +36,14 @@ public:
void drawContentsTexture(f32, f32, f32, f32);
void setTevMode(JUTTexture*, JUtility::TColor, JUtility::TColor);
void getBlack() const {}
void getContentsColor(TContentsColor&) const {}
void getWhite() const {}
void setBlack(JUtility::TColor) {}
void setContentsColor(TContentsColor) {}
void setContentsColor(JUtility::TColor) {}
void setWhite(JUtility::TColor) {}
public:
/* 0x0CC */ JUTTexture* mpFrameTexture1;
/* 0x0D0 */ JUTTexture* mpFrameTexture2;
include/JSystem/JSupport/JSUList.h
+3 -3
View File
@@ -195,11 +195,11 @@ public:
return *this;
}
T* getObject() { return this->mTree->getObject(); }
T* getObject() const { return this->mTree->getObject(); }
bool operator==(JSUTree<T>* other) { return this->mTree == other; }
bool operator!=(JSUTree<T>* other) { return this->mTree != other; }
bool operator!=(const JSUTree<T>* other) const { return this->mTree != other; }
JSUTreeIterator<T> operator++(int) {
JSUTreeIterator<T> prev = *this;
@@ -214,7 +214,7 @@ public:
T* operator*() { return this->getObject(); }
T* operator->() { return this->getObject(); }
T* operator->() const { return this->getObject(); }
private:
JSUTree<T>* mTree;
src/JSystem/J2DGraph/J2DWindow.cpp
+13 -11
View File
@@ -13,7 +13,6 @@
/* 802D12E0-802D1820 .text __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStream */
J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1) : mpFrameTexture1(NULL), mpFrameTexture2(NULL), mpFrameTexture3(NULL), mpFrameTexture4(NULL), mpContentsTexture(NULL), mpPalette(NULL) {
/* Nonmatching */
s32 local_188 = param_1->getPosition();
u32 header[2];
param_1->read(header, 8);
@@ -112,7 +111,6 @@ J2DWindow::~J2DWindow() {
/* 802D1B44-802D1F5C .text draw_private__9J2DWindowFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
void J2DWindow::draw_private(const JGeometry::TBox2<f32>& frameBox, const JGeometry::TBox2<f32>& contentsBox) {
/* Nonmatching */
drawContents(contentsBox);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -121,28 +119,31 @@ void J2DWindow::draw_private(const JGeometry::TBox2<f32>& frameBox, const JGeome
GXSetNumTexGens(1);
if (mpFrameTexture1 != NULL && mpFrameTexture2 != NULL && mpFrameTexture3 != NULL && mpFrameTexture4 != NULL) {
f32 x = 0.0f;
f32 y = 0.0f;
f32 right = frameBox.getWidth() - mpFrameTexture4->getWidth();
f32 top = frameBox.getHeight() - mpFrameTexture4->getHeight();
// This isn't right, this should be 0.0f +
f32 left = 1.0f + mpFrameTexture1->getWidth();
f32 bottom = 1.0f + mpFrameTexture1->getHeight();
f32 left = x + mpFrameTexture1->getWidth();
f32 bottom = y + mpFrameTexture1->getHeight();
u16 s0, s1, t0, t1;
drawFrameTexture(mpFrameTexture1, 0.0f, 0.0f,
drawFrameTexture(mpFrameTexture1, x, y,
(field_0x110 >> 7) & 1,
(field_0x110 >> 6) & 1, true);
bool r7 = (field_0x111 & 1) ? true : false;
drawFrameTexture(mpFrameTexture2, right, 0.0f,
(field_0x110 >> 5) & 1,
(field_0x110 >> 4) & 1, (field_0x111 >> 0) & 1);
(field_0x110 >> 4) & 1, r7);
s0 = ((field_0x110 >> 5) & 1) ? (u16)0x8000 : (u16)0;
t0 = ((field_0x110 >> 4) & 1) ? (u16)0x8000 : (u16)0;
t0 = ((field_0x110 >> 4) & 1) ? (u16)0 : (u16)0x8000;
t1 = (u16)(t0 ^ 0x8000);
drawFrameTexture(mpFrameTexture2, left, 0.0f, right - left, (f32)mpFrameTexture2->getHeight(), s0, t0, s0, t1, false);
r7 = (field_0x111 & 2) ? true : false;
drawFrameTexture(mpFrameTexture4, right, top,
(field_0x110 >> 1) & 1,
(field_0x110 >> 0) & 1, (field_0x111 & 2));
(field_0x110 >> 0) & 1, r7);
s0 = ((field_0x110 >> 1) & 1) ? (u16)0x8000 : (u16)0;
t0 = ((field_0x110 >> 0) & 1) ? (u16)0 : (u16)0x8000;
@@ -154,9 +155,10 @@ void J2DWindow::draw_private(const JGeometry::TBox2<f32>& frameBox, const JGeome
t0 = ((field_0x110 >> 0) & 1) ? (u16)0x8000 : (u16)0;
drawFrameTexture(mpFrameTexture4, right, bottom, (f32)mpFrameTexture4->getWidth(), top - bottom, s0, t0, s1, t0, false);
r7 = (field_0x111 & 4) ? true : false;
drawFrameTexture(mpFrameTexture3, 0.0f, top,
(field_0x110 >> 3) & 1,
(field_0x110 >> 2) & 1, (field_0x111 & 4));
(field_0x110 >> 2) & 1, r7);
s0 = ((field_0x110 >> 3) & 1) ? (u16)0 : (u16)0x8000;
s1 = (u16)(s0 ^ 0x8000);
@@ -178,7 +180,7 @@ void J2DWindow::resize(f32 w, f32 h) {
J2DPane::resize(w, h);
mWindowBox.f.x += w - oldW;
mWindowBox.f.y += h - oldH;
for (JSUTreeIterator<J2DPane> iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) {
for (JSUTreeIterator<J2DPane> iter(getFirstChild()); iter != getEndChild(); iter++) {
if (iter->getTypeID() == 0x13 && iter->isConnectParent()) {
f32 childW = w - oldW + iter->getWidth();
f32 childH = h - oldH + iter->getHeight();