From 8160ddc14aa8078db13de06ca1a5725757a1ebd7 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 19 Oct 2022 08:56:13 +0200 Subject: [PATCH] Cambiado el nombre de la clase LTexture a Texture --- 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} | 20 ++++++++------- source/common/utils.h | 2 +- source/enemy.cpp | 2 +- source/enemy.h | 2 +- source/intro.cpp | 4 +-- source/intro.h | 4 +-- source/item.cpp | 2 +- source/item.h | 2 +- source/logo.cpp | 4 +-- source/logo.h | 4 +-- source/player.cpp | 2 +- source/player.h | 2 +- source/room.cpp | 2 +- source/room.h | 2 +- source/scoreboard.cpp | 4 +-- source/scoreboard.h | 4 +-- source/title.cpp | 2 +- source/title.h | 2 +- 27 files changed, 64 insertions(+), 62 deletions(-) rename source/common/{ltexture.cpp => texture.cpp} (82%) rename source/common/{ltexture.h => texture.h} (81%) diff --git a/source/common/animatedsprite.cpp b/source/common/animatedsprite.cpp index 1d4ad2b..0adb5b1 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 1b6031f..9cd1bb9 100644 --- a/source/common/animatedsprite.h +++ b/source/common/animatedsprite.h @@ -30,7 +30,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 ed8cb14..3b45dab 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 22777a8..8ea0945 100644 --- a/source/common/movingsprite.h +++ b/source/common/movingsprite.h @@ -35,7 +35,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 dadd5bd..a78b50d 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; @@ -149,13 +149,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 c9e53ce..d99ce2c 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 @@ -16,15 +16,15 @@ protected: int h; // Alto del sprite 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 SDL_Rect spriteClip; // Rectangulo de origen de la textura que se dibujará en pantalla bool enabled; // Indica si el sprite esta habilitado 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(); @@ -75,10 +75,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); // Establece el valor de la variable void setRenderer(SDL_Renderer *renderer); 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 e297a47..20df26d 100644 --- a/source/common/text.h +++ b/source/common/text.h @@ -24,7 +24,7 @@ private: // Objetos 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 81% rename from source/common/ltexture.h rename to source/common/texture.h index cb065ce..52e8ce9 100644 --- a/source/common/ltexture.h +++ b/source/common/texture.h @@ -4,25 +4,27 @@ #include #include -#ifndef LTEXTURE_H -#define LTEXTURE_H +#ifndef TEXTURE_H +#define TEXTURE_H -// Clase LTexture -class LTexture +class Texture { private: + // Objetos y punteros SDL_Texture *texture; // La textura SDL_Renderer *renderer; // Renderizador donde dibujar la textura - int width; // Ancho de la imagen - int height; // Alto de la imagen - std::string path; // Ruta de la imagen de la textura + + // Variables + int width; // Ancho de la imagen + int height; // Alto de la imagen + std::string path; // Ruta de la imagen de la textura 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 243e1db..8f92be8 100644 --- a/source/enemy.cpp +++ b/source/enemy.cpp @@ -10,7 +10,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 425ff1a..ff15613 100644 --- a/source/enemy.h +++ b/source/enemy.h @@ -48,7 +48,7 @@ struct enemy_t class Enemy { private: - LTexture *texture; // Textura con los graficos del enemigo + Texture *texture; // Textura con los graficos del enemigo AnimatedSprite *sprite; // Sprite del enemigo SDL_Renderer *renderer; // El renderizador de la ventana diff --git a/source/intro.cpp b/source/intro.cpp index dd0592d..373f78e 100644 --- a/source/intro.cpp +++ b/source/intro.cpp @@ -10,8 +10,8 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Asset *asset) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - loadingScreenTexture1 = new LTexture(renderer, asset->get("loading_screen1.png")); - loadingScreenTexture2 = new LTexture(renderer, asset->get("loading_screen2.png")); + loadingScreenTexture1 = new Texture(renderer, asset->get("loading_screen1.png")); + loadingScreenTexture2 = new Texture(renderer, asset->get("loading_screen2.png")); sprite1 = new Sprite(0, 0, loadingScreenTexture1->getWidth(), loadingScreenTexture1->getHeight(), loadingScreenTexture1, renderer); sprite2 = new Sprite(0, 0, loadingScreenTexture2->getWidth(), loadingScreenTexture2->getHeight(), loadingScreenTexture2, renderer); loadingSound1 = JA_LoadMusic(asset->get("loading_sound1.ogg").c_str()); diff --git a/source/intro.h b/source/intro.h index cb7cb66..7cf4667 100644 --- a/source/intro.h +++ b/source/intro.h @@ -22,8 +22,8 @@ private: SDL_Renderer *renderer; // El renderizador de la ventana Screen *screen; // Objeto encargado de dibujar en pantalla Asset *asset; // Objeto con los ficheros de recursos - LTexture *loadingScreenTexture1; // Textura con la pantalla de carga en blanco y negro - LTexture *loadingScreenTexture2; // Textura con la pantalla de carga en color + Texture *loadingScreenTexture1; // Textura con la pantalla de carga en blanco y negro + Texture *loadingScreenTexture2; // Textura con la pantalla de carga en color SDL_Event *eventHandler; // Manejador de eventos Sprite *sprite1; // Sprite para manejar la textura loadingScreenTexture1 Sprite *sprite2; // Sprite para manejar la textura loadingScreenTexture2 diff --git a/source/item.cpp b/source/item.cpp index e18999a..b4ff105 100644 --- a/source/item.cpp +++ b/source/item.cpp @@ -12,7 +12,7 @@ Item::Item(item_t item) renderer = item.renderer; // Crea objetos - texture = new LTexture(renderer, asset->get(item.tileset)); + texture = new Texture(renderer, asset->get(item.tileset)); sprite = new Sprite(item.x, item.y, itemSize, itemSize, texture, renderer); // Inicia variables diff --git a/source/item.h b/source/item.h index 925dea0..b9dd62d 100644 --- a/source/item.h +++ b/source/item.h @@ -32,7 +32,7 @@ struct item_t class Item { private: - LTexture *texture; // Textura con los graficos del objeto + Texture *texture; // Textura con los graficos del objeto Sprite *sprite; // Sprite del objeto SDL_Renderer *renderer; // El renderizador de la ventana Asset *asset; // Objeto con la ruta a todos los ficheros de recursos diff --git a/source/logo.cpp b/source/logo.cpp index 5df8df6..24212e5 100644 --- a/source/logo.cpp +++ b/source/logo.cpp @@ -10,8 +10,8 @@ Logo::Logo(SDL_Renderer *renderer, Screen *screen, Asset *asset, int subsection) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - texture = new LTexture(renderer, asset->get("jailgames.png")); - texture2 = new LTexture(renderer, asset->get("since_1998.png")); + texture = new Texture(renderer, asset->get("jailgames.png")); + texture2 = new Texture(renderer, asset->get("since_1998.png")); sprite2 = new Sprite((256 - texture2->getWidth()) / 2, 83 + texture->getHeight() + 5, texture2->getWidth(), texture2->getHeight(), texture2, renderer); sprite2->setSpriteClip(0, 0, texture2->getWidth(), texture2->getHeight()); texture2->setColor(0, 0, 0); diff --git a/source/logo.h b/source/logo.h index 8cc95ee..6b5e08a 100644 --- a/source/logo.h +++ b/source/logo.h @@ -19,8 +19,8 @@ private: SDL_Renderer *renderer; // El renderizador de la ventana Screen *screen; // Objeto encargado de dibujar en pantalla Asset *asset; // Objeto con los ficheros de recursos - LTexture *texture; // Textura con los graficos "JAILGAMES" - LTexture *texture2; // Textura con los graficos "Since 1998" + Texture *texture; // Textura con los graficos "JAILGAMES" + Texture *texture2; // Textura con los graficos "Since 1998" SDL_Event *eventHandler; // Manejador de eventos std::vector sprite; // Vector con los sprites de cada linea que forman el bitmap JAILGAMES Sprite *sprite2; // Sprite para manejar la textura2 diff --git a/source/player.cpp b/source/player.cpp index b2b8bec..2fca8bb 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -13,7 +13,7 @@ Player::Player(player_t ini, std::string tileset, std::string animation, SDL_Ren this->debug = debug; // Crea objetos - texture = new LTexture(renderer, asset->get(tileset)); + texture = new Texture(renderer, asset->get(tileset)); sprite = new AnimatedSprite(texture, renderer, animation); // Inicializa variables diff --git a/source/player.h b/source/player.h index 94277b4..b88c6ad 100644 --- a/source/player.h +++ b/source/player.h @@ -46,7 +46,7 @@ public: Input *input; // Objeto para gestionar la entrada Asset *asset; // Objeto con la ruta a todos los ficheros de recursos Room *room; // Objeto encargado de gestionar cada habitación del juego - LTexture *texture; // Textura con los graficos del enemigo + Texture *texture; // Textura con los graficos del enemigo AnimatedSprite *sprite; // Sprite del enemigo Debug *debug; // Objeto para gestionar la información de debug color_t color; // Color del jugador diff --git a/source/room.cpp b/source/room.cpp index e5063c0..0f5b945 100644 --- a/source/room.cpp +++ b/source/room.cpp @@ -26,7 +26,7 @@ Room::Room(std::string file, SDL_Renderer *renderer, Screen *screen, Asset *asse // Crea los objetos loadMapFile(file); - texture = new LTexture(renderer, asset->get(tileset)); + texture = new Texture(renderer, asset->get(tileset)); tilesetWidth = texture->getWidth() / tileSize; itemSound = JA_LoadSound(asset->get("item.wav").c_str()); diff --git a/source/room.h b/source/room.h index efd42d8..4df9d50 100644 --- a/source/room.h +++ b/source/room.h @@ -52,7 +52,7 @@ private: std::vector tilemap; // Indice de los tiles a dibujar en la habitación std::vector enemies; // Listado con los enemigos de la habitación std::vector items; // Listado con los items que hay en la habitación - LTexture *texture; // Textura con los graficos de la habitación + Texture *texture; // Textura con los graficos de la habitación Asset *asset; // Objeto con la ruta a todos los ficheros de recursos Screen *screen; // Objeto encargado de dibujar en pantalla ItemTracker *itemTracker; // Lleva el control de los objetos recogidos diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp index 29565a9..8dd83f3 100644 --- a/source/scoreboard.cpp +++ b/source/scoreboard.cpp @@ -11,8 +11,8 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Asset *asset, board_t *board) this->board = board; // Reserva memoria para los objetos - playerTexture = new LTexture(renderer, asset->get("player.png")); - itemTexture = new LTexture(renderer, asset->get("items.png")); + playerTexture = new Texture(renderer, asset->get("player.png")); + itemTexture = new Texture(renderer, asset->get("items.png")); sprite = new AnimatedSprite(playerTexture, renderer, asset->get("player.ani")); sprite->setCurrentAnimation("walk_menu"); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer); diff --git a/source/scoreboard.h b/source/scoreboard.h index 60a80ed..81f7565 100644 --- a/source/scoreboard.h +++ b/source/scoreboard.h @@ -33,7 +33,7 @@ private: std::string separator; }; - LTexture *playerTexture; // Textura con los graficos para las vidas + Texture *playerTexture; // Textura con los graficos para las vidas AnimatedSprite *sprite; // Sprite para mostrar las vidas en el marcador SDL_Renderer *renderer; // El renderizador de la ventana Asset *asset; // Objeto con la ruta a todos los ficheros de recursos @@ -45,7 +45,7 @@ private: Uint32 timePaused; // Milisegundos que ha estado el marcador en pausa Uint32 totalTimePaused; // Tiempo acumulado en pausa clock_t clock; // Contiene las horas, minutos y segundos transcurridos desde el inicio de la partida - LTexture *itemTexture; // Textura con los graficos para las vidas + Texture *itemTexture; // Textura con los graficos para las vidas board_t *board; // Contiene las variables a mostrar en el marcador // Obtiene el tiempo transcurrido de partida diff --git a/source/title.cpp b/source/title.cpp index 479870f..cdabda8 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -10,7 +10,7 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Asset *asset) // Reserva memoria para los punteros eventHandler = new SDL_Event(); - texture = new LTexture(renderer, asset->get("loading_screen2.png")); + texture = new Texture(renderer, asset->get("loading_screen2.png")); sprite = new Sprite(0, 0, texture->getWidth(), texture->getHeight(), texture, renderer); text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer); diff --git a/source/title.h b/source/title.h index 0f57580..1e51cb5 100644 --- a/source/title.h +++ b/source/title.h @@ -28,7 +28,7 @@ private: Screen *screen; // Objeto encargado de dibujar en pantalla Asset *asset; // Objeto con los ficheros de recursos SDL_Event *eventHandler; // Manejador de eventos - LTexture *texture; // Textura con los graficos + Texture *texture; // Textura con los graficos Sprite *sprite; // Sprite para manejar la textura Text *text; // Objeto para escribir texto en pantalla int counter; // Contador