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

Properly build path to the mtl file when loading loading obj

pull/672/head
Łukasz Twarduś 2015-10-19 22:07:32 +02:00
parent 282a913b7f
commit 3274bcf8d6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ObjFileImporter.cpp
View File

@ -138,7 +138,7 @@ void ObjFileImporter::InternReadFile( const std::string& pFile, aiScene* pScene,
if ( pos != std::string::npos ) { if ( pos != std::string::npos ) {
modelName = pFile.substr(pos+1, pFile.size() - pos - 1); modelName = pFile.substr(pos+1, pFile.size() - pos - 1);
folderName = pFile.substr( 0, pos ); folderName = pFile.substr( 0, pos );
if ( folderName.empty() ) { if ( !folderName.empty() ) {
pIOHandler->PushDirectory( folderName ); pIOHandler->PushDirectory( folderName );
} }
} else { } else {

7
code/ObjFileParser.cpp
View File

@ -414,7 +414,7 @@ void ObjFileParser::getFace(aiPrimitiveType type)
if ( pIndices->empty() ) { if ( pIndices->empty() ) {
DefaultLogger::get()->error("Obj: Ignoring empty face"); DefaultLogger::get()->error("Obj: Ignoring empty face");
// skip line and clean up // skip line and clean up
m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine ); m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );
delete pNormalID; delete pNormalID;
delete pTexID; delete pTexID;
@ -539,7 +539,10 @@ void ObjFileParser::getMaterialLib()
const std::string strMatName(pStart, &(*m_DataIt)); const std::string strMatName(pStart, &(*m_DataIt));
std::string absName; std::string absName;
if ( m_pIO->StackSize() > 0 ) { if ( m_pIO->StackSize() > 0 ) {
const std::string &path = m_pIO->CurrentDirectory(); std::string path = m_pIO->CurrentDirectory();
if ( '/' != *path.rbegin() ) {
path += '/';
}
absName = path + strMatName; absName = path + strMatName;
} else { } else {
absName = strMatName; absName = strMatName;