Continuem estandaritzant noms

This commit is contained in:
2024-10-11 13:54:43 +02:00
parent e1fa1d2102
commit a9ca23138d
15 changed files with 866 additions and 849 deletions

View File

@@ -1,24 +1,24 @@
#include "explosions.h"
#include "animated_sprite.h" // for AnimatedSprite
#include "animated_sprite.h" // for AnimatedSprite
class Texture;
// Constructor
Explosions::Explosions()
{
textures.clear();
explosions.clear();
textures_.clear();
explosions_.clear();
}
// Destructor
Explosions::~Explosions()
{
explosions.clear();
explosions_.clear();
}
// Actualiza la lógica de la clase
void Explosions::update()
{
for (auto &explosion : explosions)
for (auto &explosion : explosions_)
{
explosion->update();
}
@@ -30,7 +30,7 @@ void Explosions::update()
// Dibuja el objeto en pantalla
void Explosions::render()
{
for (auto &explosion : explosions)
for (auto &explosion : explosions_)
{
explosion->render();
}
@@ -39,32 +39,32 @@ void Explosions::render()
// Añade texturas al objeto
void Explosions::addTexture(int size, std::shared_ptr<Texture> texture, std::vector<std::string> *animation)
{
explosion_texture_t temp;
ExplosionTexture temp;
temp.size = size;
temp.texture = texture;
temp.animation = animation;
textures.push_back(temp);
textures_.push_back(temp);
}
// Añade una explosión
void Explosions::add(int x, int y, int size)
{
const int index = getIndexBySize(size);
auto sprite = std::make_unique<AnimatedSprite>(textures[index].texture, "", textures[index].animation);
auto sprite = std::make_unique<AnimatedSprite>(textures_[index].texture, "", textures_[index].animation);
sprite->setPos(x, y);
explosions.push_back(std::move(sprite));
explosions_.push_back(std::move(sprite));
}
// Vacia el vector de elementos finalizados
void Explosions::freeExplosions()
{
if (explosions.empty() == false)
if (explosions_.empty() == false)
{
for (int i = explosions.size() - 1; i >= 0; --i)
for (int i = explosions_.size() - 1; i >= 0; --i)
{
if (explosions[i]->animationIsCompleted())
if (explosions_[i]->animationIsCompleted())
{
explosions.erase(explosions.begin() + i);
explosions_.erase(explosions_.begin() + i);
}
}
}
@@ -73,9 +73,9 @@ void Explosions::freeExplosions()
// Busca una textura a partir del tamaño
int Explosions::getIndexBySize(int size)
{
for (int i = 0; i < (int)textures.size();++i)
for (int i = 0; i < (int)textures_.size(); ++i)
{
if (size == textures[i].size)
if (size == textures_[i].size)
{
return i;
}