Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for emissive and gloss-maps

Browse Source 
Conflicts:
	code/ObjFileMtlImporter.cpp
	Someone added support for loading more bump maps, I added support for emmissive-maps. Easy merge.
This commit is contained in:
Nick Overdijk
2013-12-14 01:40:37 +01:00
parent 9186911da0
commit f433746bfa
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ObjFileImporter.cpp
+3
View File
@@ -575,6 +575,9 @@ void ObjFileImporter::createMaterials(const ObjFile::Model* pModel, aiScene* pSc
}
}
if ( 0 != pCurrentMaterial->textureEmissive.length )
mat->AddProperty( &pCurrentMaterial->textureEmissive, AI_MATKEY_TEXTURE_EMISSIVE(0));
if ( 0 != pCurrentMaterial->textureSpecular.length )
{
mat->AddProperty( &pCurrentMaterial->textureSpecular, AI_MATKEY_TEXTURE_SPECULAR(0));