diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-07-04 12:21:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-04 21:21:57 +0200 |
| commit | 929c5cfa5a18effef4ef76e61282dd774b3deb1b (patch) | |
| tree | 902fba539d9a30cc7aae3761f4ba5d2c34af83e8 /include/JSystem/J2DGraph | |
| parent | b68cfbc0e6a66e9ef46ab01264dbe9e92b65bf8e (diff) | |
d_menu_save / pane_class / rename some data (#205)
* work on fop actor / actor mng, daalink, d_a_obj_item
* d_a_title mostly decompiled
* daalink / d_event / JMessage / dmsg_out_font work
* msg_scrn_base / msg_scrn_boss
* some work on mDo machine, d_menu_save, d_tresure, and various
* remove asm
* progress
* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data
* rename more data
* remove asm / progress
* match all of d_pane_class
* fixes / some dKankyo doc
Diffstat (limited to 'include/JSystem/J2DGraph')
| -rw-r--r-- | include/JSystem/J2DGraph/J2DOrthoGraph.h | 6 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DPane.h | 1 | ||||
| -rw-r--r-- | include/JSystem/J2DGraph/J2DTextBox.h | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h index 8259b27c94..e6bf5bb59a 100644 --- a/include/JSystem/J2DGraph/J2DOrthoGraph.h +++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h @@ -15,9 +15,15 @@ public: /* 802E97B4 */ virtual void setPort(); /* 802E9C88 */ virtual s32 getGrafType() const { return 1; } /* 802E9840 */ virtual void setLookat(); + f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); } f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); } + void setOrtho(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5) { + JGeometry::TBox2<f32> ortho(param_0, param_1, param_0 + param_2, param_1 + param_3); + setOrtho(ortho, param_4, param_5); + } + private: /* 0xBC */ JGeometry::TBox2<f32> mOrtho; /* 0xCC */ f32 mNear; diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index c2af88aa20..6653617fc8 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -134,6 +134,7 @@ public: void animationTransform(); void updateTransform(const J2DAnmTransform* transform); void setUserInfo(u64 info) { mUserInfoTag = info; } + const Mtx* getMtx() const { return &mPositionMtx; } static JGeometry::TBox2<f32> static_mBounds; diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index ba81b38f62..6535cfc1eb 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -40,8 +40,8 @@ public: /* 80254408 */ virtual bool setBlack(JUtility::TColor); /* 80186C84 */ virtual void setWhite(JUtility::TColor); /* 8019230C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 801DFA34 */ virtual void getBlack() const; - /* 801DFA28 */ virtual void getWhite() const; + /* 801DFA34 */ virtual JUtility::TColor getBlack() const; + /* 801DFA28 */ virtual JUtility::TColor getWhite() const; /* 8025602C */ virtual bool getMaterial() const; /* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16, |