Skip to content

GC2D/GCConsole2: inline boundaries, bounds accessors, and the water gauges (27 -> 33) #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KakarottoCake wants to merge 17 commits into
base: main
Choose a base branch
from
Open

GC2D/GCConsole2: inline boundaries, bounds accessors, and the water gauges (27 -> 33) #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4a9c8dc
GC2D/GCConsole2: fix the timer and news-telop update logic
KakarottoCake Aug 27, 2026
2a4821c
Merge remote-tracking branch 'origin/main' into gcconsole2-round2
KakarottoCake Aug 27, 2026
0bf0081
GC2D/GCConsole2: restore the below-screen offset inline
KakarottoCake Aug 27, 2026
9c9ef3c
GC2D/GCConsole2: read initial bounds through per-field accessors
KakarottoCake Aug 27, 2026
596badb
GC2D/GCConsole2: startDisappearCoin hides both panes the same way
KakarottoCake Aug 27, 2026
815edf5
GC2D/GCConsole2: load() was filling only half the life-pane array
KakarottoCake Aug 27, 2026
efb8a85
GC2D/GCConsole2: loadAfter sizes the telop boxes with resize, not set…
KakarottoCake Aug 27, 2026
332008c
GC2D/GCConsole2: centre the coin emitters through the existing helper
KakarottoCake Aug 27, 2026
93eece4
GC2D/GCConsole2: processAppearStar tests the shine count first
KakarottoCake Aug 27, 2026
78c9975
GC2D/GCConsole2: drawWater's water quad spans the picture's own height
KakarottoCake Aug 27, 2026
e638301
GC2D/GCConsole2: processAppearStar reuses one bounds rect
KakarottoCake Aug 27, 2026
90245e9
GC2D/GCConsole2: drawWaterBack draws the full gauge once
KakarottoCake Aug 27, 2026
1c3661b
GC2D/GCConsole2: drawWaterBack picks its texture through getTexture
KakarottoCake Aug 27, 2026
5b19f8f
GC2D/GCConsole2: the pressure flash resets its own counter
KakarottoCake Aug 27, 2026
172258c
J2D/J2DWindow: getContentsBounds returns a JUTRect by value
KakarottoCake Aug 27, 2026
4405de5
Merge remote-tracking branch 'origin/main' into gcconsole2-round2
KakarottoCake Aug 29, 2026
5884f06
M3DUtil/MActorAnm: wrap the MtxCalcTypeName comment to 80 columns
KakarottoCake Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/GC2D/ExPane.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ class TExPane {

J2DPane* getPane() const { return mPane; }
const JUTRect& getInitialBounds() const { return mInitialBounds; }
int getInitialX1() const { return mInitialBounds.x1; }
int getInitialY1() const { return mInitialBounds.y1; }
int getInitialX2() const { return mInitialBounds.x2; }
int getInitialY2() const { return mInitialBounds.y2; }

@Mrkol Mrkol Aug 27, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't feel like these could ever be real so lets leave them out of the PR for now


bool isBoundsAnimationCompleted() const
{
Expand Down
2 changes: 1 addition & 1 deletion include/JSystem/J2D/J2DWindow.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class J2DWindow : public J2DPane {
virtual void drawSelf(int, int, Mtx*);

// Possibly inline
const JUTRect& getContentsBounds() const { return mContentsBounds; }
JUTRect getContentsBounds() const { return mContentsBounds; }

protected:
/* 0xEC */ JUTRect mContentsBounds;
Expand Down
7 changes: 4 additions & 3 deletions include/M3DUtil/MActorAnm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,10 @@ class MActorAnmBtp : public MActorAnmMatEach<J3DAnmTexPattern> {
/* 0x28 */ J3DTexNoAnm** unk28;
};

// The names come from the MtxCalcTypeName table in M3DUtil/InfectiousStrings.hpp,
// which survives in the ROM (read it in MarioDraw.cpp's .data): its four entries
// are "MActorMtxCalcType_Basic", "_Softimage", "_MotionBlend" and "_User".
// The names come from the MtxCalcTypeName table in
// M3DUtil/InfectiousStrings.hpp, which survives in the ROM (read it in
// MarioDraw.cpp's .data): its four entries are "MActorMtxCalcType_Basic",
// "_Softimage", "_MotionBlend" and "_User".
enum MActorMtxCalcType {
MACTOR_MTX_CALC_BASIC,
MACTOR_MTX_CALC_SOFTIMAGE,
Expand Down
Loading
Loading