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

Optimized OBJ loader 

No longer loading same material twice


Former-commit-id: 21e1842600722f4ba3c02816fbfc016a6e5175c5
This commit is contained in:
Lynix 2013-09-25 09:04:44 +02:00
parent dbbc931df1
commit 672cbaed1d
1 changed files with 73 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
View File

@ -193,12 +193,18 @@ namespace
NzMTLParser materialParser(file); NzMTLParser materialParser(file);
if (materialParser.Parse()) if (materialParser.Parse())
{ {
std::unordered_map<NzString, NzMaterial*> materialCache;
NzString baseDir = file.GetDirectory(); NzString baseDir = file.GetDirectory();
for (unsigned int i = 0; i < meshCount; ++i) for (unsigned int i = 0; i < meshCount; ++i)
{ {
const NzString& matName = materials[meshes[i].material]; const NzString& matName = materials[meshes[i].material];
const NzMTLParser::Material* mtlMat = materialParser.GetMaterial(matName); const NzMTLParser::Material* mtlMat = materialParser.GetMaterial(matName);
if (mtlMat) if (mtlMat)
{
auto it = materialCache.find(matName);
if (it != materialCache.end())
model->SetMaterial(meshes[i].material, it->second);
else
{ {
std::unique_ptr<NzMaterial> material(new NzMaterial); std::unique_ptr<NzMaterial> material(new NzMaterial);
material->SetPersistent(false); material->SetPersistent(false);
@ -275,9 +281,12 @@ namespace
material->SetSrcBlend(nzBlendFunc_SrcAlpha); material->SetSrcBlend(nzBlendFunc_SrcAlpha);
} }
materialCache[matName] = material.get();
model->SetMaterial(meshes[i].material, material.get()); model->SetMaterial(meshes[i].material, material.get());
material.release(); material.release();
} }
}
else else
NazaraWarning("MTL has no material \"" + matName + '"'); NazaraWarning("MTL has no material \"" + matName + '"');
} }