Añadida la clase debug

source/text.cpp

@@ -1,4 +1,4 @@
-#include "const.h"
+
 #include "text.h"
 #include <iostream>
 #include <fstream>
@@ -7,9 +7,9 @@
 Text::Text(std::string bitmapFile, std::string textFile, SDL_Renderer *renderer)
 {
 	texture = new LTexture(renderer, bitmapFile);
-	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();
@@ -18,12 +18,8 @@ Text::Text(std::string bitmapFile, std::string textFile, SDL_Renderer *renderer)
 // Destructor
 Text::~Text()
 {
-	texture->unload();
 	delete texture;
-	texture = nullptr;
-
-	delete mSprite;
-	mSprite = nullptr;
+	delete sprite;
 }
 
 // Inicializador
@@ -41,11 +37,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++)
@@ -53,10 +49,6 @@ void Text::init()
 		offset[i].x = ((i - 32) % 15) * boxWidth;
 		offset[i].y = ((i - 32) / 15) * boxHeight;
 	}
-
-	// printf("Cargando %s\n", file.c_str());
-	// const std::string texto = "w = "+ std::to_string(boxWidth) + ", h = " + std::to_string(boxHeight);
-	// printf("%s\n",texto.c_str());
 }
 
 // Escribe texto en pantalla
@@ -69,10 +61,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);
 	}
 }
@@ -80,17 +72,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);
 }
 
@@ -150,6 +142,8 @@ int Text::lenght(std::string text, int kerning)
 void Text::initOffsetFromFile()
 {
 	std::ifstream rfile(file);
+	printf("Reading file %s\n", file.c_str());
+
 	if (rfile.is_open() && rfile.good())
 	{
 		std::string buffer;
@@ -176,11 +170,27 @@ void Text::initOffsetFromFile()
 			buffer.clear();
 			line_read++;
 		};
+
+		// Cierra el fichero
+		printf("Closing file %s\n\n", file.c_str());
+		rfile.close();
+	}
+
+	// El fichero no se puede abrir
+	else
+	{
+		printf("Warning: Unable to open %s file\n", file.c_str());
 	}
 }
 
 // Devuelve el valor de la variable
-int Text::getCharacterWidth()
+int Text::getCharacterSize()
 {
 	return boxWidth;
+}
+
+// Recarga la textura
+void Text::reLoadTexture()
+{
+	texture->reLoad();
 }