diff --git a/Source/sys-clk/overlay/Makefile b/Source/sys-clk/overlay/Makefile index 2b81e27d..d573d087 100644 --- a/Source/sys-clk/overlay/Makefile +++ b/Source/sys-clk/overlay/Makefile @@ -39,7 +39,7 @@ include ${TOPDIR}/lib/libultrahand/ultrahand.mk # version control constants #--------------------------------------------------------------------------------- #TARGET_VERSION := $(shell git describe --dirty --always --tags) -APP_VERSION := 1.0.0 +APP_VERSION := 1.0.1 TARGET_VERSION := $(APP_VERSION) #--------------------------------------------------------------------------------- diff --git a/Source/sys-clk/overlay/src/ui/gui/base_gui.cpp b/Source/sys-clk/overlay/src/ui/gui/base_gui.cpp index 5f6a6670..b98865f7 100644 --- a/Source/sys-clk/overlay/src/ui/gui/base_gui.cpp +++ b/Source/sys-clk/overlay/src/ui/gui/base_gui.cpp @@ -48,16 +48,11 @@ std::string getVersionString() { return std::string(buf); } -// --------------------------------------------- -// AQUATIC BLUE COLORS (4-bit color space) -// --------------------------------------------- -static constexpr tsl::Color dynamicLogoRGB1 = tsl::Color(0, 4, 8, 15); // Deep ocean blue -static constexpr tsl::Color dynamicLogoRGB2 = tsl::Color(7, 15, 15, 15); // Bright aqua cyan -static constexpr tsl::Color STATIC_AQUA = tsl::Color(2, 10, 12, 15); // Mid aqua +static constexpr tsl::Color dynamicLogoRGB1 = tsl::Color(0, 4, 8, 15); +static constexpr tsl::Color dynamicLogoRGB2 = tsl::Color(7, 15, 15, 15); +static constexpr tsl::Color STATIC_AQUA = tsl::Color(2, 10, 12, 15); +const std::string name = "Horizon OC Zeus"; -// --------------------------------------------- -// FULLY ENHANCED ANIMATED LOGO EFFECT -// --------------------------------------------- static s32 drawDynamicUltraText( tsl::gfx::Renderer* renderer, s32 startX, @@ -68,7 +63,6 @@ static s32 drawDynamicUltraText( { static constexpr double cycleDuration = 1.6; - const std::string name = "Horizon OC Zeus"; s32 currentX = startX; const u64 currentTime_ns = armTicksToNs(armGetSystemTick()); @@ -89,15 +83,9 @@ static s32 drawDynamicUltraText( double s1 = n * n * (3.0 - 2.0 * n); double blend = std::clamp(s1, 0.0, 1.0); - // --------------------------------------------- - // Glow Pulse (brightness modulation) - // --------------------------------------------- double glow = (cos(phase * 1.5) + 1.0) * 0.5; double brightness = 0.75 + glow * 0.25; - // --------------------------------------------- - // Color interpolation (4-bit!) - // --------------------------------------------- u8 r = static_cast( (dynamicLogoRGB1.r + (dynamicLogoRGB2.r - dynamicLogoRGB1.r) * blend) * brightness ); @@ -112,21 +100,15 @@ static s32 drawDynamicUltraText( g = std::clamp(g, 0, 15); b = std::clamp(b, 0, 15); - // --------------------------------------------- - // ZEUS Lightning Flash - // --------------------------------------------- bool lightning = (fmod(timeNow, 5.0) < 0.15); if (lightning) { r = std::min(r + 4, 15); g = std::min(g + 4, 15); - b = std::min(b + 15, 15); // strong blue spike + b = std::min(b + 15, 15); } tsl::Color color(r, g, b, 15); - // --------------------------------------------- - // Static Position (no vertical wobble) - // --------------------------------------------- std::string ls(1, letter); if (useNotificationMethod) @@ -138,11 +120,7 @@ static s32 drawDynamicUltraText( return currentX; } -// --------------------------------------------- -// PRE-DRAW HOOK -// --------------------------------------------- -void BaseGui::preDraw(tsl::gfx::Renderer* renderer) -{ +void BaseGui::preDraw(tsl::gfx::Renderer* renderer) { drawDynamicUltraText( renderer, LOGO_X, @@ -153,9 +131,6 @@ void BaseGui::preDraw(tsl::gfx::Renderer* renderer) ); } -// --------------------------------------------- -// UI SETUP -// --------------------------------------------- tsl::elm::Element* BaseGui::createUI() { BaseFrame* rootFrame = new BaseFrame(this); @@ -163,9 +138,6 @@ tsl::elm::Element* BaseGui::createUI() return rootFrame; } -// --------------------------------------------- -// LIVE UPDATE -// --------------------------------------------- void BaseGui::update() { this->refresh();