From c5c312fc51cdc770422372e3529dbf6765b0fed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Thu, 6 Mar 2025 22:36:53 +0100 Subject: [PATCH] Ja torna a funcionar el fade del logo --- source/logo.cpp | 156 +++++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 74 deletions(-) diff --git a/source/logo.cpp b/source/logo.cpp index 46553f9..4dd1f50 100644 --- a/source/logo.cpp +++ b/source/logo.cpp @@ -20,7 +20,8 @@ Logo::Logo() since_1998_sprite_(std::make_shared(since_1998_surface_, (256 - since_1998_surface_->getWidth()) / 2, 83 + jailgames_surface_->getHeight() + 5, since_1998_surface_->getWidth(), since_1998_surface_->getHeight())) { since_1998_sprite_->setClip(0, 0, since_1998_surface_->getWidth(), since_1998_surface_->getHeight()); - since_1998_color_ = stringToColor("black"); + since_1998_color_ = static_cast(PaletteColor::BRIGHT_BLACK); + jailgames_color_ = static_cast(PaletteColor::WHITE); // Crea los sprites de cada linea for (int i = 0; i < jailgames_surface_->getHeight(); ++i) @@ -35,10 +36,18 @@ Logo::Logo() options.section.section = Section::LOGO; // Inicializa el vector de colores - const std::vector COLORS = {"black", "blue", "red", "magenta", "green", "cyan", "yellow", "bright_white"}; + const std::vector COLORS = { + static_cast(PaletteColor::BLACK), + static_cast(PaletteColor::BLUE), + static_cast(PaletteColor::RED), + static_cast(PaletteColor::MAGENTA), + static_cast(PaletteColor::GREEN), + static_cast(PaletteColor::CYAN), + static_cast(PaletteColor::YELLOW), + static_cast(PaletteColor::BRIGHT_WHITE)}; for (const auto &color : COLORS) { - color_.push_back(stringToColor(color)); + color_.push_back(color); } // Cambia el color del borde @@ -96,91 +105,90 @@ void Logo::updateJAILGAMES() // Gestiona el color de las texturas void Logo::updateTextureColors() { - /*constexpr int INI = 70; + constexpr int INI = 70; constexpr int INC = 4; - if (counter_ == INI + INC * 0) - { - since_1998_surface_->setColor(color_.at(0).r, color_.at(0).g, color_.at(0).b); - } + if (counter_ == INI + INC * 0) + { + since_1998_color_ = color_.at(0); + } - else if (counter_ == INI + INC * 1) - { - since_1998_surface_->setColor(color_.at(1).r, color_.at(1).g, color_.at(1).b); - } + else if (counter_ == INI + INC * 1) + { + since_1998_color_ = color_.at(1); + } - else if (counter_ == INI + INC * 2) - { - since_1998_surface_->setColor(color_.at(2).r, color_.at(2).g, color_.at(2).b); - } + else if (counter_ == INI + INC * 2) + { + since_1998_color_ = color_.at(2); + } - else if (counter_ == INI + INC * 3) - { - since_1998_surface_->setColor(color_.at(3).r, color_.at(3).g, color_.at(3).b); - } + else if (counter_ == INI + INC * 3) + { + since_1998_color_ = color_.at(3); + } - else if (counter_ == INI + INC * 4) - { - since_1998_surface_->setColor(color_.at(4).r, color_.at(4).g, color_.at(4).b); - } + else if (counter_ == INI + INC * 4) + { + since_1998_color_ = color_.at(4); + } - else if (counter_ == INI + INC * 5) - { - since_1998_surface_->setColor(color_.at(5).r, color_.at(5).g, color_.at(5).b); - } + else if (counter_ == INI + INC * 5) + { + since_1998_color_ = color_.at(5); + } - else if (counter_ == INI + INC * 6) - { - since_1998_surface_->setColor(color_.at(6).r, color_.at(6).g, color_.at(6).b); - } + else if (counter_ == INI + INC * 6) + { + since_1998_color_ = color_.at(6); + } - else if (counter_ == INI + INC * 7) - { - since_1998_surface_->setColor(color_.at(7).r, color_.at(7).g, color_.at(7).b); - } + else if (counter_ == INI + INC * 7) + { + since_1998_color_ = color_.at(7); + } - else if (counter_ == INIT_FADE_ + INC * 0) - { - jailgames_surface_->setColor(color_.at(6).r, color_.at(6).g, color_.at(6).b); - since_1998_surface_->setColor(color_.at(6).r, color_.at(6).g, color_.at(6).b); - } + else if (counter_ == INIT_FADE_ + INC * 0) + { + jailgames_color_ = color_.at(6); + since_1998_color_ = color_.at(6); + } - else if (counter_ == INIT_FADE_ + INC * 1) - { - jailgames_surface_->setColor(color_.at(5).r, color_.at(5).g, color_.at(5).b); - since_1998_surface_->setColor(color_.at(5).r, color_.at(5).g, color_.at(5).b); - } + else if (counter_ == INIT_FADE_ + INC * 1) + { + jailgames_color_ = color_.at(5); + since_1998_color_ = color_.at(5); + } - else if (counter_ == INIT_FADE_ + INC * 2) - { - jailgames_surface_->setColor(color_.at(4).r, color_.at(4).g, color_.at(4).b); - since_1998_surface_->setColor(color_.at(4).r, color_.at(4).g, color_.at(4).b); - } + else if (counter_ == INIT_FADE_ + INC * 2) + { + jailgames_color_ = color_.at(4); + since_1998_color_ = color_.at(4); + } - else if (counter_ == INIT_FADE_ + INC * 3) - { - jailgames_surface_->setColor(color_.at(3).r, color_.at(3).g, color_.at(3).b); - since_1998_surface_->setColor(color_.at(3).r, color_.at(3).g, color_.at(3).b); - } + else if (counter_ == INIT_FADE_ + INC * 3) + { + jailgames_color_ = color_.at(3); + since_1998_color_ = color_.at(3); + } - else if (counter_ == INIT_FADE_ + INC * 4) - { - jailgames_surface_->setColor(color_.at(2).r, color_.at(2).g, color_.at(2).b); - since_1998_surface_->setColor(color_.at(2).r, color_.at(2).g, color_.at(2).b); - } + else if (counter_ == INIT_FADE_ + INC * 4) + { + jailgames_color_ = color_.at(2); + since_1998_color_ = color_.at(2); + } - else if (counter_ == INIT_FADE_ + INC * 5) - { - jailgames_surface_->setColor(color_.at(1).r, color_.at(1).g, color_.at(1).b); - since_1998_surface_->setColor(color_.at(1).r, color_.at(1).g, color_.at(1).b); - } + else if (counter_ == INIT_FADE_ + INC * 5) + { + jailgames_color_ = color_.at(1); + since_1998_color_ = color_.at(1); + } - else if (counter_ == INIT_FADE_ + INC * 6) - { - jailgames_surface_->setColor(color_.at(0).r, color_.at(0).g, color_.at(0).b); - since_1998_surface_->setColor(color_.at(0).r, color_.at(0).g, color_.at(0).b); - } - */ + else if (counter_ == INIT_FADE_ + INC * 6) + { + jailgames_color_ = color_.at(0); + since_1998_color_ = color_.at(0); + } } // Actualiza las variables @@ -224,9 +232,9 @@ void Logo::render() // Dibuja los objetos for (const auto &s : jailgames_sprite_) { - s->render(1, stringToColor("white")); + s->render(1, jailgames_color_); } - since_1998_sprite_->render(1, stringToColor("white")); + since_1998_sprite_->render(1, since_1998_color_); // Vuelca el contenido del renderizador en pantalla Screen::get()->render();