Browse Source

closes ssues/804: add statement to take care of emissive texture, new
version.

Kim Kulling 9 years ago
parent
commit
99f00834ec
2 changed files with 5 additions and 0 deletions
  1. 5 0
      code/ObjFileMtlImporter.cpp
  2. BIN
      doc/AssimpDoc_Html/AssimpDoc.chm

+ 5 - 0
code/ObjFileMtlImporter.cpp

@@ -60,6 +60,7 @@ static const std::string AmbientTexture      = "map_Ka";
 static const std::string SpecularTexture     = "map_Ks";
 static const std::string SpecularTexture     = "map_Ks";
 static const std::string OpacityTexture      = "map_d";
 static const std::string OpacityTexture      = "map_d";
 static const std::string EmmissiveTexture    = "map_emissive";
 static const std::string EmmissiveTexture    = "map_emissive";
+static const std::string EmmissiveTexture_1 = "map_Ke"
 static const std::string BumpTexture1        = "map_bump";
 static const std::string BumpTexture1        = "map_bump";
 static const std::string BumpTexture2        = "map_Bump";
 static const std::string BumpTexture2        = "map_Bump";
 static const std::string BumpTexture3        = "bump";
 static const std::string BumpTexture3        = "bump";
@@ -326,6 +327,10 @@ void ObjFileMtlImporter::getTexture() {
         // Emissive texture
         // Emissive texture
         out = & m_pModel->m_pCurrentMaterial->textureEmissive;
         out = & m_pModel->m_pCurrentMaterial->textureEmissive;
         clampIndex = ObjFile::Material::TextureEmissiveType;
         clampIndex = ObjFile::Material::TextureEmissiveType;
+    } else if ( !ASSIMP_strincmp( pPtr, EmmissiveTexture_1.c_str(), EmmissiveTexture_1.size() ) ) {
+        // Emissive texture
+        out = &m_pModel->m_pCurrentMaterial->textureEmissive;
+        clampIndex = ObjFile::Material::TextureEmissiveType;
     } else if ( !ASSIMP_strincmp( pPtr, BumpTexture1.c_str(), BumpTexture1.size() ) ||
     } else if ( !ASSIMP_strincmp( pPtr, BumpTexture1.c_str(), BumpTexture1.size() ) ||
                 !ASSIMP_strincmp( pPtr, BumpTexture2.c_str(), BumpTexture2.size() ) ||
                 !ASSIMP_strincmp( pPtr, BumpTexture2.c_str(), BumpTexture2.size() ) ||
                 !ASSIMP_strincmp( pPtr, BumpTexture3.c_str(), BumpTexture3.size() ) ) {
                 !ASSIMP_strincmp( pPtr, BumpTexture3.c_str(), BumpTexture3.size() ) ) {

BIN
doc/AssimpDoc_Html/AssimpDoc.chm