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

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

@ -193,6 +193,7 @@ 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)
{ {
@ -200,83 +201,91 @@ namespace
const NzMTLParser::Material* mtlMat = materialParser.GetMaterial(matName); const NzMTLParser::Material* mtlMat = materialParser.GetMaterial(matName);
if (mtlMat) if (mtlMat)
{ {
std::unique_ptr<NzMaterial> material(new NzMaterial); auto it = materialCache.find(matName);
material->SetPersistent(false); if (it != materialCache.end())
model->SetMaterial(meshes[i].material, it->second);
nzUInt8 alphaValue = static_cast<nzUInt8>(mtlMat->alpha*255.f); else
NzColor ambientColor(mtlMat->ambient);
ambientColor.a = alphaValue;
NzColor diffuseColor(mtlMat->diffuse);
diffuseColor.a = alphaValue;
NzColor specularColor(mtlMat->specular);
specularColor.a = alphaValue;
material->SetAmbientColor(ambientColor);
material->SetDiffuseColor(diffuseColor);
material->SetSpecularColor(specularColor);
material->SetShininess(mtlMat->shininess);
bool hasAlphaMap = false;;
if (parameters.material.loadAlphaMap && !mtlMat->alphaMap.IsEmpty())
{ {
std::unique_ptr<NzTexture> alphaMap(new NzTexture); std::unique_ptr<NzMaterial> material(new NzMaterial);
alphaMap->SetPersistent(false); material->SetPersistent(false);
if (alphaMap->LoadFromFile(baseDir + mtlMat->alphaMap)) nzUInt8 alphaValue = static_cast<nzUInt8>(mtlMat->alpha*255.f);
NzColor ambientColor(mtlMat->ambient);
ambientColor.a = alphaValue;
NzColor diffuseColor(mtlMat->diffuse);
diffuseColor.a = alphaValue;
NzColor specularColor(mtlMat->specular);
specularColor.a = alphaValue;
material->SetAmbientColor(ambientColor);
material->SetDiffuseColor(diffuseColor);
material->SetSpecularColor(specularColor);
material->SetShininess(mtlMat->shininess);
bool hasAlphaMap = false;;
if (parameters.material.loadAlphaMap && !mtlMat->alphaMap.IsEmpty())
{ {
hasAlphaMap = true; std::unique_ptr<NzTexture> alphaMap(new NzTexture);
alphaMap->SetPersistent(false);
material->SetAlphaMap(alphaMap.get()); if (alphaMap->LoadFromFile(baseDir + mtlMat->alphaMap))
alphaMap.release(); {
hasAlphaMap = true;
material->SetAlphaMap(alphaMap.get());
alphaMap.release();
}
else
NazaraWarning("Failed to load alpha map (" + mtlMat->alphaMap + ')');
} }
else
NazaraWarning("Failed to load alpha map (" + mtlMat->alphaMap + ')');
}
if (parameters.material.loadDiffuseMap && !mtlMat->diffuseMap.IsEmpty()) if (parameters.material.loadDiffuseMap && !mtlMat->diffuseMap.IsEmpty())
{
std::unique_ptr<NzTexture> diffuseMap(new NzTexture);
diffuseMap->SetPersistent(false);
if (diffuseMap->LoadFromFile(baseDir + mtlMat->diffuseMap))
{ {
material->SetDiffuseMap(diffuseMap.get()); std::unique_ptr<NzTexture> diffuseMap(new NzTexture);
diffuseMap.release(); diffuseMap->SetPersistent(false);
if (diffuseMap->LoadFromFile(baseDir + mtlMat->diffuseMap))
{
material->SetDiffuseMap(diffuseMap.get());
diffuseMap.release();
}
else
NazaraWarning("Failed to load diffuse map (" + mtlMat->diffuseMap + ')');
} }
else
NazaraWarning("Failed to load diffuse map (" + mtlMat->diffuseMap + ')');
}
if (parameters.material.loadSpecularMap && !mtlMat->specularMap.IsEmpty()) if (parameters.material.loadSpecularMap && !mtlMat->specularMap.IsEmpty())
{
std::unique_ptr<NzTexture> specularMap(new NzTexture);
specularMap->SetPersistent(false);
if (specularMap->LoadFromFile(baseDir + mtlMat->specularMap))
{ {
material->SetSpecularMap(specularMap.get()); std::unique_ptr<NzTexture> specularMap(new NzTexture);
specularMap.release(); specularMap->SetPersistent(false);
if (specularMap->LoadFromFile(baseDir + mtlMat->specularMap))
{
material->SetSpecularMap(specularMap.get());
specularMap.release();
}
else
NazaraWarning("Failed to load specular map (" + mtlMat->specularMap + ')');
} }
else
NazaraWarning("Failed to load specular map (" + mtlMat->specularMap + ')');
}
// Si nous avons une alpha map ou des couleurs transparentes, // Si nous avons une alpha map ou des couleurs transparentes,
// nous devons configurer le matériau pour accepter la transparence au mieux // nous devons configurer le matériau pour accepter la transparence au mieux
if (hasAlphaMap || alphaValue != 255) if (hasAlphaMap || alphaValue != 255)
{ {
// On paramètre le matériau pour accepter la transparence au mieux // On paramètre le matériau pour accepter la transparence au mieux
material->Enable(nzRendererParameter_Blend, true); material->Enable(nzRendererParameter_Blend, true);
material->Enable(nzRendererParameter_DepthWrite, false); material->Enable(nzRendererParameter_DepthWrite, false);
material->SetDstBlend(nzBlendFunc_InvSrcAlpha); material->SetDstBlend(nzBlendFunc_InvSrcAlpha);
material->SetSrcBlend(nzBlendFunc_SrcAlpha); material->SetSrcBlend(nzBlendFunc_SrcAlpha);
} }
model->SetMaterial(meshes[i].material, material.get()); materialCache[matName] = material.get();
material.release();
model->SetMaterial(meshes[i].material, material.get());
material.release();
}
} }
else else
NazaraWarning("MTL has no material \"" + matName + '"'); NazaraWarning("MTL has no material \"" + matName + '"');