Continuem estandaritzant noms
This commit is contained in:
@@ -13,24 +13,24 @@
|
||||
|
||||
// Constructor
|
||||
GameLogo::GameLogo(int x, int y)
|
||||
: x(x), y(y)
|
||||
: x_(x), y_(y)
|
||||
{
|
||||
// Crea los objetos
|
||||
dustTexture = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_dust.png"));
|
||||
coffeeTexture = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_coffee.png"));
|
||||
crisisTexture = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_crisis.png"));
|
||||
arcadeEditionTexture = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_arcade_edition.png"));
|
||||
dust_texture_ = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_dust.png"));
|
||||
coffee_texture_ = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_coffee.png"));
|
||||
crisis_texture_ = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_crisis.png"));
|
||||
arcade_edition_texture_ = std::make_shared<Texture>(Screen::get()->getRenderer(), Asset::get()->get("title_arcade_edition.png"));
|
||||
|
||||
coffeeSprite = std::make_unique<SmartSprite>(coffeeTexture);
|
||||
crisisSprite = std::make_unique<SmartSprite>(crisisTexture);
|
||||
coffee_sprite_ = std::make_unique<SmartSprite>(coffee_texture_);
|
||||
crisis_sprite_ = std::make_unique<SmartSprite>(crisis_texture_);
|
||||
|
||||
arcadeEditionSprite = std::make_unique<Sprite>((param.game.width - arcadeEditionTexture->getWidth()) / 2, param.title.arcade_edition_position, arcadeEditionTexture->getWidth(), arcadeEditionTexture->getHeight(), arcadeEditionTexture);
|
||||
arcade_edition_sprite_ = std::make_unique<Sprite>((param.game.width - arcade_edition_texture_->getWidth()) / 2, param.title.arcade_edition_position, arcade_edition_texture_->getWidth(), arcade_edition_texture_->getHeight(), arcade_edition_texture_);
|
||||
|
||||
dustLSprite = std::make_unique<AnimatedSprite>(dustTexture, Asset::get()->get("title_dust.ani"));
|
||||
dustRSprite = std::make_unique<AnimatedSprite>(dustTexture, Asset::get()->get("title_dust.ani"));
|
||||
dust_left_sprite_ = std::make_unique<AnimatedSprite>(dust_texture_, Asset::get()->get("title_dust.ani"));
|
||||
dust_right_sprite_ = std::make_unique<AnimatedSprite>(dust_texture_, Asset::get()->get("title_dust.ani"));
|
||||
|
||||
// Sonidos
|
||||
crashSound = JA_LoadSound(Asset::get()->get("title.wav").c_str());
|
||||
crash_sound_ = JA_LoadSound(Asset::get()->get("title.wav").c_str());
|
||||
|
||||
// Inicializa las variables
|
||||
init();
|
||||
@@ -39,140 +39,140 @@ GameLogo::GameLogo(int x, int y)
|
||||
// Destructor
|
||||
GameLogo::~GameLogo()
|
||||
{
|
||||
JA_DeleteSound(crashSound);
|
||||
JA_DeleteSound(crash_sound_);
|
||||
}
|
||||
|
||||
// Inicializa las variables
|
||||
void GameLogo::init()
|
||||
{
|
||||
const auto xp = x - coffeeSprite->getWidth() / 2;
|
||||
const auto xp = x_ - coffee_sprite_->getWidth() / 2;
|
||||
const auto desp = getInitialVerticalDesp();
|
||||
|
||||
// Variables
|
||||
status = Status::DISABLED;
|
||||
shake.desp = 1;
|
||||
shake.delay = 2;
|
||||
shake.lenght = 8;
|
||||
shake.remaining = shake.lenght;
|
||||
shake.counter = shake.delay;
|
||||
shake.origin = xp;
|
||||
status_ = Status::DISABLED;
|
||||
shake_.desp = 1;
|
||||
shake_.delay = 2;
|
||||
shake_.lenght = 8;
|
||||
shake_.remaining = shake_.lenght;
|
||||
shake_.counter = shake_.delay;
|
||||
shake_.origin = xp;
|
||||
|
||||
// Inicializa el bitmap de 'Coffee'
|
||||
coffeeSprite->init();
|
||||
coffeeSprite->setPosX(xp);
|
||||
coffeeSprite->setPosY(y - coffeeTexture->getHeight() - desp);
|
||||
coffeeSprite->setWidth(coffeeTexture->getWidth());
|
||||
coffeeSprite->setHeight(coffeeTexture->getHeight());
|
||||
coffeeSprite->setVelX(0.0f);
|
||||
coffeeSprite->setVelY(2.5f);
|
||||
coffeeSprite->setAccelX(0.0f);
|
||||
coffeeSprite->setAccelY(0.1f);
|
||||
coffeeSprite->setSpriteClip(0, 0, coffeeTexture->getWidth(), coffeeTexture->getHeight());
|
||||
coffeeSprite->setEnabled(true);
|
||||
coffeeSprite->setFinishedCounter(0);
|
||||
coffeeSprite->setDestX(xp);
|
||||
coffeeSprite->setDestY(y - coffeeTexture->getHeight());
|
||||
coffee_sprite_->init();
|
||||
coffee_sprite_->setPosX(xp);
|
||||
coffee_sprite_->setPosY(y_ - coffee_texture_->getHeight() - desp);
|
||||
coffee_sprite_->setWidth(coffee_texture_->getWidth());
|
||||
coffee_sprite_->setHeight(coffee_texture_->getHeight());
|
||||
coffee_sprite_->setVelX(0.0f);
|
||||
coffee_sprite_->setVelY(2.5f);
|
||||
coffee_sprite_->setAccelX(0.0f);
|
||||
coffee_sprite_->setAccelY(0.1f);
|
||||
coffee_sprite_->setSpriteClip(0, 0, coffee_texture_->getWidth(), coffee_texture_->getHeight());
|
||||
coffee_sprite_->setEnabled(true);
|
||||
coffee_sprite_->setFinishedCounter(0);
|
||||
coffee_sprite_->setDestX(xp);
|
||||
coffee_sprite_->setDestY(y_ - coffee_texture_->getHeight());
|
||||
|
||||
// Inicializa el bitmap de 'Crisis'
|
||||
crisisSprite->init();
|
||||
crisisSprite->setPosX(xp + 15);
|
||||
crisisSprite->setPosY(y + desp);
|
||||
crisisSprite->setWidth(crisisTexture->getWidth());
|
||||
crisisSprite->setHeight(crisisTexture->getHeight());
|
||||
crisisSprite->setVelX(0.0f);
|
||||
crisisSprite->setVelY(-2.5f);
|
||||
crisisSprite->setAccelX(0.0f);
|
||||
crisisSprite->setAccelY(-0.1f);
|
||||
crisisSprite->setSpriteClip(0, 0, crisisTexture->getWidth(), crisisTexture->getHeight());
|
||||
crisisSprite->setEnabled(true);
|
||||
crisisSprite->setFinishedCounter(0);
|
||||
crisisSprite->setDestX(xp + 15);
|
||||
crisisSprite->setDestY(y);
|
||||
crisis_sprite_->init();
|
||||
crisis_sprite_->setPosX(xp + 15);
|
||||
crisis_sprite_->setPosY(y_ + desp);
|
||||
crisis_sprite_->setWidth(crisis_texture_->getWidth());
|
||||
crisis_sprite_->setHeight(crisis_texture_->getHeight());
|
||||
crisis_sprite_->setVelX(0.0f);
|
||||
crisis_sprite_->setVelY(-2.5f);
|
||||
crisis_sprite_->setAccelX(0.0f);
|
||||
crisis_sprite_->setAccelY(-0.1f);
|
||||
crisis_sprite_->setSpriteClip(0, 0, crisis_texture_->getWidth(), crisis_texture_->getHeight());
|
||||
crisis_sprite_->setEnabled(true);
|
||||
crisis_sprite_->setFinishedCounter(0);
|
||||
crisis_sprite_->setDestX(xp + 15);
|
||||
crisis_sprite_->setDestY(y_);
|
||||
|
||||
// Inicializa el bitmap de 'DustRight'
|
||||
dustRSprite->resetAnimation();
|
||||
dustRSprite->setPosX(coffeeSprite->getPosX() + coffeeSprite->getWidth());
|
||||
dustRSprite->setPosY(y);
|
||||
dustRSprite->setWidth(16);
|
||||
dustRSprite->setHeight(16);
|
||||
dustRSprite->setFlip(SDL_FLIP_HORIZONTAL);
|
||||
dust_right_sprite_->resetAnimation();
|
||||
dust_right_sprite_->setPosX(coffee_sprite_->getPosX() + coffee_sprite_->getWidth());
|
||||
dust_right_sprite_->setPosY(y_);
|
||||
dust_right_sprite_->setWidth(16);
|
||||
dust_right_sprite_->setHeight(16);
|
||||
dust_right_sprite_->setFlip(SDL_FLIP_HORIZONTAL);
|
||||
|
||||
// Inicializa el bitmap de 'DustLeft'
|
||||
dustLSprite->resetAnimation();
|
||||
dustLSprite->setPosX(coffeeSprite->getPosX() - 16);
|
||||
dustLSprite->setPosY(y);
|
||||
dustLSprite->setWidth(16);
|
||||
dustLSprite->setHeight(16);
|
||||
dust_left_sprite_->resetAnimation();
|
||||
dust_left_sprite_->setPosX(coffee_sprite_->getPosX() - 16);
|
||||
dust_left_sprite_->setPosY(y_);
|
||||
dust_left_sprite_->setWidth(16);
|
||||
dust_left_sprite_->setHeight(16);
|
||||
}
|
||||
|
||||
// Pinta la clase en pantalla
|
||||
void GameLogo::render()
|
||||
{
|
||||
// Dibuja el logo
|
||||
coffeeSprite->render();
|
||||
crisisSprite->render();
|
||||
coffee_sprite_->render();
|
||||
crisis_sprite_->render();
|
||||
|
||||
if (status == Status::FINISHED)
|
||||
if (status_ == Status::FINISHED)
|
||||
{
|
||||
arcadeEditionSprite->render();
|
||||
arcade_edition_sprite_->render();
|
||||
}
|
||||
|
||||
// Dibuja el polvillo del logo
|
||||
dustRSprite->render();
|
||||
dustLSprite->render();
|
||||
dust_right_sprite_->render();
|
||||
dust_left_sprite_->render();
|
||||
}
|
||||
|
||||
// Actualiza la lógica de la clase
|
||||
void GameLogo::update()
|
||||
{
|
||||
if (status == Status::MOVING)
|
||||
if (status_ == Status::MOVING)
|
||||
{
|
||||
coffeeSprite->update();
|
||||
crisisSprite->update();
|
||||
coffee_sprite_->update();
|
||||
crisis_sprite_->update();
|
||||
|
||||
// Si los objetos han llegado a su destino, cambiamos de Sección
|
||||
if (coffeeSprite->hasFinished() && crisisSprite->hasFinished())
|
||||
if (coffee_sprite_->hasFinished() && crisis_sprite_->hasFinished())
|
||||
{
|
||||
status = Status::SHAKING;
|
||||
status_ = Status::SHAKING;
|
||||
|
||||
// Reproduce el efecto sonoro
|
||||
JA_PlaySound(crashSound);
|
||||
JA_PlaySound(crash_sound_);
|
||||
}
|
||||
}
|
||||
|
||||
else if (status == Status::SHAKING)
|
||||
else if (status_ == Status::SHAKING)
|
||||
{
|
||||
// Agita el logo
|
||||
if (shake.remaining > 0)
|
||||
if (shake_.remaining > 0)
|
||||
{
|
||||
if (shake.counter > 0)
|
||||
if (shake_.counter > 0)
|
||||
{
|
||||
shake.counter--;
|
||||
shake_.counter--;
|
||||
}
|
||||
else
|
||||
{
|
||||
shake.counter = shake.delay;
|
||||
const auto desp = shake.remaining % 2 == 0 ? shake.desp * (-1) : shake.desp;
|
||||
coffeeSprite->setPosX(shake.origin + desp);
|
||||
crisisSprite->setPosX(shake.origin + desp + 15);
|
||||
shake.remaining--;
|
||||
shake_.counter = shake_.delay;
|
||||
const auto desp = shake_.remaining % 2 == 0 ? shake_.desp * (-1) : shake_.desp;
|
||||
coffee_sprite_->setPosX(shake_.origin + desp);
|
||||
crisis_sprite_->setPosX(shake_.origin + desp + 15);
|
||||
shake_.remaining--;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
coffeeSprite->setPosX(shake.origin);
|
||||
crisisSprite->setPosX(shake.origin + 15);
|
||||
status = Status::FINISHED;
|
||||
coffee_sprite_->setPosX(shake_.origin);
|
||||
crisis_sprite_->setPosX(shake_.origin + 15);
|
||||
status_ = Status::FINISHED;
|
||||
}
|
||||
|
||||
dustRSprite->update();
|
||||
dustLSprite->update();
|
||||
dust_right_sprite_->update();
|
||||
dust_left_sprite_->update();
|
||||
}
|
||||
|
||||
else if (status == Status::FINISHED)
|
||||
else if (status_ == Status::FINISHED)
|
||||
{
|
||||
dustRSprite->update();
|
||||
dustLSprite->update();
|
||||
dust_right_sprite_->update();
|
||||
dust_left_sprite_->update();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -180,28 +180,28 @@ void GameLogo::update()
|
||||
void GameLogo::enable()
|
||||
{
|
||||
init();
|
||||
status = Status::MOVING;
|
||||
status_ = Status::MOVING;
|
||||
}
|
||||
|
||||
// Indica si ha terminado la animación
|
||||
bool GameLogo::hasFinished() const
|
||||
{
|
||||
return status == Status::FINISHED;
|
||||
return status_ == Status::FINISHED;
|
||||
}
|
||||
|
||||
// Recarga las texturas
|
||||
void GameLogo::reLoad()
|
||||
{
|
||||
dustTexture->reLoad();
|
||||
coffeeTexture->reLoad();
|
||||
crisisTexture->reLoad();
|
||||
dust_texture_->reLoad();
|
||||
coffee_texture_->reLoad();
|
||||
crisis_texture_->reLoad();
|
||||
}
|
||||
|
||||
// Calcula el desplazamiento vertical inicial
|
||||
int GameLogo::getInitialVerticalDesp()
|
||||
{
|
||||
auto despUp = y;
|
||||
auto despDown = param.game.height - y;
|
||||
auto desp_up = y_;
|
||||
auto desp_down = param.game.height - y_;
|
||||
|
||||
return std::max(despUp, despDown);
|
||||
return std::max(desp_up, desp_down);
|
||||
}
|
||||
Reference in New Issue
Block a user