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

Fix : https://github.com/assimp/assimp/issues/557

pull/607/head
Kim Kulling 2015-07-08 00:34:28 +02:00
parent 4a77170399
commit bc8aa18eb2
2 changed files with 229 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/ObjFileMtlImporter.cpp
View File

@ -162,12 +162,18 @@ void ObjFileMtlImporter::load()
} }
break; break;
case 'd': // Alpha value case 'd':
{ {
if( *(m_DataIt+1) == 'i' && *( m_DataIt + 2 ) == 's' && *( m_DataIt + 3 ) == 'p' ) {
// A displacement map
getTexture();
} else {
// Alpha value
++m_DataIt; ++m_DataIt;
getFloatValue( m_pModel->m_pCurrentMaterial->alpha ); getFloatValue( m_pModel->m_pCurrentMaterial->alpha );
m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine ); m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );
} }
}
break; break;
case 'N': case 'N':
@ -343,9 +349,9 @@ void ObjFileMtlImporter::getTexture() {
getTextureOption(clamp); getTextureOption(clamp);
m_pModel->m_pCurrentMaterial->clamp[clampIndex] = clamp; m_pModel->m_pCurrentMaterial->clamp[clampIndex] = clamp;
std::string strTexture; std::string texture;
m_DataIt = getName<DataArrayIt>( m_DataIt, m_DataItEnd, strTexture ); m_DataIt = getName<DataArrayIt>( m_DataIt, m_DataItEnd, texture );
out->Set( strTexture ); out->Set( texture );
} }
/* ///////////////////////////////////////////////////////////////////////////// /* /////////////////////////////////////////////////////////////////////////////