Add support for emissive and gloss-maps

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-03-29 16:12:22 +01:00
parent 9186911da0
commit f433746bfa
3 changed files with 9 additions and 0 deletions

View File

@@ -156,6 +156,7 @@ struct Material
aiString texture;
aiString textureSpecular;
aiString textureAmbient;
aiString textureEmissive;
aiString textureBump;
aiString textureNormal;
aiString textureSpecularity;
@@ -166,6 +167,7 @@ struct Material
TextureDiffuseType = 0,
TextureSpecularType,
TextureAmbientType,
TextureEmissiveType,
TextureBumpType,
TextureNormalType,
TextureSpecularityType,