sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved ResourceManager code 

Former-commit-id: e4e2b9aafdb569d2769a1501f88e307fcbe763a0
This commit is contained in:
Lynix 2015-01-29 11:46:29 +01:00
parent e82eccecfd
commit 8eef78293d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/Nazara/Core/ResourceManager.inl
View File

@ -16,8 +16,6 @@ void NzResourceManager<Type, Parameters>::Clear()
template<typename Type, typename Parameters> template<typename Type, typename Parameters>
NzObjectRef<Type> NzResourceManager<Type, Parameters>::Get(const NzString& filePath) NzObjectRef<Type> NzResourceManager<Type, Parameters>::Get(const NzString& filePath)
{ {
NzObjectRef<Type> ref;
NzString absolutePath = NzFile::AbsolutePath(filePath); NzString absolutePath = NzFile::AbsolutePath(filePath);
auto it = Type::s_managerMap.find(absolutePath); auto it = Type::s_managerMap.find(absolutePath);
if (it == Type::s_managerMap.end()) if (it == Type::s_managerMap.end())
@ -26,13 +24,13 @@ NzObjectRef<Type> NzResourceManager<Type, Parameters>::Get(const NzString& fileP
if (!resource) if (!resource)
{ {
NazaraError("Failed to create resource"); NazaraError("Failed to create resource");
return ref; return NzObjectRef<Type>();
} }
if (!resource->LoadFromFile(absolutePath, GetDefaultParameters())) if (!resource->LoadFromFile(absolutePath, GetDefaultParameters()))
{ {
NazaraError("Failed to load resource from file: " + absolutePath); NazaraError("Failed to load resource from file: " + absolutePath);
return ref; return NzObjectRef<Type>();
} }
NazaraDebug("Loaded resource from file " + absolutePath); NazaraDebug("Loaded resource from file " + absolutePath);
@ -57,7 +55,10 @@ void NzResourceManager<Type, Parameters>::Purge()
{ {
const NzObjectRef<Type>& ref = it->second; const NzObjectRef<Type>& ref = it->second;
if (ref.GetReferenceCount() == 1) // Sommes-nous les seuls à détenir la ressource ? if (ref.GetReferenceCount() == 1) // Sommes-nous les seuls à détenir la ressource ?
{
NazaraDebug("Purging resource from file " + ref->GetFilePath());
Type::s_managerMap.erase(it++); // Alors on la supprime Type::s_managerMap.erase(it++); // Alors on la supprime
}
else else
++it; ++it;
} }