v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4106 from assimp/kimkulling-issues-3726 

Add support for normal maps, the classic way
pull/4108/head
Kim Kulling 2021-10-01 14:58:19 +02:00 committed by GitHub
parent 2f5a31110c ac6b8988df
commit 3e4cca4d2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/AssetLib/Obj/ObjFileMtlImporter.cpp
View File

@ -61,7 +61,8 @@ static const std::string EmissiveTexture1 = "map_emissive";
static const std::string EmissiveTexture2 = "map_Ke"; static const std::string EmissiveTexture2 = "map_Ke";
static const std::string BumpTexture1 = "map_bump"; static const std::string BumpTexture1 = "map_bump";
static const std::string BumpTexture2 = "bump"; static const std::string BumpTexture2 = "bump";
static const std::string NormalTexture = "map_Kn"; static const std::string NormalTextureV1 = "map_Kn";
static const std::string NormalTextureV2 = "norm";
static const std::string ReflectionTexture = "refl"; static const std::string ReflectionTexture = "refl";
static const std::string DisplacementTexture1 = "map_disp"; static const std::string DisplacementTexture1 = "map_disp";
static const std::string DisplacementTexture2 = "disp"; static const std::string DisplacementTexture2 = "disp";
@ -321,7 +322,7 @@ void ObjFileMtlImporter::getTexture() {
// Bump texture // Bump texture
out = &m_pModel->m_pCurrentMaterial->textureBump; out = &m_pModel->m_pCurrentMaterial->textureBump;
clampIndex = ObjFile::Material::TextureBumpType; clampIndex = ObjFile::Material::TextureBumpType;
} else if (!ASSIMP_strincmp(pPtr, NormalTexture.c_str(), static_cast<unsigned int>(NormalTexture.size()))) { } else if (!ASSIMP_strincmp(pPtr, NormalTextureV1.c_str(), static_cast<unsigned int>(NormalTextureV1.size())) || !ASSIMP_strincmp(pPtr, NormalTextureV2.c_str(), static_cast<unsigned int>(NormalTextureV2.size()))) {
// Normal map // Normal map
out = &m_pModel->m_pCurrentMaterial->textureNormal; out = &m_pModel->m_pCurrentMaterial->textureNormal;
clampIndex = ObjFile::Material::TextureNormalType; clampIndex = ObjFile::Material::TextureNormalType;