From 20e2d85843ad7f56c6e96eecdd5014bcf8836334 Mon Sep 17 00:00:00 2001 From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com> Date: Sun, 11 May 2025 02:41:56 +0100 Subject: [PATCH] remove bubbles, no one likes easter eggs apparently. fixes #138 --- assets/romfs/theme/bubble1.png | Bin 5147 -> 0 bytes assets/romfs/theme/bubble2.png | Bin 5541 -> 0 bytes assets/romfs/theme/bubble3.png | Bin 6156 -> 0 bytes sphaira/CMakeLists.txt | 1 - sphaira/include/ui/bubbles.hpp | 10 --- sphaira/source/app.cpp | 32 --------- sphaira/source/ui/bubbles.cpp | 115 --------------------------------- 7 files changed, 158 deletions(-) delete mode 100644 assets/romfs/theme/bubble1.png delete mode 100644 assets/romfs/theme/bubble2.png delete mode 100644 assets/romfs/theme/bubble3.png delete mode 100644 sphaira/include/ui/bubbles.hpp delete mode 100644 sphaira/source/ui/bubbles.cpp diff --git a/assets/romfs/theme/bubble1.png b/assets/romfs/theme/bubble1.png deleted file mode 100644 index ade1b1458ab823d8e6ceaa7832664c2f847e7c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5147 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 VzHVJs|7q|5WqCEZ5?RyG{{ouigX;hQ diff --git a/assets/romfs/theme/bubble2.png b/assets/romfs/theme/bubble2.png deleted file mode 100644 index 52e16fa62d6ce7e9eeea7207b80afd2d8e562491..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5541 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 @@ -1419,34 +1417,6 @@ App::App(const char* argv0) { } } - struct EventDay { - u8 day; - u8 month; - }; - - static constexpr EventDay event_days[] = { - { .day = 1, .month = 1 }, // New years - - { .day = 3, .month = 3 }, // March 3 (switch 1) - { .day = 10, .month = 5 }, // June 10 (switch 2) - { .day = 15, .month = 5 }, // June 15 - - { .day = 25, .month = 12 }, // Christmas - { .day = 26, .month = 12 }, - { .day = 27, .month = 12 }, - { .day = 28, .month = 12 }, - }; - - const auto time = std::time(nullptr); - const auto tm = std::localtime(&time); - - for (auto e : event_days) { - if (e.day == tm->tm_mday && e.month == (tm->tm_mon + 1)) { - ui::bubble::Init(); - break; - } - } - App::Push(std::make_shared()); log_write("finished app constructor\n"); } @@ -1679,8 +1649,6 @@ App::~App() { i18n::exit(); curl::Exit(); - ui::bubble::Exit(); - // this has to be called before any cleanup to ensure the lifetime of // nvg is still active as some widgets may need to free images. m_widgets.clear(); diff --git a/sphaira/source/ui/bubbles.cpp b/sphaira/source/ui/bubbles.cpp deleted file mode 100644 index f7e580e..0000000 --- a/sphaira/source/ui/bubbles.cpp +++ /dev/null @@ -1,115 +0,0 @@ -#include "ui/types.hpp" -#include "ui/object.hpp" -#include "ui/nvg_util.hpp" -#include "app.hpp" - -namespace sphaira::ui::bubble { -namespace { - -constexpr auto MAX_BUBBLES = 20; - -struct Bubble { - int start_x; - int texture; - int x,y,w,h; - int y_inc; - float sway_inc; - float sway; - bool sway_right_flag; -}; - -Bubble bubbles[MAX_BUBBLES]{}; -int g_textures[3]; -bool g_is_init = false; - -void setup_bubble(Bubble *bubble) { - // setup normal vars. - bubble->texture = (randomGet64() % std::size(g_textures)); - bubble->start_x = randomGet64() % (int)SCREEN_WIDTH; - bubble->x = bubble->start_x; - bubble->y = (int)SCREEN_HEIGHT - ( randomGet64() % 60 ); - const int size = (randomGet64() % 50) + 40; - bubble->w = size; - bubble->h = size; - bubble->y_inc = (randomGet64() % 5) + 1; - bubble->sway_inc = ((randomGet64() % 6) + 3) / 10; - bubble->sway = 0; -} - -void setup_bubbles(void) { - for (auto& bubble : bubbles) { - setup_bubble(&bubble); - } -} - -void update_bubbles(void) { - for (auto& bubble : bubbles) { - if (bubble.y + bubble.h < 0) { - setup_bubble(&bubble); - } else { - bubble.y -= bubble.y_inc; - - if (bubble.sway_right_flag) { - bubble.x = bubble.start_x + (bubble.sway -= bubble.sway_inc); - if (bubble.sway <= 0) { - bubble.sway_right_flag = false; - } - } else { - bubble.x = bubble.start_x + (bubble.sway += bubble.sway_inc); - if (bubble.sway > 30) { - bubble.sway_right_flag = true; - } - } - } - } -} - -} // namespace - -void Init() { - if (g_is_init) { - return; - } - - if (R_SUCCEEDED(romfsInit())) { - ON_SCOPE_EXIT(romfsExit()); - - auto vg = App::GetVg(); - g_textures[0] = nvgCreateImage(vg, "romfs:/theme/bubble1.png", 0); - g_textures[1] = nvgCreateImage(vg, "romfs:/theme/bubble2.png", 0); - g_textures[2] = nvgCreateImage(vg, "romfs:/theme/bubble3.png", 0); - - setup_bubbles(); - g_is_init = true; - } -} - -void Draw(NVGcontext* vg, Theme* theme) { - if (!g_is_init) { - return; - } - - update_bubbles(); - - for (auto& bubble : bubbles) { - gfx::drawImage(vg, bubble.x, bubble.y, bubble.w, bubble.h, g_textures[bubble.texture]); - } -} - -void Exit() { - if (!g_is_init) { - return; - } - - auto vg = App::GetVg(); - for (auto& texture : g_textures) { - if (texture) { - nvgDeleteImage(vg, texture); - texture = 0; - } - } - - g_is_init = false; -} - -} // namespace sphaira::ui::bubble