mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-17 23:20:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_bird_gauge OK (#131)

Browse Source
This commit is contained in:
robojumper
2025-03-14 03:09:58 +01:00
committed by GitHub
parent 455642a81a
commit d60d45eb6e
35 changed files with 6953 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/lyt/d2d.h
+1 -1
View File
@@ -144,7 +144,7 @@ public:
virtual ~dSubPane() {}
virtual bool build(ResAccIf_c *resAcc) = 0;
virtual bool remove() = 0;
virtual bool LytMeter0x14() = 0;
virtual bool execute() = 0;
virtual nw4r::lyt::Pane *getPane() = 0;
virtual LytBase_c *getLyt() = 0;
virtual const char *getName() const = 0;
include/d/lyt/d_lyt_bird_gauge.h
+53 -9
View File
@@ -1,15 +1,42 @@
#ifndef D_LYT_BIRD_GAUGE_H
#define D_LYT_BIRD_GAUGE_H
#include "common.h"
#include "d/lyt/d2d.h"
#include "m/m_color.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dLytBirdGaugeMain_c {
public:
dLytBirdGaugeMain_c();
virtual ~dLytBirdGaugeMain_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool execute();
bool remove();
const d2d::dLytSub &getLyt() const {
return mLyt;
}
d2d::dLytSub &getLyt() {
return mLyt;
}
void cancelAnimation();
bool isAnimating() const {
return mIsAnimating;
}
s32 getDisplayedDashes() const {
return mNumDisplayedDashes;
}
void changeToIn();
void changeToDash();
void changeToRecovery();
void changeToOut();
private:
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeNone);
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeIn);
@@ -17,9 +44,11 @@ private:
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeRecovery);
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeOut);
/* 0x04 */ UI_STATE_MGR_DECLARE(dLytBirdGaugeMain_c);
/* 0x40 */ d2d::dLytSub mLyt;
/* 0xD4 */ d2d::AnmGroup_c mAnmGroups[8];
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytBirdGaugeMain_c);
/* 0x040 */ d2d::dLytSub mLyt;
/* 0x0D4 */ d2d::AnmGroup_c mAnmGroups[8];
/* 0x2D4 */ bool mIsAnimating;
/* 0x2D8 */ s32 mNumDisplayedDashes;
};
class dLytBirdGauge_c : public d2d::dSubPane {
@@ -27,14 +56,24 @@ public:
dLytBirdGauge_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mMain.getLyt().getLayout()->GetRootPane();
}
virtual d2d::LytBase_c *getLyt() override {
return &mMain.getLyt();
}
virtual const char *getName() const override {
return mMain.getLyt().getName();
}
virtual ~dLytBirdGauge_c() {}
void hide();
private:
static dLytBirdGauge_c *sInstance;
STATE_FUNC_DECLARE(dLytBirdGauge_c, In);
STATE_FUNC_DECLARE(dLytBirdGauge_c, None);
STATE_FUNC_DECLARE(dLytBirdGauge_c, Dash);
@@ -44,6 +83,11 @@ private:
/* 0x008 */ UI_STATE_MGR_DECLARE(dLytBirdGauge_c);
/* 0x008 */ d2d::ResAccIf_c mResAcc;
/* 0x3B4 */ dLytBirdGaugeMain_c mMain;
/* 0x690 */ bool field_0x690;
/* 0x691 */ bool field_0x691;
/* 0x692 */ bool field_0x692;
/* 0x693 */ bool field_0x693;
/* 0x694 */ s32 mGameStateDashes;
};
#endif
include/d/lyt/d_lyt_common_icon_item.h
+1 -1
View File
@@ -65,7 +65,7 @@ public:
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/d_lyt_map.h
+1 -1
View File
@@ -143,7 +143,7 @@ public:
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
include/d/lyt/d_lyt_sky_gauge.h
+1 -2
View File
@@ -3,7 +3,6 @@
#include "d/lyt/d2d.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dLytSkyGauge_c;
@@ -53,7 +52,7 @@ public:
dLytSkyGauge_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mMain.getLyt().getLayout()->GetRootPane();
}
include/d/lyt/meter/d_lyt_meter.h
+2 -2
View File
@@ -29,7 +29,7 @@ public:
virtual ~dLytMeter1Button_c() {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
@@ -64,7 +64,7 @@ public:
virtual ~dLytMeter2Button_c() {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
include/d/lyt/meter/d_lyt_meter_a_btn.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterABtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
include/d/lyt/meter/d_lyt_meter_cross_btn.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
dLytMeterCrossBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_dowsing.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
dLytMeterDowsing_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterGanbariGauge_c() : mStateMgr1(*this, sStateID::null), mStateMgr2(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_heart.h
+1 -1
View File
@@ -8,7 +8,7 @@ public:
dLytMeterHeart_c() {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_item_select.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
dLytMeterItemSelect_c();
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_minus_btn.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
dLytMeterMinusBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_nun_stk.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterNunStk_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_nunchaku_bg.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterNunchakuBg_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_plus_btn.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterPlusBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_remocon_bg.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterRemoconBg_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_rupy.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
dLytMeterRupy_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_shield_gauge.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterShieldGauge_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_timer.h
+2 -2
View File
@@ -14,7 +14,7 @@ public:
}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
@@ -39,7 +39,7 @@ public:
}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_z_btn.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterZBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/toBeSorted/small_sound_mgr.h
+6483
View File
File diff suppressed because it is too large Load Diff