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

migrat a deltaTime screen.cpp i notifier.cpp

Browse Source
This commit is contained in:
Sergio
2025-09-24 18:08:50 +02:00
parent 40a2b2cc00
commit d077374883
19 changed files with 192 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/ui/notifier.cpp
View File

@@ -2,7 +2,7 @@
#include <SDL3/SDL.h> // Para SDL_RenderFillRect, SDL_FRect, SDL_RenderClear
#include <algorithm> // Para remove_if
#include <algorithm> // Para remove_if, min
#include <string> // Para basic_string, string
#include <utility>
#include <vector> // Para vector
@@ -32,7 +32,6 @@ Notifier::Notifier(const std::string& icon_file, std::shared_ptr<Text> text)
icon_texture_(!icon_file.empty() ? std::make_unique<Texture>(renderer_, icon_file) : nullptr),
text_(std::move(text)),
bg_color_(param.notification.color),
wait_time_(150),
stack_(false),
has_icons_(!icon_file.empty()) {}
@@ -43,13 +42,13 @@ void Notifier::render() {
}
}
// Actualiza el estado de las notificaiones
void Notifier::update() {
// Actualiza el estado de las notificaciones
void Notifier::update(float delta_time) {
for (int i = 0; i < (int)notifications_.size(); ++i) {
if (!shouldProcessNotification(i)) {
break;
}
processNotification(i);
processNotification(i, delta_time);
}
clearFinishedNotifications();
}
@@ -59,52 +58,54 @@ auto Notifier::shouldProcessNotification(int index) const -> bool {
return index <= 0 || notifications_[index - 1].state != State::RISING;
}
void Notifier::processNotification(int index) {
void Notifier::processNotification(int index, float delta_time) {
auto& notification = notifications_[index];
notification.counter++;
notification.timer += delta_time;
playNotificationSoundIfNeeded(notification);
updateNotificationState(index);
updateNotificationState(index, delta_time);
notification.sprite->setPosition(notification.rect);
}
void Notifier::playNotificationSoundIfNeeded(const Notification& notification) {
// Hace sonar la notificación en el primer frame
if (notification.counter == 1 &&
// Hace sonar la notificación al inicio
if (notification.timer <= 0.016f &&
param.notification.sound &&
notification.state == State::RISING) {
Audio::get()->playSound("notify.wav", Audio::Group::INTERFACE);
}
}
void Notifier::updateNotificationState(int index) {
void Notifier::updateNotificationState(int index, float delta_time) {
auto& notification = notifications_[index];
switch (notification.state) {
case State::RISING:
handleRisingState(index);
handleRisingState(index, delta_time);
break;
case State::STAY:
handleStayState(index);
break;
case State::VANISHING:
handleVanishingState(index);
handleVanishingState(index, delta_time);
break;
default:
break;
}
}
void Notifier::handleRisingState(int index) {
void Notifier::handleRisingState(int index, float delta_time) {
auto& notification = notifications_[index];
const float STEP = (float)notification.counter / notification.travel_dist;
const int ALPHA = 255 * STEP;
const float PIXELS_TO_MOVE = ANIMATION_SPEED_PX_PER_S * delta_time;
const float PROGRESS = notification.timer * ANIMATION_SPEED_PX_PER_S / notification.travel_dist;
const int ALPHA = static_cast<int>(255 * std::min(PROGRESS, 1.0f));
moveNotificationVertically(notification, param.notification.pos_v == Position::TOP ? 1 : -1);
moveNotificationVertically(notification, param.notification.pos_v == Position::TOP ? PIXELS_TO_MOVE : -PIXELS_TO_MOVE);
notification.texture->setAlpha(ALPHA);
if (notification.rect.y == notification.y) {
if ((param.notification.pos_v == Position::TOP && notification.rect.y >= notification.y) ||
(param.notification.pos_v == Position::BOTTOM && notification.rect.y <= notification.y)) {
transitionToStayState(index);
}
}
@@ -112,35 +113,37 @@ void Notifier::handleRisingState(int index) {
void Notifier::handleStayState(int index) {
auto& notification = notifications_[index];
if (notification.counter == wait_time_) {
if (notification.timer >= STAY_DURATION_S) {
notification.state = State::VANISHING;
notification.counter = 0;
notification.timer = 0.0f;
}
}
void Notifier::handleVanishingState(int index) {
void Notifier::handleVanishingState(int index, float delta_time) {
auto& notification = notifications_[index];
const float STEP = notification.counter / (float)notification.travel_dist;
const int ALPHA = 255 * (1 - STEP);
const float PIXELS_TO_MOVE = ANIMATION_SPEED_PX_PER_S * delta_time;
const float PROGRESS = notification.timer * ANIMATION_SPEED_PX_PER_S / notification.travel_dist;
const int ALPHA = static_cast<int>(255 * (1 - std::min(PROGRESS, 1.0f)));
moveNotificationVertically(notification, param.notification.pos_v == Position::TOP ? -1 : 1);
moveNotificationVertically(notification, param.notification.pos_v == Position::TOP ? -PIXELS_TO_MOVE : PIXELS_TO_MOVE);
notification.texture->setAlpha(ALPHA);
if (notification.rect.y == notification.y - notification.travel_dist) {
if (PROGRESS >= 1.0f) {
notification.state = State::FINISHED;
}
}
void Notifier::moveNotificationVertically(Notification& notification, int direction) {
notification.rect.y += direction;
void Notifier::moveNotificationVertically(Notification& notification, float pixels_to_move) {
notification.rect.y += pixels_to_move;
}
void Notifier::transitionToStayState(int index) {
auto& notification = notifications_[index];
notification.state = State::STAY;
notification.texture->setAlpha(255);
notification.counter = 0;
notification.rect.y = static_cast<float>(notification.y); // Asegurar posición exacta
notification.timer = 0.0f;
}
// Elimina las notificaciones finalizadas