From c9e269329fc0ef3b584c7bf4fdbc544bc0a50fc3 Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 19 Feb 2021 16:52:50 +0100 Subject: [PATCH] update text.cpp --- source/ifdefs.h | 7 +++---- source/text.cpp | 16 +--------------- source/text.h | 14 ++++++++++---- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/source/ifdefs.h b/source/ifdefs.h index 64e2982..67d5a12 100644 --- a/source/ifdefs.h +++ b/source/ifdefs.h @@ -1,15 +1,14 @@ #ifdef _WIN64 -#include "C:\mingw_dev_lib\include\SDL2\SDL.h" +#include "C:\Program Files\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include\SDL2\SDL.h" #endif #ifdef _WIN32 -#include "C:\mingw_dev_lib\include\SDL2\SDL.h" +#include "C:\Program Files\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include\SDL2\SDL.h" #endif #ifdef __APPLE__ #include -//#include -#include + #endif #ifdef __linux__ diff --git a/source/text.cpp b/source/text.cpp index dec25c8..5116707 100644 --- a/source/text.cpp +++ b/source/text.cpp @@ -49,20 +49,6 @@ void Text::init(LTexture *texture, SDL_Renderer *renderer, Uint8 height) } } -// Escribe el texto en pantalla -void Text::write(int x, int y, std::string text) -{ - Uint16 shift = 0; - for (Uint8 i = 0; i < text.length(); ++i) - { - mSprite->setSpriteClip(mOffset[int(text[i])].x, mOffset[int(text[i])].y, mSprite->getWidth(), mSprite->getHeight()); - mSprite->setPosX(x + shift); - mSprite->setPosY(y); - mSprite->render(); - shift += (mOffset[int(text[i])].w); - } -} - // Escribe el texto en pantalla con kerning void Text::write(int x, int y, std::string text, int kerning) { @@ -78,7 +64,7 @@ void Text::write(int x, int y, std::string text, int kerning) } // Escribe una cantidad determinada de caracteres del texto en pantalla -void Text::write(int x, int y, std::string text, int kerning, Uint8 lenght) +void Text::write(int x, int y, std::string text, Sint8 kerning, Uint8 lenght) { Uint16 shift = 0; for (Uint8 i = 0; i < lenght; ++i) diff --git a/source/text.h b/source/text.h index 8dd43fb..88a74d6 100644 --- a/source/text.h +++ b/source/text.h @@ -17,10 +17,16 @@ public: // Inicializador void init(LTexture *texture, SDL_Renderer *renderer, Uint8 height); - // Escribe el texto en pantalla - void write(int x, int y, std::string text); - void write(int x, int y, std::string text, int kerning); - void write(int x, int y, std::string text, int kerning, Uint8 lenght); + /** + * \brief Escribe texto en pantalla + * + * \param x Posición en el eje X donde empezar a escribir el texto + * \param y Posición en el eje Y donde empezar a escribir el texto + * \param string Texto para escribir + * \param kerning Espacio de separación entre letras + * \param lenght Longitud de la cadena de texto a escribir + */ + void write(int x, int y, std::string text, Sint8 kerning = 0, Uint8 lenght = 0); // Escribe el texto con colores void writeColored(int x, int y, std::string text, Uint8 R, Uint8 G, Uint8 B);