diff --git a/source/text.cpp b/source/text.cpp index 79419aa..ac51e11 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -9,9 +9,9 @@ Text::Text(std::string bitmapFile, std::string textFile, SDL_Renderer *renderer) texture = new LTexture(); texture->loadFromFile(bitmapFile, renderer); - mSprite = new Sprite({0, 0, 0, 0}, texture, renderer); - mSprite->setTexture(texture); - mSprite->setRenderer(renderer); + sprite = new Sprite({0, 0, 0, 0}, texture, renderer); + sprite->setTexture(texture); + sprite->setRenderer(renderer); file = textFile; init(); @@ -24,8 +24,8 @@ Text::~Text() delete texture; texture = nullptr; - delete mSprite; - mSprite = nullptr; + delete sprite; + sprite = nullptr; } // Inicializador @@ -43,11 +43,11 @@ void Text::init() initOffsetFromFile(); // Inicia los valores del sprite que dibuja las letras - mSprite->setWidth(boxWidth); - mSprite->setHeight(boxHeight); - mSprite->setPosX(0); - mSprite->setPosY(0); - mSprite->setSpriteClip(0, 0, mSprite->getWidth(), mSprite->getHeight()); + sprite->setWidth(boxWidth); + sprite->setHeight(boxHeight); + sprite->setPosX(0); + sprite->setPosY(0); + sprite->setSpriteClip(0, 0, sprite->getWidth(), sprite->getHeight()); // Establece las coordenadas para cada caracter ascii de la cadena y su ancho for (int i = 32; i < 128; i++) @@ -71,10 +71,10 @@ void Text::write(int x, int y, std::string text, int kerning, int lenght) for (int i = 0; i < lenght; ++i) { - mSprite->setSpriteClip(offset[int(text[i])].x, offset[int(text[i])].y, mSprite->getWidth(), mSprite->getHeight()); - mSprite->setPosX(x + shift); - mSprite->setPosY(y); - mSprite->render(); + sprite->setSpriteClip(offset[int(text[i])].x, offset[int(text[i])].y, sprite->getWidth(), sprite->getHeight()); + sprite->setPosX(x + shift); + sprite->setPosY(y); + sprite->render(); shift += (offset[int(text[i])].w + kerning); } } @@ -82,17 +82,17 @@ void Text::write(int x, int y, std::string text, int kerning, int lenght) // Escribe el texto con colores void Text::writeColored(int x, int y, std::string text, color_t color, int kerning, int lenght) { - mSprite->getTexture()->setColor(color.r, color.g, color.b); + sprite->getTexture()->setColor(color.r, color.g, color.b); write(x, y, text, kerning, lenght); - mSprite->getTexture()->setColor(255, 255, 255); + sprite->getTexture()->setColor(255, 255, 255); } // Escribe el texto con sombra void Text::writeShadowed(int x, int y, std::string text, color_t color, Uint8 shadowDistance, int kerning, int lenght) { - mSprite->getTexture()->setColor(color.r, color.g, color.b); + sprite->getTexture()->setColor(color.r, color.g, color.b); write(x + shadowDistance, y + shadowDistance, text, kerning, lenght); - mSprite->getTexture()->setColor(255, 255, 255); + sprite->getTexture()->setColor(255, 255, 255); write(x, y, text, kerning, lenght); } diff --git a/source/text.h b/source/text.h index 2cecbb7..9e38dda 100644 --- a/source/text.h +++ b/source/text.h @@ -15,7 +15,7 @@ class Text { private: - Sprite *mSprite; // Objeto con los graficos para el texto + Sprite *sprite; // Objeto con los graficos para el texto struct Offset {