Update unload/release material/textures

skylicht-lab · Aug 22, 2024 · f25fee8 · f25fee8
1 parent 0957b80
commit f25fee8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 1 deletion.
diff --git a/Projects/Skylicht/Engine/Source/Material/CMaterial.cpp b/Projects/Skylicht/Engine/Source/Material/CMaterial.cpp
@@ -610,6 +610,18 @@ namespace Skylicht
 		}
 	}
 
+	void CMaterial::unloadUniformTexture(const char* name)
+	{
+		SUniformTexture* p = getUniformTexture(name);
+		if (p != NULL && p->Texture)
+		{
+			CTextureManager* textureManager = CTextureManager::getInstance();
+			textureManager->removeTexture(p->Texture);
+			p->Texture = NULL;
+			m_textures[p->TextureSlot] = NULL;
+		}
+	}
+
 	void CMaterial::initMaterial()
 	{
 		deleteAllParams();

diff --git a/Projects/Skylicht/Engine/Source/Material/CMaterial.h b/Projects/Skylicht/Engine/Source/Material/CMaterial.h
@@ -301,6 +301,8 @@ namespace Skylicht
 
 		void unloadUniformTexture();
 
+		void unloadUniformTexture(const char *name);
+
 		void setOverrideResource(ITexture* texture, CShader::EResourceType type)
 		{
 			m_overrideTextures[type] = texture;

diff --git a/Projects/Skylicht/Engine/Source/Material/CMaterialManager.cpp b/Projects/Skylicht/Engine/Source/Material/CMaterialManager.cpp
@@ -64,6 +64,27 @@ namespace Skylicht
 		m_listGenerateMaterials.clear();
 	}
 
+	void CMaterialManager::unloadMaterial(const char* filename)
+	{
+		std::map<std::string, ArrayMaterial>::iterator it = m_materials.find(filename);
+		if (it == m_materials.end())
+		{
+			char log[512];
+			sprintf(log, "[CMaterialManager] %s not found", filename);
+			os::Printer::log(log);
+			return;
+		}
+
+		ArrayMaterial& list = (*it).second;
+		for (int j = 0, n = (int)list.size(); j < n; j++)
+		{
+			CMaterial* m = list[j];
+			m->drop();
+		}
+
+		m_materials.erase(it);
+	}
+
 	ArrayMaterial& CMaterialManager::loadMaterial(const char* filename, bool loadTexture, const std::vector<std::string>& textureFolders)
 	{
 		// find in cached

diff --git a/Projects/Skylicht/Engine/Source/Material/CMaterialManager.h b/Projects/Skylicht/Engine/Source/Material/CMaterialManager.h
@@ -48,6 +48,8 @@ namespace Skylicht
 
 		ArrayMaterial& loadMaterial(const char* filename, bool loadTexture, const std::vector<std::string>& textureFolders);
 
+		void unloadMaterial(const char* filename);
+
 		CMaterial* createMaterial(ArrayMaterial& materials);
 
 		void deleteMaterial(ArrayMaterial& materials, CMaterial* material);

diff --git a/Projects/Skylicht/Engine/Source/TextureManager/CTextureManager.cpp b/Projects/Skylicht/Engine/Source/TextureManager/CTextureManager.cpp
@@ -68,7 +68,7 @@ namespace Skylicht
 		while (i != end)
 		{
 			char log[512];
-			sprintf(log, "Remove Texture: %s", (*i)->texture->getName().getPath().c_str());
+			sprintf(log, "Remove texture: %s", (*i)->texture->getName().getPath().c_str());
 			os::Printer::log(log);
 
 			driver->removeTexture((*i)->texture);
@@ -87,6 +87,10 @@ namespace Skylicht
 		{
 			if ((*i)->texture == tex)
 			{
+				char log[512];
+				sprintf(log, "Remove texture: %s", (*i)->texture->getName().getPath().c_str());
+				os::Printer::log(log);
+
 				driver->removeTexture((*i)->texture);
 				delete (*i);