From b949436cd7ce64afe0df639b8148277d91b7f843 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 18 Oct 2022 13:56:06 +0200 Subject: [PATCH] Renombrada la clase ltexture a texture --- source/actor.cpp | 2 +- source/actor.h | 2 +- source/common/animatedsprite.cpp | 2 +- source/common/animatedsprite.h | 2 +- source/common/movingsprite.cpp | 2 +- source/common/movingsprite.h | 2 +- source/common/sprite.cpp | 8 +++--- source/common/sprite.h | 12 ++++----- source/common/text.cpp | 2 +- source/common/text.h | 2 +- source/common/{ltexture.cpp => texture.cpp} | 28 ++++++++++----------- source/common/{ltexture.h => texture.h} | 11 ++++---- source/common/utils.h | 2 +- source/enemy.cpp | 2 +- source/enemy.h | 2 +- source/intro.cpp | 2 +- source/intro.h | 2 +- source/logo.cpp | 2 +- source/logo.h | 2 +- source/map.cpp | 2 +- source/map.h | 2 +- source/player.cpp | 2 +- source/player.h | 2 +- source/scoreboard.cpp | 2 +- source/scoreboard.h | 2 +- source/title.cpp | 2 +- source/title.h | 2 +- 27 files changed, 52 insertions(+), 53 deletions(-) rename source/common/{ltexture.cpp => texture.cpp} (82%) rename source/common/{ltexture.h => texture.h} (91%) diff --git a/source/actor.cpp b/source/actor.cpp index 15e86cf..23f9bcd 100644 --- a/source/actor.cpp +++ b/source/actor.cpp @@ -15,7 +15,7 @@ Actor::Actor(actor_t actor) renderer = actor.renderer; // Crea objetos - texture = new LTexture(renderer, asset->get(actor.tileset)); + texture = new Texture(renderer, asset->get(actor.tileset)); sprite = new AnimatedSprite(texture, renderer, asset->get(actor.animation)); // Obten el resto de valores diff --git a/source/actor.h b/source/actor.h index 1855495..02af06a 100644 --- a/source/actor.h +++ b/source/actor.h @@ -42,7 +42,7 @@ protected: // Objetos y punteros AnimatedSprite *sprite; // Sprite del enemigo Asset *asset; // Objeto con la ruta a todos los ficheros de recursos - LTexture *texture; // Textura con los graficos del enemigo + Texture *texture; // Textura con los graficos del enemigo SDL_Renderer *renderer; // El renderizador de la ventana // Variables diff --git a/source/common/animatedsprite.cpp b/source/common/animatedsprite.cpp index c51dda1..449ebd1 100644 --- a/source/common/animatedsprite.cpp +++ b/source/common/animatedsprite.cpp @@ -1,7 +1,7 @@ #include "animatedsprite.h" // Constructor -AnimatedSprite::AnimatedSprite(LTexture *texture, SDL_Renderer *renderer, std::string file, std::vector *buffer) +AnimatedSprite::AnimatedSprite(Texture *texture, SDL_Renderer *renderer, std::string file, std::vector *buffer) { // Copia los punteros setTexture(texture); diff --git a/source/common/animatedsprite.h b/source/common/animatedsprite.h index 44b77b4..884e2a7 100644 --- a/source/common/animatedsprite.h +++ b/source/common/animatedsprite.h @@ -32,7 +32,7 @@ private: public: // Constructor - AnimatedSprite(LTexture *texture = nullptr, SDL_Renderer *renderer = nullptr, std::string file = "", std::vector *buffer = nullptr); + AnimatedSprite(Texture *texture = nullptr, SDL_Renderer *renderer = nullptr, std::string file = "", std::vector *buffer = nullptr); // Destructor ~AnimatedSprite(); diff --git a/source/common/movingsprite.cpp b/source/common/movingsprite.cpp index f3efc9a..5875103 100644 --- a/source/common/movingsprite.cpp +++ b/source/common/movingsprite.cpp @@ -2,7 +2,7 @@ #include "movingsprite.h" // Constructor -MovingSprite::MovingSprite(float x, float y, int w, int h, float velx, float vely, float accelx, float accely, LTexture *texture, SDL_Renderer *renderer) +MovingSprite::MovingSprite(float x, float y, int w, int h, float velx, float vely, float accelx, float accely, Texture *texture, SDL_Renderer *renderer) { // Copia los punteros this->texture = texture; diff --git a/source/common/movingsprite.h b/source/common/movingsprite.h index c1fda61..214bfc4 100644 --- a/source/common/movingsprite.h +++ b/source/common/movingsprite.h @@ -38,7 +38,7 @@ protected: public: // Constructor - MovingSprite(float x = 0, float y = 0, int w = 0, int h = 0, float velx = 0, float vely = 0, float accelx = 0, float accely = 0, LTexture *texture = nullptr, SDL_Renderer *renderer = nullptr); + MovingSprite(float x = 0, float y = 0, int w = 0, int h = 0, float velx = 0, float vely = 0, float accelx = 0, float accely = 0, Texture *texture = nullptr, SDL_Renderer *renderer = nullptr); // Destructor ~MovingSprite(); diff --git a/source/common/sprite.cpp b/source/common/sprite.cpp index 24917ee..e912494 100644 --- a/source/common/sprite.cpp +++ b/source/common/sprite.cpp @@ -1,7 +1,7 @@ #include "sprite.h" // Constructor -Sprite::Sprite(int x, int y, int w, int h, LTexture *texture, SDL_Renderer *renderer) +Sprite::Sprite(int x, int y, int w, int h, Texture *texture, SDL_Renderer *renderer) { // Establece la posición X,Y del sprite this->x = x; @@ -24,7 +24,7 @@ Sprite::Sprite(int x, int y, int w, int h, LTexture *texture, SDL_Renderer *rend enabled = true; } -Sprite::Sprite(SDL_Rect rect, LTexture *texture, SDL_Renderer *renderer) +Sprite::Sprite(SDL_Rect rect, Texture *texture, SDL_Renderer *renderer) { // Establece la posición X,Y del sprite x = rect.x; @@ -137,13 +137,13 @@ void Sprite::setSpriteClip(int x, int y, int w, int h) } // Obten el valor de la variable -LTexture *Sprite::getTexture() +Texture *Sprite::getTexture() { return texture; } // Establece el valor de la variable -void Sprite::setTexture(LTexture *texture) +void Sprite::setTexture(Texture *texture) { this->texture = texture; } diff --git a/source/common/sprite.h b/source/common/sprite.h index 36cbfb8..6132d37 100644 --- a/source/common/sprite.h +++ b/source/common/sprite.h @@ -1,7 +1,7 @@ #pragma once #include -#include "ltexture.h" +#include "texture.h" #ifndef SPRITE_H #define SPRITE_H @@ -12,7 +12,7 @@ class Sprite protected: // Objetos y punteros SDL_Renderer *renderer; // Puntero al renderizador de la ventana - LTexture *texture; // Textura donde estan todos los dibujos del sprite + Texture *texture; // Textura donde estan todos los dibujos del sprite // Variables int x; // Posición en el eje X donde dibujar el sprite @@ -24,8 +24,8 @@ protected: public: // Constructor - Sprite(int x = 0, int y = 0, int w = 0, int h = 0, LTexture *texture = nullptr, SDL_Renderer *renderer = nullptr); - Sprite(SDL_Rect rect, LTexture *texture, SDL_Renderer *renderer); + Sprite(int x = 0, int y = 0, int w = 0, int h = 0, Texture *texture = nullptr, SDL_Renderer *renderer = nullptr); + Sprite(SDL_Rect rect, Texture *texture, SDL_Renderer *renderer); // Destructor ~Sprite(); @@ -70,10 +70,10 @@ public: void setSpriteClip(int x, int y, int w, int h); // Obten el valor de la variable - LTexture *getTexture(); + Texture *getTexture(); // Establece el valor de la variable - void setTexture(LTexture *texture); + void setTexture(Texture *texture); // Obten el valor de la variable SDL_Renderer *getRenderer(); diff --git a/source/common/text.cpp b/source/common/text.cpp index d11381f..8ff51eb 100644 --- a/source/common/text.cpp +++ b/source/common/text.cpp @@ -10,7 +10,7 @@ Text::Text(std::string bitmapFile, std::string textFile, SDL_Renderer *renderer) initOffsetFromFile(textFile); // Crea los objetos - texture = new LTexture(renderer, bitmapFile); + texture = new Texture(renderer, bitmapFile); sprite = new Sprite({0, 0, boxWidth, boxHeight}, texture, renderer); } diff --git a/source/common/text.h b/source/common/text.h index 3a6c987..df6b415 100644 --- a/source/common/text.h +++ b/source/common/text.h @@ -24,7 +24,7 @@ private: // Objetos y punteros Sprite *sprite; // Objeto con los graficos para el texto - LTexture *texture; // Textura con los bitmaps del texto + Texture *texture; // Textura con los bitmaps del texto // Variables int boxWidth; // Anchura de la caja de cada caracter en el png diff --git a/source/common/ltexture.cpp b/source/common/texture.cpp similarity index 82% rename from source/common/ltexture.cpp rename to source/common/texture.cpp index a68a153..980d853 100644 --- a/source/common/ltexture.cpp +++ b/source/common/texture.cpp @@ -1,10 +1,10 @@ -#include "ltexture.h" +#include "texture.h" #define STB_IMAGE_IMPLEMENTATION #include "stb_image.h" // Constructor -LTexture::LTexture(SDL_Renderer *renderer, std::string path) +Texture::Texture(SDL_Renderer *renderer, std::string path) { // Copia punteros this->renderer = renderer; @@ -23,14 +23,14 @@ LTexture::LTexture(SDL_Renderer *renderer, std::string path) } // Destructor -LTexture::~LTexture() +Texture::~Texture() { // Libera memoria unload(); } // Carga una imagen desde un fichero -bool LTexture::loadFromFile(std::string path, SDL_Renderer *renderer) +bool Texture::loadFromFile(std::string path, SDL_Renderer *renderer) { const std::string filename = path.substr(path.find_last_of("\\/") + 1); int req_format = STBI_rgb_alpha; @@ -98,7 +98,7 @@ bool LTexture::loadFromFile(std::string path, SDL_Renderer *renderer) } // Crea una textura en blanco -bool LTexture::createBlank(SDL_Renderer *renderer, int width, int height, SDL_TextureAccess access) +bool Texture::createBlank(SDL_Renderer *renderer, int width, int height, SDL_TextureAccess access) { // Crea una textura sin inicializar texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, access, width, height); @@ -116,7 +116,7 @@ bool LTexture::createBlank(SDL_Renderer *renderer, int width, int height, SDL_Te } // Libera la memoria de la textura -void LTexture::unload() +void Texture::unload() { // Libera la textura si existe if (texture != nullptr) @@ -129,25 +129,25 @@ void LTexture::unload() } // Establece el color para la modulacion -void LTexture::setColor(Uint8 red, Uint8 green, Uint8 blue) +void Texture::setColor(Uint8 red, Uint8 green, Uint8 blue) { SDL_SetTextureColorMod(texture, red, green, blue); } // Establece el blending -void LTexture::setBlendMode(SDL_BlendMode blending) +void Texture::setBlendMode(SDL_BlendMode blending) { SDL_SetTextureBlendMode(texture, blending); } // Establece el alpha para la modulación -void LTexture::setAlpha(Uint8 alpha) +void Texture::setAlpha(Uint8 alpha) { SDL_SetTextureAlphaMod(texture, alpha); } // Renderiza la textura en un punto específico -void LTexture::render(SDL_Renderer *renderer, int x, int y, SDL_Rect *clip, float zoomW, float zoomH, double angle, SDL_Point *center, SDL_RendererFlip flip) +void Texture::render(SDL_Renderer *renderer, int x, int y, SDL_Rect *clip, float zoomW, float zoomH, double angle, SDL_Point *center, SDL_RendererFlip flip) { // Establece el destino de renderizado en la pantalla SDL_Rect renderQuad = {x, y, width, height}; @@ -167,25 +167,25 @@ void LTexture::render(SDL_Renderer *renderer, int x, int y, SDL_Rect *clip, floa } // Establece la textura como objetivo de renderizado -void LTexture::setAsRenderTarget(SDL_Renderer *renderer) +void Texture::setAsRenderTarget(SDL_Renderer *renderer) { SDL_SetRenderTarget(renderer, texture); } // Obtiene el ancho de la imagen -int LTexture::getWidth() +int Texture::getWidth() { return width; } // Obtiene el alto de la imagen -int LTexture::getHeight() +int Texture::getHeight() { return height; } // Recarga la textura -bool LTexture::reLoad() +bool Texture::reLoad() { return loadFromFile(path, renderer); } \ No newline at end of file diff --git a/source/common/ltexture.h b/source/common/texture.h similarity index 91% rename from source/common/ltexture.h rename to source/common/texture.h index 6b7e416..52e8ce9 100644 --- a/source/common/ltexture.h +++ b/source/common/texture.h @@ -4,11 +4,10 @@ #include #include -#ifndef LTEXTURE_H -#define LTEXTURE_H +#ifndef TEXTURE_H +#define TEXTURE_H -// Clase LTexture -class LTexture +class Texture { private: // Objetos y punteros @@ -22,10 +21,10 @@ private: public: // Constructor - LTexture(SDL_Renderer *renderer, std::string path = ""); + Texture(SDL_Renderer *renderer, std::string path = ""); // Destructor - ~LTexture(); + ~Texture(); // Carga una imagen desde un fichero bool loadFromFile(std::string path, SDL_Renderer *renderer); diff --git a/source/common/utils.h b/source/common/utils.h index da15b0b..3707511 100644 --- a/source/common/utils.h +++ b/source/common/utils.h @@ -1,7 +1,7 @@ #pragma once #include -#include "ltexture.h" +#include "texture.h" #include #ifndef UTILS_H diff --git a/source/enemy.cpp b/source/enemy.cpp index 5240768..8141d78 100644 --- a/source/enemy.cpp +++ b/source/enemy.cpp @@ -15,7 +15,7 @@ Enemy::Enemy(enemy_t enemy) renderer = enemy.renderer; // Crea objetos - texture = new LTexture(renderer, asset->get(enemy.tileset)); + texture = new Texture(renderer, asset->get(enemy.tileset)); sprite = new AnimatedSprite(texture, renderer, asset->get(enemy.animation)); // Obten el resto de valores diff --git a/source/enemy.h b/source/enemy.h index d375f4e..f94af71 100644 --- a/source/enemy.h +++ b/source/enemy.h @@ -31,7 +31,7 @@ protected: // Objetos y punteros AnimatedSprite *sprite; // Sprite del enemigo Asset *asset; // Objeto con la ruta a todos los ficheros de recursos - LTexture *texture; // Textura con los graficos del enemigo + Texture *texture; // Textura con los graficos del enemigo SDL_Renderer *renderer; // El renderizador de la ventana // Variables diff --git a/source/intro.cpp b/source/intro.cpp index 327fcfc..c1c3a78 100644 --- a/source/intro.cpp +++ b/source/intro.cpp @@ -10,7 +10,7 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - texture = new LTexture(renderer, asset->get("intro.png")); + texture = new Texture(renderer, asset->get("intro.png")); sprite = new AnimatedSprite(texture, renderer, asset->get("intro.ani")); // Inicializa variables diff --git a/source/intro.h b/source/intro.h index 0db99bc..43c3c8d 100644 --- a/source/intro.h +++ b/source/intro.h @@ -18,7 +18,7 @@ private: // Objetos y punteros AnimatedSprite *sprite; // Sprite para dibujar los graficos de la intro Asset *asset; // Objeto con los ficheros de recurso - LTexture *texture; // Textura con los graficos + Texture *texture; // Textura con los graficos Screen *screen; // Objeto encargado de dibujar en pantalla SDL_Event *eventHandler; // Manejador de eventos SDL_Renderer *renderer; // El renderizador de la ventana diff --git a/source/logo.cpp b/source/logo.cpp index a58aed0..3a68dbd 100644 --- a/source/logo.cpp +++ b/source/logo.cpp @@ -10,7 +10,7 @@ Logo::Logo(SDL_Renderer *renderer, Screen *screen, Asset *asset) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - texture = new LTexture(renderer, asset->get("logo.png")); + texture = new Texture(renderer, asset->get("logo.png")); sprite = new Sprite(0, 0, GAMECANVAS_WIDTH, GAMECANVAS_HEIGHT, texture, renderer); // Crea un backbuffer para el renderizador diff --git a/source/logo.h b/source/logo.h index 4fa761a..809f198 100644 --- a/source/logo.h +++ b/source/logo.h @@ -17,7 +17,7 @@ class Logo private: // Objetos y punteros Asset *asset; // Objeto con los ficheros de recursos - LTexture *texture; // Textura con los graficos + Texture *texture; // Textura con los graficos Screen *screen; // Objeto encargado de dibujar en pantalla SDL_Event *eventHandler; // Manejador de eventos SDL_Renderer *renderer; // El renderizador de la ventana diff --git a/source/map.cpp b/source/map.cpp index 1ffb164..f568131 100644 --- a/source/map.cpp +++ b/source/map.cpp @@ -42,7 +42,7 @@ Map::Map(std::string file, SDL_Renderer *renderer, Asset *asset, ItemTracker *it // Crea los objetos loadMapFile(file); - textureTile = new LTexture(renderer, asset->get(tileset)); + textureTile = new Texture(renderer, asset->get(tileset)); tilesetWidth = textureTile->getWidth() / tileSize; loadMapTileFile(asset->get(tileMapFile)); diff --git a/source/map.h b/source/map.h index 8ea1290..450f3e4 100644 --- a/source/map.h +++ b/source/map.h @@ -37,7 +37,7 @@ private: // Objetos y punteros Asset *asset; // Objeto con la ruta a todos los ficheros de recursos ItemTracker *itemTracker; // Objeto que gestiona los items que ya se han recogido - LTexture *textureTile; // Textura con los graficos de los tiles habitación + Texture *textureTile; // Textura con los graficos de los tiles habitación SDL_Renderer *renderer; // El renderizador de la ventana SDL_Texture *mapLayer0; // Textura para dibujar la capa 0 del mapa de la habitación SDL_Texture *mapLayer1; // Textura para dibujar la capa 1 del mapa de la habitación diff --git a/source/player.cpp b/source/player.cpp index 07195e1..9262008 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -14,7 +14,7 @@ Player::Player(player_t player, SDL_Renderer *renderer, Asset *asset, Input *inp sound_death = JA_LoadSound(asset->get("sound_player_death.wav").c_str()); sound_coin = JA_LoadSound(asset->get("sound_player_coin.wav").c_str()); - texture = new LTexture(renderer, asset->get("player.png")); + texture = new Texture(renderer, asset->get("player.png")); sprite = new AnimatedSprite(texture, renderer, asset->get("player.ani")); w = 16; diff --git a/source/player.h b/source/player.h index da9c963..f5523d3 100644 --- a/source/player.h +++ b/source/player.h @@ -52,7 +52,7 @@ private: Asset *asset; // Objeto con la ruta a todos los ficheros de recursos Debug *debug; // Objeto para gestionar la información de debug Input *input; // Objeto Input para gestionar las entradas - LTexture *texture; // Textura con los graficos del jugador + Texture *texture; // Textura con los graficos del jugador Map *map; // Objeto con el mapa SDL_Renderer *renderer; // El renderizador de la ventana diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp index cf60711..a6efe5b 100644 --- a/source/scoreboard.cpp +++ b/source/scoreboard.cpp @@ -12,7 +12,7 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Asset *asset, Input *input, board this->input = input; // Reserva memoria para los objetos - texture = new LTexture(renderer, asset->get("player.png")); + texture = new Texture(renderer, asset->get("player.png")); sprite = new Sprite({0, 0, 0, 0}, texture, renderer); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer); diff --git a/source/scoreboard.h b/source/scoreboard.h index e06ee98..eca881c 100644 --- a/source/scoreboard.h +++ b/source/scoreboard.h @@ -34,7 +34,7 @@ private: Asset *asset; // Objeto con la ruta a todos los ficheros de recursos board_t *board; // Contiene las variables a mostrar en el marcador Input *input; // Objeto Input para gestionar las entradas - LTexture *texture; // Textura con los graficos + Texture *texture; // Textura con los graficos SDL_Renderer *renderer; // El renderizador de la ventana SDL_Texture *layer; // Textura donde dibujar el marcador Sprite *sprite; // Sprite para mostrar los graficos diff --git a/source/title.cpp b/source/title.cpp index 13a64bb..0892d6d 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -11,7 +11,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - texture = new LTexture(renderer, asset->get("intro.png")); + texture = new Texture(renderer, asset->get("intro.png")); sprite = new AnimatedSprite(texture, renderer, asset->get("intro.ani")); sprite->setCurrentAnimation("menu"); text = new Text(asset->get("debug.png"), asset->get("debug.txt"), renderer); diff --git a/source/title.h b/source/title.h index 2544488..0823cc6 100644 --- a/source/title.h +++ b/source/title.h @@ -25,7 +25,7 @@ private: AnimatedSprite *sprite; // Sprite para dibujar los graficos de la intro Asset *asset; // Objeto con los ficheros de recurso Input *input; // Objeto para gestionar las entradas - LTexture *texture; // Textura con los graficos + Texture *texture; // Textura con los graficos Menu *menu; // Objeto para gestionar el menu del titulo Screen *screen; // Objeto encargado de dibujar en pantalla SDL_Event *eventHandler; // Manejador de eventos