Mirrors/Checkpoint
2
0
Fork 0
mirror of https://github.com/BernardoGiordano/Checkpoint synced 2024-11-13 21:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

change class name to reflect usage

Browse source
This commit is contained in:
LiquidFenrir 2021-04-18 16:31:14 +02:00
parent 98f020f7fe
commit 2f5f3e4a7d
26 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3ds/include/CheatManagerOverlay.hpp
View file

@ -45,7 +45,7 @@ public:
~CheatManagerOverlay(void);
void drawTop(void) const override;
void drawBottom(void) const override;
void update(TouchScreen* touch) override;
void update(InputState* touch) override;
protected:
void save(const std::string& key, Scrollable* s);

2
3ds/include/ErrorOverlay.hpp
View file

@ -43,7 +43,7 @@ public:
~ErrorOverlay(void);
void drawTop(void) const override;
void drawBottom(void) const override;
void update(TouchScreen* touch) override;
void update(InputState* touch) override;
private:
u32 posx, posy;

2
3ds/include/InfoOverlay.hpp
View file

@ -43,7 +43,7 @@ public:
~InfoOverlay(void);
void drawTop(void) const override;
void drawBottom(void) const override;
void update(TouchScreen* touch) override;
void update(InputState* touch) override;
private:
u32 posx, posy;

2
3ds/include/MainScreen.hpp
View file

@ -46,7 +46,7 @@ public:
~MainScreen(void);
void drawTop(void) const override;
void drawBottom(void) const override;
void update(TouchScreen* touch) override;
void update(InputState* touch) override;
protected:
int selectorX(size_t i) const;

2
3ds/include/TouchScreen.hpp
View file

@ -29,6 +29,6 @@
#include <3ds.h>
using TouchScreen = touchPosition;
using InputState = touchPosition;
#endif

2
3ds/include/YesNoOverlay.hpp
View file

@ -44,7 +44,7 @@ public:
~YesNoOverlay(void);
void drawTop(void) const override;
void drawBottom(void) const override;
void update(TouchScreen* touch) override;
void update(InputState* touch) override;
private:
u32 posx, posy;

2
3ds/source/CheatManagerOverlay.cpp
View file

@ -90,7 +90,7 @@ void CheatManagerOverlay::drawBottom(void) const
C2D_DrawRectSolid(0, 0, 0.5f, 320, 240, COLOR_OVERLAY);
}
void CheatManagerOverlay::update(TouchScreen* touch)
void CheatManagerOverlay::update(InputState* touch)
{
if (hidKeysDown() & KEY_A) {
std::string cellName = scrollable->cellName(scrollable->index());

2
3ds/source/ErrorOverlay.cpp
View file

@ -61,7 +61,7 @@ void ErrorOverlay::drawBottom(void) const
Gui::drawPulsingOutline(42, 162, 236, 36, 2, COLOR_RED);
}
void ErrorOverlay::update(TouchScreen* touch)
void ErrorOverlay::update(InputState* touch)
{
if (button->released() || (hidKeysDown() & KEY_A) || (hidKeysDown() & KEY_B)) {
screen.removeOverlay();

2
3ds/source/InfoOverlay.cpp
View file

@ -57,7 +57,7 @@ void InfoOverlay::drawBottom(void) const
Gui::drawPulsingOutline(42, 162, 236, 36, 2, COLOR_BLUE);
}
void InfoOverlay::update(TouchScreen* touch)
void InfoOverlay::update(InputState* touch)
{
if (button->released() || (hidKeysDown() & KEY_A) || (hidKeysDown() & KEY_B)) {
screen.removeOverlay();

2
3ds/source/MainScreen.cpp
View file

@ -264,7 +264,7 @@ void MainScreen::drawBottom(void) const
}
}
void MainScreen::update(TouchScreen* touch)
void MainScreen::update(InputState* touch)
{
updateSelector();
handleEvents(touch);

2
3ds/source/YesNoOverlay.cpp
View file

@ -72,7 +72,7 @@ void YesNoOverlay::drawBottom(void) const
}
}
void YesNoOverlay::update(TouchScreen* touch)
void YesNoOverlay::update(InputState* touch)
{
hid.update(2);

2
common/Overlay.hpp
View file

@ -34,7 +34,7 @@ class Overlay {
public:
Overlay(Screen& screen) : screen(screen), me(screen.currentOverlay) {}
virtual ~Overlay() = default;
virtual void update(TouchScreen*) = 0;
virtual void update(InputState*) = 0;
#if defined(_3DS)
virtual void drawTop() const = 0;
virtual void drawBottom() const = 0;

2
common/Screen.cpp
View file

@ -56,7 +56,7 @@ void Screen::doDraw() const
#endif
void Screen::doUpdate(TouchScreen* touch)
void Screen::doUpdate(InputState* touch)
{
if (currentOverlay) {
currentOverlay->update(touch);

6
common/Screen.hpp
View file

@ -27,7 +27,7 @@
#ifndef SCREEN_HPP
#define SCREEN_HPP
#include "TouchScreen.hpp"
#include "InputState.hpp"
#include <memory>
class Overlay;
@ -48,8 +48,8 @@ public:
virtual void draw() const = 0;
#endif
// Call currentOverlay->update if it exists, and update if it doesn't
void doUpdate(TouchScreen*);
virtual void update(TouchScreen*) = 0;
void doUpdate(InputState*);
virtual void update(InputState*) = 0;
void removeOverlay() { currentOverlay.reset(); }
void setOverlay(std::shared_ptr<Overlay>& overlay) { currentOverlay = overlay; }

2
switch/include/CheatManagerOverlay.hpp
View file

@ -46,7 +46,7 @@ public:
CheatManagerOverlay(Screen& screen, const std::string& mtext);
~CheatManagerOverlay(void) {}
void draw(void) const override;
void update(TouchScreen*) override;
void update(InputState*) override;
protected:
void save(const std::string& key, Scrollable* s);

2
switch/include/ErrorOverlay.hpp
View file

@ -41,7 +41,7 @@ public:
ErrorOverlay(Screen& screen, Result res, const std::string& mtext);
~ErrorOverlay(void) {}
void draw(void) const override;
void update(TouchScreen*) override;
void update(InputState*) override;
private:
u32 textw, texth;

2
switch/include/InfoOverlay.hpp
View file

@ -41,7 +41,7 @@ public:
InfoOverlay(Screen& screen, const std::string& mtext);
~InfoOverlay(void) {}
void draw(void) const override;
void update(TouchScreen* touch) override;
void update(InputState* touch) override;
private:
u32 textw, texth;

8
switch/include/MainScreen.hpp
View file

@ -48,15 +48,15 @@ class Scrollable;
class MainScreen : public Screen {
public:
MainScreen(TouchScreen*);
MainScreen(InputState*);
void draw(void) const override;
void update(TouchScreen* pad) override;
void update(InputState* pad) override;
protected:
int selectorX(size_t i) const;
int selectorY(size_t i) const;
void updateSelector(TouchScreen* pad);
void handleEvents(TouchScreen* pad);
void updateSelector(InputState* pad);
void handleEvents(InputState* pad);
std::string nameFromCell(size_t index) const;
void entryType(entryType_t type);
size_t index(entryType_t type) const;

2
switch/include/TouchScreen.hpp
View file

@ -29,6 +29,6 @@
#include <switch.h>
struct TouchScreen : public HidTouchScreenState, public PadState { };
struct InputState : public HidTouchScreenState, public PadState { };
#endif

2
switch/include/YesNoOverlay.hpp
View file

@ -43,7 +43,7 @@ public:
YesNoOverlay(Screen& screen, const std::string& mtext, const std::function<void()>& callbackYes, const std::function<void()>& callbackNo);
~YesNoOverlay(void) {}
void draw(void) const override;
void update(TouchScreen*) override;
void update(InputState*) override;
private:
u32 textw, texth;

2
switch/source/CheatManagerOverlay.cpp
View file

@ -83,7 +83,7 @@ void CheatManagerOverlay::draw(void) const
20, 94, ceilf(664 + (32 - height) / 2), COLOR_WHITE, multiSelected ? "\ue003 to deselect all cheats" : "\ue003 to select all cheats");
}
void CheatManagerOverlay::update(TouchScreen* pad)
void CheatManagerOverlay::update(InputState* pad)
{
u64 kDown = padGetButtonsDown(pad);
if (kDown & HidNpadButton_A) {

2
switch/source/ErrorOverlay.cpp
View file

@ -45,7 +45,7 @@ void ErrorOverlay::draw(void) const
drawPulsingOutline(322, 462, 636, 56, 4, COLOR_RED);
}
void ErrorOverlay::update(TouchScreen* pad)
void ErrorOverlay::update(InputState* pad)
{
u64 kDown = padGetButtonsDown(pad);
if (button->released() || (kDown & HidNpadButton_A) || (kDown & HidNpadButton_B)) {

2
switch/source/InfoOverlay.cpp
View file

@ -43,7 +43,7 @@ void InfoOverlay::draw(void) const
drawPulsingOutline(322, 462, 636, 56, 4, COLOR_BLUE);
}
void InfoOverlay::update(TouchScreen* pad)
void InfoOverlay::update(InputState* pad)
{
u64 kDown = padGetButtonsDown(pad);
if (button->released() || (kDown & HidNpadButton_A) || (kDown & HidNpadButton_B)) {

8
switch/source/MainScreen.cpp
View file

@ -28,7 +28,7 @@
static constexpr size_t rowlen = 5, collen = 4, rows = 10, SIDEBAR_w = 96;
MainScreen::MainScreen(TouchScreen* pad) : hid(rowlen * collen, collen, pad)
MainScreen::MainScreen(InputState* pad) : hid(rowlen * collen, collen, pad)
{
pksmBridge = false;
wantInstructions = false;
@ -224,13 +224,13 @@ void MainScreen::draw() const
}
}
void MainScreen::update(TouchScreen* pad)
void MainScreen::update(InputState* pad)
{
updateSelector(pad);
handleEvents(pad);
}
void MainScreen::updateSelector(TouchScreen* pad)
void MainScreen::updateSelector(InputState* pad)
{
if (!g_backupScrollEnabled) {
size_t count = getTitleCount(g_currentUId);
@ -262,7 +262,7 @@ void MainScreen::updateSelector(TouchScreen* pad)
}
}
void MainScreen::handleEvents(TouchScreen* pad)
void MainScreen::handleEvents(InputState* pad)
{
const u64 kheld = padGetButtons(pad);
const u64 kdown = padGetButtonsDown(pad);

2
switch/source/YesNoOverlay.cpp
View file

@ -56,7 +56,7 @@ void YesNoOverlay::draw(void) const
}
}
void YesNoOverlay::update(TouchScreen* pad)
void YesNoOverlay::update(InputState* pad)
{
hid.update(2);

2
switch/source/main.cpp
View file

@ -48,7 +48,7 @@ int main(void)
exit(res);
}
TouchScreen pad;
InputState pad;
padInitializeDefault(&pad);
g_screen = std::make_unique<MainScreen>(&pad);