jaildesigner-jailgames/coffee_crisis_arcade_edition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 13 Wiki Activity

ServiceMenu: arreglos de colorets

Browse Source
This commit is contained in:
Sergio
2025-06-21 20:51:10 +02:00
parent b6698043fd
commit 4f81712e3c
6 changed files with 370 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
source/ui/menu_renderer.cpp
View File

@@ -4,13 +4,33 @@
#include "screen.h" // Para param
#include <array>
MenuRenderer::MenuRenderer(std::shared_ptr<Text> element_text, std::shared_ptr<Text> title_text)
: element_text_(std::move(element_text)), title_text_(std::move(title_text)) {}
MenuRenderer::MenuRenderer(const ServiceMenu *menu_state, std::shared_ptr<Text> element_text, std::shared_ptr<Text> title_text)
: element_text_(std::move(element_text)), title_text_(std::move(title_text)) { init(menu_state); }
void MenuRenderer::init(const ServiceMenu *menu_state)
{
aspect_ = menu_state->getAspect();
switch (aspect_)
{
case ServiceMenu::Aspect::SHADOW:
bg_color_ = SERV_MENU_BG_COLOR_SHADOW;
bg_alpha_ = 255;
break;
case ServiceMenu::Aspect::ALPHA:
bg_color_ = SERV_MENU_BG_COLOR_ALPHA;
bg_alpha_ = 240;
break;
default:
break;
}
}
void MenuRenderer::render(const ServiceMenu *menu_state)
{
// Dibuja la sombra
if (menu_state->getAspect() == ServiceMenu::Aspect::ASPECT1)
if (aspect_ == ServiceMenu::Aspect::SHADOW)
{
SDL_FRect shadowRect = {rect_.x + 5, rect_.y + 5, rect_.w, rect_.h};
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), 0, 0, 0, 64);
@@ -18,13 +38,14 @@ void MenuRenderer::render(const ServiceMenu *menu_state)
}
// Dibuja el fondo
const Uint8 ALPHA = menu_state->getAspect() == ServiceMenu::Aspect::ASPECT1 ? 255 : 255;
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), bg_color_.r, bg_color_.g, bg_color_.b, ALPHA);
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), bg_color_.r, bg_color_.g, bg_color_.b, bg_alpha_);
SDL_RenderFillRect(Screen::get()->getRenderer(), &rect_);
// Dibuja el borde
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), title_color_.r, title_color_.g, title_color_.b, 255);
const Color BORDER_COLOR = title_color_.darken();
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), BORDER_COLOR.r, BORDER_COLOR.g, BORDER_COLOR.b, 255);
SDL_RenderRect(Screen::get()->getRenderer(), &rect_);
SDL_RenderRect(Screen::get()->getRenderer(), &border_rect_);
// Dibuja el título
float y = rect_.y + title_padding_;
@@ -32,7 +53,7 @@ void MenuRenderer::render(const ServiceMenu *menu_state)
// Dibuja la línea separadora
y = rect_.y + upper_height_;
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), title_color_.r, title_color_.g, title_color_.b, 255);
SDL_SetRenderDrawColor(Screen::get()->getRenderer(), BORDER_COLOR.r, BORDER_COLOR.g, BORDER_COLOR.b, 255);
SDL_RenderLine(Screen::get()->getRenderer(), rect_.x + ServiceMenu::OPTIONS_HORIZONTAL_PADDING_, y, rect_.x + rect_.w - ServiceMenu::OPTIONS_HORIZONTAL_PADDING_, y);
// Dibuja las opciones
@@ -113,7 +134,7 @@ SDL_FRect MenuRenderer::calculateNewRect(const ServiceMenu *menu_state)
const auto &display_options = menu_state->getDisplayOptions();
lower_height_ = ((display_options.size() > 0 ? display_options.size() - 1 : 0) * (options_height_ + options_padding_)) + options_height_ + (lower_padding_ * 2);
height_ = upper_height_ + lower_height_;
return {(param.game.width - width_) / 2.0f, (param.game.height - height_) / 2.0f, (float)width_, (float)height_};
}
@@ -130,7 +151,7 @@ void MenuRenderer::resize(const ServiceMenu *menu_state)
}
else
{
rect_ = new_rect;
rect_ = setRect(new_rect);
resizing_ = false;
}
options_y_ = new_rect.y + upper_height_ + lower_padding_;
@@ -138,8 +159,7 @@ void MenuRenderer::resize(const ServiceMenu *menu_state)
void MenuRenderer::setSize(const ServiceMenu *menu_state)
{
SDL_FRect new_rect = calculateNewRect(menu_state);
rect_ = new_rect;
rect_ = setRect(calculateNewRect(menu_state));
resizing_ = false;
options_y_ = rect_.y + upper_height_ + lower_padding_;
}
@@ -152,15 +172,17 @@ void MenuRenderer::updateResizeAnimation()
float t = static_cast<float>(resize_anim_step_) / resize_anim_steps_;
if (t >= 1.0f)
{
rect_ = rect_anim_to_;
rect_ = setRect(rect_anim_to_);
resizing_ = false;
return;
}
float ease = 1 - (1 - t) * (1 - t);
rect_.x = rect_anim_from_.x + (rect_anim_to_.x - rect_anim_from_.x) * ease;
rect_.y = rect_anim_from_.y + (rect_anim_to_.y - rect_anim_from_.y) * ease;
rect_.w = rect_anim_from_.w + (rect_anim_to_.w - rect_anim_from_.w) * ease;
rect_.h = rect_anim_from_.h + (rect_anim_to_.h - rect_anim_from_.h) * ease;
SDL_FRect rect =
{rect_anim_from_.x + (rect_anim_to_.x - rect_anim_from_.x) * ease,
rect_anim_from_.y + (rect_anim_to_.y - rect_anim_from_.y) * ease,
rect_anim_from_.w + (rect_anim_to_.w - rect_anim_from_.w) * ease,
rect_anim_from_.h + (rect_anim_to_.h - rect_anim_from_.h) * ease};
rect_ = setRect(rect);
}
void MenuRenderer::precalculateMenuWidths(const std::vector<std::unique_ptr<MenuOption>> &all_options, const ServiceMenu *menu_state)
@@ -209,10 +231,12 @@ void MenuRenderer::updateColorCounter()
Color MenuRenderer::getAnimatedSelectedColor()
{
static const std::array<Color, 12> colors = {
Color(0xFF, 0xFB, 0x8A), Color(0xFF, 0xE4, 0x5D), Color(0xFF, 0xD1, 0x3C),
Color(0xFF, 0xBF, 0x23), Color(0xFF, 0xAA, 0x12), Color(0xE6, 0x9A, 0x08),
Color(0xE6, 0x9A, 0x08), Color(0xFF, 0xAA, 0x12), Color(0xFF, 0xBF, 0x23),
Color(0xFF, 0xD1, 0x3C), Color(0xFF, 0xE4, 0x5D), Color(0xFF, 0xFB, 0x8A)};
return colors.at(color_counter_ % colors.size());
static auto colorCycle = generateMirroredCycle(SERV_MENU_SELECTED_COLOR, ColorCycleStyle::HueWave);
return colorCycle.at(color_counter_ % colorCycle.size());
}
SDL_FRect MenuRenderer::setRect(SDL_FRect rect)
{
border_rect_ = {rect.x - 1, rect.y + 1, rect.w + 2, rect.h - 2};
return rect;
}

9
source/ui/menu_renderer.h
View File

@@ -14,7 +14,7 @@ class MenuOption;
class MenuRenderer
{
public:
MenuRenderer(std::shared_ptr<Text> element_text, std::shared_ptr<Text> title_text);
MenuRenderer(const ServiceMenu *menu_state, std::shared_ptr<Text> element_text, std::shared_ptr<Text> title_text);
// Métodos principales de la vista
void render(const ServiceMenu *menu_state);
@@ -33,8 +33,11 @@ private:
std::shared_ptr<Text> title_text_;
// --- Variables de estado de la vista (layout y animación) ---
ServiceMenu::Aspect aspect_ = ServiceMenu::Aspect::ALPHA;
SDL_FRect rect_{};
Color bg_color_ = SERV_MENU_BG_COLOR;
SDL_FRect border_rect_{};
Color bg_color_ = SERV_MENU_BG_COLOR_ALPHA;
Uint8 bg_alpha_ = 240;
Color title_color_ = SERV_MENU_TITLE_COLOR;
Color text_color_ = SERV_MENU_TEXT_COLOR;
Color selected_color_ = SERV_MENU_SELECTED_COLOR;
@@ -61,6 +64,7 @@ private:
int group_menu_widths_[5]{};
// --- Métodos privados de la vista ---
void init(const ServiceMenu *menu_state);
void setAnchors(const ServiceMenu *menu_state);
SDL_FRect calculateNewRect(const ServiceMenu *menu_state);
void resize(const ServiceMenu *menu_state);
@@ -70,4 +74,5 @@ private:
int getMenuWidthForGroup(ServiceMenu::SettingsGroup group) const;
Color getAnimatedSelectedColor();
void updateColorCounter();
SDL_FRect setRect(SDL_FRect rect);
};

151
source/ui/service_menu.cpp
View File

@@ -1,17 +1,17 @@
#include "ui/service_menu.h"
#include "menu_renderer.h"
#include "menu_renderer.h"
#include "menu_option.h"
#include "resource.h"
#include "audio.h"
#include "section.h"
#include "screen.h"
#include "screen.h"
#include "asset.h"
// Singleton
ServiceMenu* ServiceMenu::instance_ = nullptr;
ServiceMenu *ServiceMenu::instance_ = nullptr;
void ServiceMenu::init() { ServiceMenu::instance_ = new ServiceMenu(); }
void ServiceMenu::destroy() { delete ServiceMenu::instance_; }
ServiceMenu* ServiceMenu::get() { return ServiceMenu::instance_; }
ServiceMenu *ServiceMenu::get() { return ServiceMenu::instance_; }
// Constructor
ServiceMenu::ServiceMenu()
@@ -21,23 +21,27 @@ ServiceMenu::ServiceMenu()
auto element_text = Resource::get()->getText("04b_25_flat");
auto title_text = Resource::get()->getText("04b_25_flat_2x");
renderer_ = std::make_unique<MenuRenderer>(element_text, title_text);
renderer_ = std::make_unique<MenuRenderer>(this, element_text, title_text);
restart_message_ui_ = std::make_unique<UIMessage>(element_text, Lang::getText("[SERVICE_MENU] NEED_RESTART_MESSAGE"), SERV_MENU_TITLE_COLOR);
reset();
}
void ServiceMenu::toggle() {
void ServiceMenu::toggle()
{
enabled_ = !enabled_;
if (!enabled_) {
if (!enabled_)
{
reset();
}
}
void ServiceMenu::render() {
if (!enabled_) return;
void ServiceMenu::render()
{
if (!enabled_)
return;
renderer_->render(this);
// El mensaje de reinicio se dibuja por encima, así que lo gestionamos aquí
const float MSG_X = param.game.game_area.center_x;
const float MSG_Y = renderer_->getRect().y + 39.0f;
@@ -45,20 +49,24 @@ void ServiceMenu::render() {
restart_message_ui_->render();
}
void ServiceMenu::update() {
if (!enabled_) return;
void ServiceMenu::update()
{
if (!enabled_)
return;
renderer_->update(this);
bool now_pending = Options::pending_changes.has_pending_changes;
if (now_pending != last_pending_changes_) {
if (now_pending != last_pending_changes_)
{
now_pending ? restart_message_ui_->show() : restart_message_ui_->hide();
last_pending_changes_ = now_pending;
}
restart_message_ui_->update();
}
void ServiceMenu::reset() {
void ServiceMenu::reset()
{
selected_ = 0;
main_menu_selected_ = 0;
current_settings_group_ = SettingsGroup::MAIN;
@@ -69,45 +77,60 @@ void ServiceMenu::reset() {
}
// --- Lógica de Navegación ---
void ServiceMenu::setSelectorUp() {
if (display_options_.empty()) return;
void ServiceMenu::setSelectorUp()
{
if (display_options_.empty())
return;
selected_ = (selected_ > 0) ? selected_ - 1 : display_options_.size() - 1;
playMenuSound();
}
void ServiceMenu::setSelectorDown() {
if (display_options_.empty()) return;
void ServiceMenu::setSelectorDown()
{
if (display_options_.empty())
return;
selected_ = (selected_ + 1) % display_options_.size();
playMenuSound();
}
void ServiceMenu::adjustOption(bool adjust_up) {
if (display_options_.empty()) return;
auto& selected_option = display_options_.at(selected_);
if (selected_option->getBehavior() == MenuOption::Behavior::ADJUST) {
void ServiceMenu::adjustOption(bool adjust_up)
{
if (display_options_.empty())
return;
auto &selected_option = display_options_.at(selected_);
if (selected_option->getBehavior() == MenuOption::Behavior::ADJUST)
{
selected_option->adjustValue(adjust_up);
applySettings();
playMenuSound();
}
}
void ServiceMenu::selectOption() {
if (display_options_.empty()) return;
if (current_settings_group_ == SettingsGroup::MAIN) main_menu_selected_ = selected_;
auto& selected_option = display_options_.at(selected_);
if (auto folder = dynamic_cast<FolderOption*>(selected_option)) {
void ServiceMenu::selectOption()
{
if (display_options_.empty())
return;
if (current_settings_group_ == SettingsGroup::MAIN)
main_menu_selected_ = selected_;
auto &selected_option = display_options_.at(selected_);
if (auto folder = dynamic_cast<FolderOption *>(selected_option))
{
previous_settings_group_ = current_settings_group_;
current_settings_group_ = folder->getTargetGroup();
selected_ = 0;
updateMenu();
} else if (selected_option->getBehavior() == MenuOption::Behavior::SELECT) {
}
else if (selected_option->getBehavior() == MenuOption::Behavior::SELECT)
{
selected_option->executeAction();
}
playMenuSound();
}
void ServiceMenu::moveBack() {
if (current_settings_group_ == SettingsGroup::MAIN) {
void ServiceMenu::moveBack()
{
if (current_settings_group_ == SettingsGroup::MAIN)
{
enabled_ = false;
return;
}
@@ -119,21 +142,25 @@ void ServiceMenu::moveBack() {
// --- Lógica Interna ---
void ServiceMenu::updateMenu() {
void ServiceMenu::updateMenu()
{
title_ = settingsGroupToString(current_settings_group_);
AdjustListValues();
// Actualiza las opciones visibles
display_options_.clear();
for (auto& option : options_) {
if (option->getGroup() == current_settings_group_ && !option->isHidden()) {
for (auto &option : options_)
{
if (option->getGroup() == current_settings_group_ && !option->isHidden())
{
display_options_.push_back(option.get());
}
}
// Actualiza los pares de strings para el renderer
option_pairs_.clear();
for (const auto& option : display_options_) {
for (const auto &option : display_options_)
{
option_pairs_.emplace_back(option->getCaption(), option->getValueAsString());
}
@@ -141,12 +168,18 @@ void ServiceMenu::updateMenu() {
renderer_->onLayoutChanged(this);
}
void ServiceMenu::applySettings() {
if (current_settings_group_ == SettingsGroup::VIDEO) Screen::get()->applySettings();
if (current_settings_group_ == SettingsGroup::AUDIO) Audio::get()->applySettings();
if (current_settings_group_ == SettingsGroup::SETTINGS) {
for(auto& option : options_){
if(option->getCaption() == Lang::getText("[SERVICE_MENU] SHUTDOWN]")){
void ServiceMenu::applySettings()
{
if (current_settings_group_ == SettingsGroup::VIDEO)
Screen::get()->applySettings();
if (current_settings_group_ == SettingsGroup::AUDIO)
Audio::get()->applySettings();
if (current_settings_group_ == SettingsGroup::SETTINGS)
{
for (auto &option : options_)
{
if (option->getCaption() == Lang::getText("[SERVICE_MENU] SHUTDOWN]"))
{
option->setHidden(!Options::settings.shutdown_enabled);
updateMenu(); // El menú debe refrescarse si algo se oculta
break;
@@ -155,28 +188,34 @@ void ServiceMenu::applySettings() {
}
// Refresca los pares de strings por si un valor cambió
option_pairs_.clear();
for (const auto& option : display_options_) {
for (const auto &option : display_options_)
{
option_pairs_.emplace_back(option->getCaption(), option->getValueAsString());
}
}
// --- Getters y otros ---
ServiceMenu::GroupAlignment ServiceMenu::getCurrentGroupAlignment() const {
switch (current_settings_group_) {
case SettingsGroup::VIDEO:
case SettingsGroup::AUDIO:
case SettingsGroup::SETTINGS:
return GroupAlignment::LEFT;
default:
return GroupAlignment::CENTERED;
ServiceMenu::GroupAlignment ServiceMenu::getCurrentGroupAlignment() const
{
switch (current_settings_group_)
{
case SettingsGroup::VIDEO:
case SettingsGroup::AUDIO:
case SettingsGroup::SETTINGS:
return GroupAlignment::LEFT;
default:
return GroupAlignment::CENTERED;
}
}
size_t ServiceMenu::countOptionsInGroup(SettingsGroup group) const {
size_t ServiceMenu::countOptionsInGroup(SettingsGroup group) const
{
size_t count = 0;
for (const auto& option : options_) {
if (option->getGroup() == group && !option->isHidden()) {
for (const auto &option : options_)
{
if (option->getGroup() == group && !option->isHidden())
{
count++;
}
}
@@ -225,7 +264,7 @@ void ServiceMenu::initializeOptions()
options_.push_back(std::make_unique<FolderOption>(Lang::getText("[SERVICE_MENU] SETTINGS"), SettingsGroup::MAIN, SettingsGroup::SETTINGS));
options_.push_back(std::make_unique<FolderOption>(Lang::getText("[SERVICE_MENU] SYSTEM"), SettingsGroup::MAIN, SettingsGroup::SYSTEM));
//precalculateMenuWidths();
// precalculateMenuWidths();
}
// Sincroniza los valores de las opciones tipo lista
@@ -240,7 +279,6 @@ void ServiceMenu::AdjustListValues()
}
}
// Reproduce el sonido de navegación del menú
void ServiceMenu::playMenuSound() { Audio::get()->playSound("clock.wav"); }
@@ -263,4 +301,3 @@ std::string ServiceMenu::settingsGroupToString(SettingsGroup group) const
return Lang::getText("[SERVICE_MENU] TITLE");
}
}

8
source/ui/service_menu.h
View File

@@ -14,7 +14,7 @@ class MenuRenderer; // <-- Nuevo
class ServiceMenu {
public:
enum class Aspect { ASPECT1, ASPECT2 };
enum class Aspect { SHADOW, ALPHA };
enum class SettingsGroup { VIDEO, AUDIO, SETTINGS, SYSTEM, MAIN };
enum class GroupAlignment { CENTERED, LEFT };
@@ -28,8 +28,8 @@ public:
static ServiceMenu* get();
void toggle();
void render(); // Ahora solo delega
void update(); // Ahora delega la parte visual
void render();
void update();
void reset();
// --- Lógica de navegación ---
@@ -60,7 +60,7 @@ private:
SettingsGroup current_settings_group_;
SettingsGroup previous_settings_group_;
Aspect aspect_ = Aspect::ASPECT1;
Aspect aspect_ = Aspect::ALPHA;
std::string title_;
size_t selected_ = 0;
size_t main_menu_selected_ = 0;