Trabajando en la recarga de texturas

source/common/resource.cpp

@@ -21,13 +21,20 @@ void Resource::loadTextures(std::vector<std::string> list)
     }
 }
 
-// Libera los recursos
+// Recarga las texturas
-void Resource::freeTextures()
+void Resource::reLoadTextures()
+{
+    for (auto texture : textures)
+    {
+        texture.texture->reLoad();
+    }
+}
+
+// Libera las texturas
+void Resource::freeTextures()
 {
-    // Libera las texturas
     for (auto texture : textures)
     {
-        texture.texture->unload();
         delete texture.texture;
     }
     textures.clear();
@@ -36,18 +43,15 @@ void Resource::freeTextures()
 // Obtiene una textura
 Texture *Resource::getTexture(std::string name)
 {
-    //std::cout << "BUSCANDO TEXTURA" << std::endl;
     for (auto texture : textures)
     {
-        //std::cout << "COMPROBANDO: " << texture.name << " - " << name << std::endl;
-
         if (texture.name.find(name) != std::string::npos)
         {
             std::cout << "CACHE: " << name << std::endl;
             return texture.texture;
         }
     }
-    std::cout << "NO ENCONTRADA: " << name << std::endl;
 
+    std::cout << "NO ENCONTRADA: " << name << std::endl;
     return nullptr;
 }

source/common/resource.h

@@ -34,7 +34,10 @@ public:
 	// Carga todos los recursos necesarios
 	void loadTextures(std::vector<std::string> textureList);
 
-	// Libera los recursos
+	// Recarga las texturas
+	void reLoadTextures();
+
+	// Libera las texturas
 	void freeTextures();
 
 	// Obtiene una textura

source/director.cpp

@@ -9,7 +9,7 @@ Director::Director(std::string path)
 	section.name = SECTION_PROG_LOGO;
 	section.subsection = SUBSECTION_LOGO_TO_INTRO;
 
-	section.name = SECTION_PROG_GAME;
+	section.name = SECTION_PROG_TITLE;
 
 	// Crea el objeto que controla los ficheros de recursos
 	asset = new Asset(path.substr(0, path.find_last_of("\\/")));

source/intro.cpp

@@ -14,13 +14,13 @@ Intro::Intro(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *
 	eventHandler = new SDL_Event();
 	if (options->palette == p_zxspectrum)
 	{
-		loadingScreenTexture1 =resource->getTexture("loading_screen_bn.png");
+		loadingScreenTexture1 = resource->getTexture("loading_screen_bn.png");
-		loadingScreenTexture2 =resource->getTexture("loading_screen_color.png");
+		loadingScreenTexture2 = resource->getTexture("loading_screen_color.png");
 	}
 	else if (options->palette == p_zxarne)
 	{
-		loadingScreenTexture1 =resource->getTexture("loading_screen_bn_zxarne.png");
+		loadingScreenTexture1 = resource->getTexture("loading_screen_bn_zxarne.png");
-		loadingScreenTexture2 =resource->getTexture("loading_screen_color_zxarne.png");
+		loadingScreenTexture2 = resource->getTexture("loading_screen_color_zxarne.png");
 	}
 	sprite1 = new Sprite(0, 0, loadingScreenTexture1->getWidth(), loadingScreenTexture1->getHeight(), loadingScreenTexture1, renderer);
 	sprite2 = new Sprite(0, 0, loadingScreenTexture2->getWidth(), loadingScreenTexture2->getHeight(), loadingScreenTexture2, renderer);
@@ -97,8 +97,46 @@ void Intro::checkEventHandler()
 		// Cualquier tecla pulsada
 		if ((eventHandler->type == SDL_KEYDOWN) || (eventHandler->type == SDL_JOYBUTTONDOWN))
 		{
-			section.name = SECTION_PROG_TITLE;
+			switch (eventHandler->key.keysym.scancode)
-			section.subsection = 0;
+			{
+			case SDL_SCANCODE_B:
+				screen->switchBorder();
+				resource->reLoadTextures();
+				break;
+
+			case SDL_SCANCODE_F:
+				screen->switchVideoMode();
+				resource->reLoadTextures();
+				break;
+
+			case SDL_SCANCODE_F1:
+				screen->setWindowSize(1);
+				resource->reLoadTextures();
+				break;
+
+			case SDL_SCANCODE_F2:
+				screen->setWindowSize(2);
+				resource->reLoadTextures();
+				break;
+
+			case SDL_SCANCODE_F3:
+				screen->setWindowSize(3);
+				resource->reLoadTextures();
+				break;
+
+			case SDL_SCANCODE_F4:
+				screen->setWindowSize(4);
+				resource->reLoadTextures();
+				break;
+
+			case SDL_SCANCODE_F5:
+				switchPalette();
+				break;
+
+			default:
+				section.name = SECTION_PROG_TITLE;
+				break;
+			}
 		}
 	}
 }
@@ -248,3 +286,20 @@ section_t Intro::run()
 
 	return section;
 }
+
+// Cambia la paleta
+void Intro::switchPalette()
+{
+	if (options->palette == p_zxspectrum)
+	{
+		options->palette = p_zxarne;
+		loadingScreenTexture1 = resource->getTexture("loading_screen_bn_zxarne.png");
+		loadingScreenTexture2 = resource->getTexture("loading_screen_color_zxarne.png");
+	}
+	else
+	{
+		options->palette = p_zxspectrum;
+		loadingScreenTexture1 = resource->getTexture("loading_screen_bn.png");
+		loadingScreenTexture2 = resource->getTexture("loading_screen_color.png");
+	}
+}

source/intro.h

@@ -64,6 +64,9 @@ private:
 	// Dibuja la pantalla de carga
 	void renderLoad();
 
+	// Cambia la paleta
+	void switchPalette();
+
 public:
 	// Constructor
 	Intro(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *asset, options_t *options);

source/room.cpp

@@ -783,8 +783,9 @@ void Room::reLoadTexture()
     {
         texture->loadFromFile(asset->get("standard_zxarne.png"), renderer);
     }
-    // texture->reLoad();
+
     fillMapTexture();
+
     for (auto enemy : enemies)
     {
         enemy->reLoadTexture();

source/title.cpp

@@ -14,11 +14,11 @@ Title::Title(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *
 	eventHandler = new SDL_Event();
 	if (options->palette == p_zxspectrum)
 	{
-		texture =resource->getTexture("loading_screen_color.png");
+		texture = resource->getTexture("loading_screen_color.png");
 	}
 	else if (options->palette == p_zxarne)
 	{
-		texture =resource->getTexture("loading_screen_color_zxarne.png");
+		texture = resource->getTexture("loading_screen_color_zxarne.png");
 	}
 	sprite = new Sprite(0, 0, texture->getWidth(), texture->getHeight(), texture, renderer);
 	text = new Text(asset->get("smb2.png"), asset->get("smb2.txt"), renderer);
@@ -107,7 +107,7 @@ void Title::checkEventHandler()
 
 			case SDL_SCANCODE_F5:
 				switchPalette();
-				reLoadTextures();
+				// reLoadTextures();
 				break;
 
 			default:
@@ -247,12 +247,19 @@ void Title::switchPalette()
 	if (options->palette == p_zxspectrum)
 	{
 		options->palette = p_zxarne;
+		texture = resource->getTexture("loading_screen_color_zxarne.png");
+		sprite->setTexture(texture);
 	}
 	else
 	{
 		options->palette = p_zxspectrum;
+		texture = resource->getTexture("loading_screen_color.png");
+		sprite->setTexture(texture);
 	}
 
+	// resource->reLoadTextures();
+	// reLoadTextures();
+
 	// Cambia el color del borde
 	screen->setBorderColor(stringToColor(options->palette, "bright_blue"));
 }