forked from jaildesigner-jailgames/jaildoctors_dilemma
clang-format
This commit is contained in:
@@ -25,23 +25,13 @@ Ending::Ending()
|
||||
SceneManager::current = SceneManager::Scene::ENDING;
|
||||
SceneManager::options = SceneManager::Options::NONE;
|
||||
|
||||
// Inicializa los textos
|
||||
iniTexts();
|
||||
iniTexts(); // Inicializa los textos
|
||||
iniPics(); // Inicializa las imagenes
|
||||
iniScenes(); // Inicializa las escenas
|
||||
|
||||
// Inicializa las imagenes
|
||||
iniPics();
|
||||
|
||||
// Inicializa las escenas
|
||||
iniScenes();
|
||||
|
||||
// Cambia el color del borde
|
||||
Screen::get()->setBorderColor(static_cast<Uint8>(PaletteColor::BLACK));
|
||||
|
||||
// Crea la textura para cubrir el texto
|
||||
cover_surface_ = std::make_shared<Surface>(Options::game.width, Options::game.height + 8);
|
||||
|
||||
// Rellena la textura para la cortinilla
|
||||
fillCoverTexture();
|
||||
Screen::get()->setBorderColor(static_cast<Uint8>(PaletteColor::BLACK)); // Cambia el color del borde
|
||||
cover_surface_ = std::make_shared<Surface>(Options::game.width, Options::game.height + 8); // Crea la textura para cubrir el texto
|
||||
fillCoverTexture(); // Rellena la textura para la cortinilla
|
||||
}
|
||||
|
||||
// Actualiza el objeto
|
||||
@@ -446,55 +436,55 @@ void Ending::updateSpriteCovers() {
|
||||
const float PIXELS_REVEALED = TIME_SINCE_TRIGGER * TEXT_REVEAL_SPEED;
|
||||
|
||||
// Obtiene el sprite
|
||||
auto SPRITE_TEXT = sprite_texts_.at(ti.index);
|
||||
auto sprite_text = sprite_texts_.at(ti.index);
|
||||
|
||||
// Obtener altura inicial de la superficie
|
||||
const float INITIAL_HEIGHT = SPRITE_TEXT.image_surface->getHeight();
|
||||
const float Y_INITIAL = SPRITE_TEXT.image_sprite->getY();
|
||||
const float INITIAL_HEIGHT = sprite_text.image_surface->getHeight();
|
||||
const float Y_INITIAL = sprite_text.image_sprite->getY();
|
||||
|
||||
// Fase 1: Revelar malla decorativa (8 píxeles)
|
||||
if (PIXELS_REVEALED < 8.0F) {
|
||||
SPRITE_TEXT.cover_clip_desp = static_cast<int>(8.0F - PIXELS_REVEALED);
|
||||
SPRITE_TEXT.cover_clip_height = static_cast<int>(INITIAL_HEIGHT);
|
||||
SPRITE_TEXT.cover_sprite->setY(Y_INITIAL);
|
||||
sprite_text.cover_clip_desp = static_cast<int>(8.0F - PIXELS_REVEALED);
|
||||
sprite_text.cover_clip_height = static_cast<int>(INITIAL_HEIGHT);
|
||||
sprite_text.cover_sprite->setY(Y_INITIAL);
|
||||
}
|
||||
// Fase 2: Revelar contenido
|
||||
else {
|
||||
SPRITE_TEXT.cover_clip_desp = 0;
|
||||
sprite_text.cover_clip_desp = 0;
|
||||
const int CONTENT_PIXELS = PIXELS_REVEALED - 8.0F;
|
||||
SPRITE_TEXT.cover_clip_height = std::max(0, static_cast<int>(INITIAL_HEIGHT - CONTENT_PIXELS));
|
||||
SPRITE_TEXT.cover_sprite->setY(Y_INITIAL + static_cast<int>(CONTENT_PIXELS));
|
||||
sprite_text.cover_clip_height = std::max(0, static_cast<int>(INITIAL_HEIGHT - CONTENT_PIXELS));
|
||||
sprite_text.cover_sprite->setY(Y_INITIAL + static_cast<int>(CONTENT_PIXELS));
|
||||
}
|
||||
|
||||
SPRITE_TEXT.cover_sprite->setClip(
|
||||
sprite_text.cover_sprite->setClip(
|
||||
0,
|
||||
SPRITE_TEXT.cover_clip_desp,
|
||||
SPRITE_TEXT.cover_sprite->getWidth(),
|
||||
SPRITE_TEXT.cover_clip_height);
|
||||
sprite_text.cover_clip_desp,
|
||||
sprite_text.cover_sprite->getWidth(),
|
||||
sprite_text.cover_clip_height);
|
||||
}
|
||||
}
|
||||
|
||||
// Actualiza la cortinilla de las imágenes (revelación continua desde el inicio de la escena)
|
||||
auto SPRITE_PICS = sprite_pics_.at(current_scene_);
|
||||
auto sprite_pics = sprite_pics_.at(current_scene_);
|
||||
const float PIXELS_REVEALED = state_time_ * IMAGE_REVEAL_SPEED;
|
||||
const float INITIAL_HEIGHT = SPRITE_PICS.image_surface->getHeight();
|
||||
const float Y_INITIAL = SPRITE_PICS.image_sprite->getY();
|
||||
const float INITIAL_HEIGHT = sprite_pics.image_surface->getHeight();
|
||||
const float Y_INITIAL = sprite_pics.image_sprite->getY();
|
||||
|
||||
// Fase 1: Revelar malla decorativa (8 píxeles)
|
||||
if (PIXELS_REVEALED < 8.0F) {
|
||||
SPRITE_PICS.cover_clip_desp = static_cast<int>(8.0F - PIXELS_REVEALED);
|
||||
SPRITE_PICS.cover_clip_height = static_cast<int>(INITIAL_HEIGHT);
|
||||
SPRITE_PICS.cover_sprite->setY(Y_INITIAL);
|
||||
sprite_pics.cover_clip_desp = static_cast<int>(8.0F - PIXELS_REVEALED);
|
||||
sprite_pics.cover_clip_height = static_cast<int>(INITIAL_HEIGHT);
|
||||
sprite_pics.cover_sprite->setY(Y_INITIAL);
|
||||
}
|
||||
// Fase 2: Revelar contenido
|
||||
else {
|
||||
SPRITE_PICS.cover_clip_desp = 0;
|
||||
sprite_pics.cover_clip_desp = 0;
|
||||
const int CONTENT_PIXELS = PIXELS_REVEALED - 8.0F;
|
||||
SPRITE_PICS.cover_clip_height = std::max(0, static_cast<int>(INITIAL_HEIGHT - CONTENT_PIXELS));
|
||||
SPRITE_PICS.cover_sprite->setY(Y_INITIAL + static_cast<int>(CONTENT_PIXELS));
|
||||
sprite_pics.cover_clip_height = std::max(0, static_cast<int>(INITIAL_HEIGHT - CONTENT_PIXELS));
|
||||
sprite_pics.cover_sprite->setY(Y_INITIAL + static_cast<int>(CONTENT_PIXELS));
|
||||
}
|
||||
|
||||
SPRITE_PICS.cover_sprite->setClip(0, SPRITE_PICS.cover_clip_desp, SPRITE_PICS.cover_sprite->getWidth(), SPRITE_PICS.cover_clip_height);
|
||||
sprite_pics.cover_sprite->setClip(0, sprite_pics.cover_clip_desp, sprite_pics.cover_sprite->getWidth(), sprite_pics.cover_clip_height);
|
||||
}
|
||||
|
||||
// Comprueba si se ha de cambiar de escena
|
||||
|
||||
Reference in New Issue
Block a user