diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-11-30 14:23:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-30 15:23:42 -0700 |
| commit | a6e76c0841cae03cae0c0e6ac75c32f979043093 (patch) | |
| tree | 76b5f590c59c6abdf2c80d0a3d5c0ccb31ebd0fe /src/JSystem/J2DGraph/J2DPane.cpp | |
| parent | 434415337d268e405b09f6b72935a7e918e4cfe7 (diff) | |
project cleanup (#2895)
* some wii OS fixes
* remove old dol2asm comments
* remove dol2asm.h
* remove function address comments
* normalize ATTRIBUTE_ALIGN usage
* DECL_WEAK macro
* fix gcc attribute weak macro
* wrap more mwcc specific things in ifdefs
* fixes
* fix revo sdk version flags
* fixes
Diffstat (limited to 'src/JSystem/J2DGraph/J2DPane.cpp')
| -rw-r--r-- | src/JSystem/J2DGraph/J2DPane.cpp | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp index 2e7d49afc6..6de4c1772f 100644 --- a/src/JSystem/J2DGraph/J2DPane.cpp +++ b/src/JSystem/J2DGraph/J2DPane.cpp @@ -7,7 +7,6 @@ #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTResource.h" -/* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text __ct__7J2DPaneFv */ J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; mKind = 'PAN1'; @@ -20,7 +19,6 @@ J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { calcMtx(); } -/* 802F5CB8-802F5D40 2F05F8 0088+00 3/3 0/0 0/0 .text initiate__7J2DPaneFv */ void J2DPane::initiate() { field_0x4 = -1; mRotateOffsetY = mRotateOffsetX = mRotateZ = mRotateY = mRotateX = 0; @@ -36,16 +34,12 @@ void J2DPane::initiate() { calcMtx(); } -/* 802F5D40-802F5DD0 2F0680 0090+00 0/0 1/1 0/0 .text - * __ct__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2<f> */ J2DPane::J2DPane(J2DPane* p_pane, bool visible, u64 tag, JGeometry::TBox2<f32> const& bounds) : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; initialize(p_pane, visible, tag, bounds); } -/* 802F5DD0-802F5E88 2F0710 00B8+00 1/1 0/0 0/0 .text - * initialize__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2<f> */ void J2DPane::initialize(J2DPane* p_pane, bool visible, u64 infoTag, JGeometry::TBox2<f32> const& bounds) { mKind = 'PAN1'; @@ -62,15 +56,12 @@ void J2DPane::initialize(J2DPane* p_pane, bool visible, u64 infoTag, calcMtx(); } -/* 802F5E88-802F5F08 2F07C8 0080+00 0/0 3/3 0/0 .text __ct__7J2DPaneFUxRCQ29JGeometry8TBox2<f> */ J2DPane::J2DPane(u64 infoTag, JGeometry::TBox2<f32> const& bounds) : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; initialize(infoTag, bounds); } -/* 802F5F08-802F5F9C 2F0848 0094+00 1/1 0/0 0/0 .text - * initialize__7J2DPaneFUxRCQ29JGeometry8TBox2<f> */ void J2DPane::initialize(u64 tag, const JGeometry::TBox2<f32>& bounds) { mKind = 'PAN1'; mVisible = true; @@ -82,8 +73,6 @@ void J2DPane::initialize(u64 tag, const JGeometry::TBox2<f32>& bounds) { calcMtx(); } -/* 802F5F9C-802F60C4 2F08DC 0128+00 0/0 1/1 0/0 .text - * __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc */ J2DPane::J2DPane(J2DPane* p_pane, JSURandomInputStream* p_stream, u8 isEx) : mPaneTree(this) { mTransform = NULL; if (!isEx) { @@ -107,8 +96,6 @@ J2DPane::J2DPane(J2DPane* p_pane, JSURandomInputStream* p_stream, u8 isEx) : mPa } } -/* 802F60C4-802F63F8 2F0A04 0334+00 1/1 3/3 0/0 .text - * makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ void J2DPane::makePaneStream(J2DPane* p_pane, JSURandomInputStream* p_stream) { u8 unk; p_stream->read(&unk, 1); @@ -168,8 +155,6 @@ void J2DPane::makePaneStream(J2DPane* p_pane, JSURandomInputStream* p_stream) { calcMtx(); } -/* 802F63F8-802F658C 2F0D38 0194+00 4/4 0/0 0/0 .text changeUseTrans__7J2DPaneFP7J2DPane - */ void J2DPane::changeUseTrans(J2DPane* p_pane) { f32 xOffset = 0; f32 yOffset = 0; @@ -214,7 +199,6 @@ void J2DPane::changeUseTrans(J2DPane* p_pane) { } } -/* 802F658C-802F666C 2F0ECC 00E0+00 1/0 4/4 0/0 .text __dt__7J2DPaneFv */ J2DPane::~J2DPane() { JSUTreeIterator<J2DPane> iterator; for (iterator = mPaneTree.getFirstChild(); iterator != mPaneTree.getEndChild();) { @@ -223,7 +207,6 @@ J2DPane::~J2DPane() { } } -/* 802F666C-802F6714 2F0FAC 00A8+00 0/0 2/2 0/0 .text appendChild__7J2DPaneFP7J2DPane */ bool J2DPane::appendChild(J2DPane* p_child) { if (p_child == NULL) return false; @@ -239,7 +222,6 @@ bool J2DPane::appendChild(J2DPane* p_child) { return result; } -/* 802F6714-802F67E0 2F1054 00CC+00 0/0 1/1 0/0 .text insertChild__7J2DPaneFP7J2DPaneP7J2DPane */ bool J2DPane::insertChild(J2DPane* p_prev, J2DPane* p_child) { if (p_child == NULL) return false; @@ -257,7 +239,6 @@ bool J2DPane::insertChild(J2DPane* p_prev, J2DPane* p_child) { return result; } -/* 802F67E0-802F6D18 2F1120 0538+00 0/0 1/1 0/0 .text draw__7J2DPaneFffPC14J2DGrafContextbb */ void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* p_grafCtx, bool isOrthoGraf, bool param_4) { bool unkBool = param_4 && mVisible; if (p_grafCtx->getGrafType() != 1) { @@ -329,7 +310,6 @@ void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* p_grafCtx, bool isOrthoGr } } -/* 802F6D18-802F6F60 2F1658 0248+00 2/2 4/4 0/0 .text place__7J2DPaneFRCQ29JGeometry8TBox2<f> */ void J2DPane::place(JGeometry::TBox2<f32> const& box) { JGeometry::TBox2<f32> tmpBox; @@ -380,21 +360,18 @@ void J2DPane::place(JGeometry::TBox2<f32> const& box) { calcMtx(); } -/* 802F6F60-802F6FB4 2F18A0 0054+00 1/0 7/0 0/0 .text move__7J2DPaneFff */ void J2DPane::move(f32 x, f32 y) { f32 width = getWidth(); f32 height = getHeight(); place(JGeometry::TBox2<f32>(x, y, x + width, y + height)); } -/* 802F6FB4-802F6FF8 2F18F4 0044+00 1/0 7/0 0/0 .text add__7J2DPaneFff */ void J2DPane::add(f32 x, f32 y) { mTranslateX += x; mTranslateY += y; calcMtx(); } -/* 802F6FF8-802F7100 2F1938 0108+00 1/0 5/2 0/0 .text resize__7J2DPaneFff */ void J2DPane::resize(f32 x, f32 y) { JGeometry::TBox2<f32> box = mBounds; @@ -415,11 +392,8 @@ void J2DPane::resize(f32 x, f32 y) { place(box); } -/* ############################################################################################## */ -/* 804349B0-804349C0 0616D0 0010+00 2/2 0/0 0/0 .bss static_mBounds__7J2DPane */ JGeometry::TBox2<f32> J2DPane::static_mBounds(0, 0, 0, 0); -/* 802F7100-802F71DC 2F1A40 00DC+00 0/0 25/25 1/1 .text getBounds__7J2DPaneFv */ JGeometry::TBox2<f32>& J2DPane::getBounds() { static_mBounds = mBounds; @@ -438,7 +412,6 @@ JGeometry::TBox2<f32>& J2DPane::getBounds() { return static_mBounds; } -/* 802F71DC-802F720C 2F1B1C 0030+00 0/0 12/12 0/0 .text rotate__7J2DPaneFff13J2DRotateAxisf */ void J2DPane::rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) { mRotateOffsetX = offsetX; mRotateOffsetY = offsetY; @@ -446,7 +419,6 @@ void J2DPane::rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) { rotate(angle); } -/* 802F720C-802F7264 2F1B4C 0058+00 1/1 0/0 0/0 .text rotate__7J2DPaneFf */ void J2DPane::rotate(f32 angle) { if (mRotAxis == ROTATE_X) { mRotateX = angle; @@ -459,7 +431,6 @@ void J2DPane::rotate(f32 angle) { calcMtx(); } -/* 802F7264-802F72E0 2F1BA4 007C+00 0/0 2/2 0/0 .text clip__7J2DPaneFRCQ29JGeometry8TBox2<f> */ void J2DPane::clip(JGeometry::TBox2<f32> const& bounds) { JGeometry::TBox2<f32> boxA(bounds); JGeometry::TBox2<f32> boxB(mGlobalBounds); @@ -467,7 +438,6 @@ void J2DPane::clip(JGeometry::TBox2<f32> const& bounds) { mClipRect.intersect(boxA); } -/* 802F72E0-802F7388 2F1C20 00A8+00 1/0 7/1 0/0 .text search__7J2DPaneFUx */ J2DPane* J2DPane::search(u64 tag) { if (tag == mInfoTag) { return this; @@ -482,7 +452,6 @@ J2DPane* J2DPane::search(u64 tag) { return NULL; } -/* 802F7388-802F7430 2F1CC8 00A8+00 1/0 7/1 0/0 .text searchUserInfo__7J2DPaneFUx */ J2DPane* J2DPane::searchUserInfo(u64 tag) { if (tag == mUserInfoTag) { return this; @@ -497,7 +466,6 @@ J2DPane* J2DPane::searchUserInfo(u64 tag) { return NULL; } -/* 802F7430-802F74B8 2F1D70 0088+00 1/0 7/7 0/0 .text isUsed__7J2DPaneFPC7ResTIMG */ bool J2DPane::isUsed(const ResTIMG* p_timg) { JSUTreeIterator<J2DPane> iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { @@ -507,7 +475,6 @@ bool J2DPane::isUsed(const ResTIMG* p_timg) { return false; } -/* 802F74B8-802F7540 2F1DF8 0088+00 1/0 7/7 0/0 .text isUsed__7J2DPaneFPC7ResFONT */ bool J2DPane::isUsed(const ResFONT* p_font) { JSUTreeIterator<J2DPane> iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { @@ -517,7 +484,6 @@ bool J2DPane::isUsed(const ResFONT* p_font) { return false; } -/* 802F7540-802F7680 2F1E80 0140+00 1/0 7/0 0/0 .text makeMatrix__7J2DPaneFffff */ void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { f32 tmpX = mRotateOffsetX - param_2; f32 tmpY = mRotateOffsetY - param_3; @@ -533,8 +499,6 @@ void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { MTXTransApply(tmp, mPositionMtx, param_0 + tmpX, param_1 + tmpY, 0); } -/* 802F7680-802F76F8 2F1FC0 0078+00 1/0 7/3 0/0 .text setCullBack__7J2DPaneF11_GXCullMode - */ void J2DPane::setCullBack(GXCullMode mode) { mCullMode = mode; @@ -544,8 +508,6 @@ void J2DPane::setCullBack(GXCullMode mode) { } } -/* 802F76F8-802F77D0 2F2038 00D8+00 0/0 8/8 0/0 .text setBasePosition__7J2DPaneF15J2DBasePosition - */ void J2DPane::setBasePosition(J2DBasePosition position) { mBasePosition = position; mRotAxis = ROTATE_Z; @@ -572,7 +534,6 @@ void J2DPane::setBasePosition(J2DBasePosition position) { calcMtx(); } -/* 802F77D0-802F79A8 2F2110 01D8+00 0/0 1/1 0/0 .text setInfluencedAlpha__7J2DPaneFbb */ void J2DPane::setInfluencedAlpha(bool influencedAlpha, bool param_1) { if (param_1 && mIsInfluencedAlpha != influencedAlpha) { J2DPane* parent = getParentPane(); @@ -611,7 +572,6 @@ void J2DPane::setInfluencedAlpha(bool influencedAlpha, bool param_1) { mIsInfluencedAlpha = influencedAlpha; } -/* 802F79A8-802F7A8C 2F22E8 00E4+00 0/0 3/3 0/0 .text getGlbVtx__7J2DPaneCFUc */ Vec J2DPane::getGlbVtx(u8 param_0) const { Vec out; if (param_0 >= 4) { @@ -640,7 +600,6 @@ Vec J2DPane::getGlbVtx(u8 param_0) const { } } -/* 802F7A8C-802F7AC4 2F23CC 0038+00 1/1 15/15 0/0 .text getFirstChildPane__7J2DPaneFv */ J2DPane* J2DPane::getFirstChildPane() { if (!getFirstChild()) return NULL; @@ -648,7 +607,6 @@ J2DPane* J2DPane::getFirstChildPane() { return getFirstChild()->getObject(); } -/* 802F7AC4-802F7AFC 2F2404 0038+00 1/1 8/8 0/0 .text getNextChildPane__7J2DPaneFv */ J2DPane* J2DPane::getNextChildPane() { if (getPaneTree()->getNextChild() == NULL) return NULL; @@ -656,7 +614,6 @@ J2DPane* J2DPane::getNextChildPane() { return getPaneTree()->getNextChild()->getObject(); } -/* 802F7AFC-802F7B18 2F243C 001C+00 6/6 11/11 0/0 .text getParentPane__7J2DPaneFv */ J2DPane* J2DPane::getParentPane() { if (getPaneTree()->getParent() == NULL) return NULL; @@ -685,8 +642,6 @@ struct J2DPaneInfo { /* 0x40 */ f32 mTranslateY; }; // Size: 0x48 -/* 802F7B18-802F7D00 2F2458 01E8+00 1/1 6/6 0/0 .text - * makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ void J2DPane::makePaneExStream(J2DPane* p_parent, JSURandomInputStream* p_stream) { p_stream->getPosition(); @@ -738,7 +693,6 @@ void J2DPane::makePaneExStream(J2DPane* p_parent, JSURandomInputStream* p_stream calcMtx(); } -/* 802F7D00-802F7DB8 2F2640 00B8+00 0/0 1/1 0/0 .text J2DCast_F32_to_S16__7J2DPaneFfUc */ s16 J2DPane::J2DCast_F32_to_S16(f32 value, u8 arg2) { if (arg2 >= 0xF) { return 0; @@ -763,8 +717,6 @@ s16 J2DPane::J2DCast_F32_to_S16(f32 value, u8 arg2) { } } -/* 802F7DB8-802F7EF4 2F26F8 013C+00 0/0 3/3 0/0 .text - * getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive */ void* J2DPane::getPointer(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { JUTResReference resRef; @@ -798,7 +750,6 @@ void* J2DPane::getPointer(JSURandomInputStream* p_stream, u32 param_1, JKRArchiv return pointer; } -/* 802F7EF4-802F7FC4 2F2834 00D0+00 2/0 7/4 0/0 .text setAnimation__7J2DPaneFP10J2DAnmBase */ void J2DPane::setAnimation(J2DAnmBase* p_anm) { if (p_anm != NULL) { switch (p_anm->getKind()) { @@ -829,18 +780,15 @@ void J2DPane::setAnimation(J2DAnmBase* p_anm) { } } -/* 802F7FC4-802F7FCC -00001 0008+00 0/0 0/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */ void J2DPane::setAnimation(J2DAnmTransform* p_anm) { mTransform = p_anm; } -/* 802F7FCC-802F8004 2F290C 0038+00 0/0 57/57 0/0 .text animationTransform__7J2DPaneFv */ void J2DPane::animationTransform() { if (mTransform != NULL) animationTransform(mTransform); } -/* 802F8004-802F8080 2F2944 007C+00 1/0 7/1 0/0 .text clearAnmTransform__7J2DPaneFv */ void J2DPane::clearAnmTransform() { J2DAnmTransform* none = NULL; setAnimation(none); @@ -851,8 +799,6 @@ void J2DPane::clearAnmTransform() { } } -/* 802F8080-802F8118 2F29C0 0098+00 1/0 7/0 0/0 .text - * animationTransform__7J2DPaneFPC15J2DAnmTransform */ const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* p_transform) { const J2DAnmTransform* p = p_transform; if (mTransform != NULL) @@ -867,8 +813,6 @@ const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* p_tran return p; } -/* 802F8118-802F81A0 2F2A58 0088+00 1/0 8/1 0/0 .text - * setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull */ void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* p_visibility) { setAnimationVF(p_visibility); @@ -878,8 +822,6 @@ void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* p_visibility) { } } -/* 802F81A0-802F8228 2F2AE0 0088+00 1/0 8/1 0/0 .text - * setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor */ void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* p_vtxColor) { setAnimationVC(p_vtxColor); @@ -889,8 +831,6 @@ void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* p_vtxColor) { } } -/* 802F8228-802F82C0 2F2B68 0098+00 1/0 7/3 0/0 .text animationPane__7J2DPaneFPC15J2DAnmTransform - */ const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* p_transform) { const J2DAnmTransform* p = p_transform; if (mTransform != NULL) @@ -905,8 +845,6 @@ const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* p_transform return p; } -/* 802F82C0-802F83C8 2F2C00 0108+00 2/2 0/0 0/0 .text - * updateTransform__7J2DPaneFPC15J2DAnmTransform */ void J2DPane::updateTransform(J2DAnmTransform const* p_anmTransform) { if (field_0x4 != 0xFFFF && p_anmTransform != NULL) { J3DTransformInfo info; @@ -922,29 +860,22 @@ void J2DPane::updateTransform(J2DAnmTransform const* p_anmTransform) { } } -/* 802F83C8-802F83CC 2F2D08 0004+00 1/0 0/0 0/0 .text drawSelf__7J2DPaneFffPA3_A4_f */ void J2DPane::drawSelf(f32, f32, f32 (*)[3][4]) { /* empty function */ } -/* 802F83CC-802F83D0 2F2D0C 0004+00 1/0 1/0 0/0 .text rewriteAlpha__7J2DPaneFv */ void J2DPane::rewriteAlpha() { /* empty function */ } -/* 802F83D0-802F83FC 2F2D10 002C+00 1/0 6/0 0/0 .text - * setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull */ void J2DPane::setAnimationVF(J2DAnmVisibilityFull* p_visibility) { setAnimation(p_visibility); } -/* 802F83FC-802F8428 2F2D3C 002C+00 1/0 6/0 0/0 .text setAnimationVC__7J2DPaneFP14J2DAnmVtxColor - */ void J2DPane::setAnimationVC(J2DAnmVtxColor* p_vtxColor) { setAnimation(p_vtxColor); } -/* 802F8428-802F8464 2F2D68 003C+00 1/0 4/0 0/0 .text setCullBack__7J2DPaneFb */ void J2DPane::setCullBack(bool cull) { GXCullMode mode; @@ -956,18 +887,15 @@ void J2DPane::setCullBack(bool cull) { setCullBack(mode); } -/* 802F8464-802F8474 2F2DA4 0010+00 1/0 5/0 0/0 .text setConnectParent__7J2DPaneFb */ bool J2DPane::setConnectParent(bool connected) { mConnected = false; return false; } -/* 802F8474-802F8478 2F2DB4 0004+00 1/0 7/0 0/0 .text update__7J2DPaneFv */ void J2DPane::update() { /* empty function */ } -/* 802F8478-802F847C 2F2DB8 0004+00 1/0 1/0 0/0 .text drawSelf__7J2DPaneFff */ void J2DPane::drawSelf(f32, f32) { /* empty function */ } |
