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

Fade: el color passa a estar en param.h

Browse Source
This commit is contained in:
Sergio
2025-06-26 14:04:01 +02:00
parent 7c473d7a3d
commit 13c4f66228
12 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/credits.cpp
View File

@@ -47,7 +47,7 @@ Credits::Credits()
Section::name = Section::Name::CREDITS;
balloon_manager_->setPlayArea(play_area_);
fade_in_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b);
fade_in_->setColor(param.fade.color);
fade_in_->setType(FadeType::FULLSCREEN);
fade_in_->setPostDuration(50);
fade_in_->setMode(FadeMode::IN);

8
source/fade.cpp
View File

@@ -332,6 +332,14 @@ void Fade::setColor(Uint8 r, Uint8 g, Uint8 b)
b_ = b;
}
// Establece el color del fade
void Fade::setColor(Color color)
{
r_ = color.r;
g_ = color.g;
b_ = color.b;
}
// Limpia el backbuffer
void Fade::cleanBackbuffer(Uint8 r, Uint8 g, Uint8 b, Uint8 a)
{

2
source/fade.h
View File

@@ -4,6 +4,7 @@
#include <SDL3/SDL_render.h>
#include <SDL3/SDL_stdinc.h>
#include <vector>
#include "utils.h"
// Tipos de fundido
enum class FadeType : Uint8
@@ -46,6 +47,7 @@ public:
// --- Configuración ---
void setColor(Uint8 r, Uint8 g, Uint8 b);
void setColor(Color color);
void setType(FadeType type) { type_ = type; }
void setMode(FadeMode mode) { mode_ = mode; }
void setPostDuration(int value) { post_duration_ = value; }

4
source/game.cpp
View File

@@ -64,14 +64,14 @@ Game::Game(int player_id, int current_stage, bool demo)
Scoreboard::init();
scoreboard_ = Scoreboard::get();
fade_in_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b);
fade_in_->setColor(param.fade.color);
fade_in_->setPreDuration(demo_.enabled ? 80 : 0);
fade_in_->setPostDuration(0);
fade_in_->setType(FadeType::RANDOM_SQUARE);
fade_in_->setMode(FadeMode::IN);
fade_in_->activate();
fade_out_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b);
fade_out_->setColor(param.fade.color);
fade_out_->setPostDuration(param.fade.post_duration);
fade_out_->setType(FadeType::VENETIAN);

2
source/hiscore_table.cpp
View File

@@ -318,7 +318,7 @@ void HiScoreTable::updateSprites()
// Inicializa el fade
void HiScoreTable::initFade()
{
fade_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b);
fade_->setColor(param.fade.color);
fade_->setType(FadeType::RANDOM_SQUARE);
fade_->setPostDuration(param.fade.post_duration);
fade_->setMode(fade_mode_);

2
source/instructions.cpp
View File

@@ -39,7 +39,7 @@ Instructions::Instructions()
view_ = param.game.game_area.rect;
// Inicializa objetos
fade_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b);
fade_->setColor(param.fade.color);
fade_->setType(FadeType::FULLSCREEN);
fade_->setPostDuration(param.fade.post_duration);
fade_->setMode(FadeMode::IN);

5
source/param.cpp
View File

@@ -167,6 +167,11 @@ bool setParams(const std::string &var, const std::string &value)
}
// FADE
else if (var == "fade.color")
{
param.fade.color = Color::fromHex(value);
}
else if (var == "fade.num_squares_width")
{
param.fade.num_squares_width = std::stoi(value);

3
source/param.h
View File

@@ -23,6 +23,7 @@ struct ParamGame
// --- Parámetros del fade ---
struct ParamFade
{
Color color; // Color del fade
float num_squares_width; // Cantidad total de cuadraditos en horizontal para el FadeType::RANDOM_SQUARE
float num_squares_height; // Cantidad total de cuadraditos en vertical para el FadeType::RANDOM_SQUARE
int random_squares_delay; // Duración entre cada pintado de cuadrados
@@ -93,7 +94,7 @@ struct Param
ParamBackground background; // Parámetros del fondo
std::vector<ParamBalloon> balloon; // Parámetros de los globos
ParamNotification notification; // Parámetros de las notificaciones
ParamServiceMenu service_menu; // Parámetros del menú de servicio
ParamServiceMenu service_menu; // Parámetros del menú de servicio
// Constructor
Param() : game(), fade(), scoreboard(), title(), background(), notification()

2
source/title.cpp
View File

@@ -40,7 +40,7 @@ Title::Title()
// Configura objetos
game_logo_->enable();
mini_logo_sprite_->setX(param.game.game_area.center_x - mini_logo_sprite_->getWidth() / 2);
fade_->setColor(FADE_COLOR.r, FADE_COLOR.g, FADE_COLOR.b);
fade_->setColor(param.fade.color);
fade_->setType(FadeType::RANDOM_SQUARE);
fade_->setPostDuration(param.fade.post_duration);
Resource::get()->getTexture("smb2.gif")->setPalette(1);

1
source/utils.h
View File

@@ -179,7 +179,6 @@ constexpr Color SCOREBOARD_EASY_COLOR = Color(0X4B, 0X69, 0X2F);
constexpr Color SCOREBOARD_NORMAL_COLOR = Color(0X2E, 0X3F, 0X47);
constexpr Color SCOREBOARD_HARD_COLOR = Color(0X76, 0X42, 0X8A);
constexpr Color FLASH_COLOR = Color(0XFF, 0XFF, 0XFF);
constexpr Color FADE_COLOR = Color(0X27, 0X27, 0X36);
constexpr Color ORANGE_COLOR = Color(0XFF, 0X7A, 0X00);
constexpr Color ORANGE_SOFT_COLOR = Color(0XFF, 0XA0, 0X33);
constexpr Color ORANGE_SHADOW_COLOR = ORANGE_SOFT_COLOR.darken(100);