Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: ObjLoader failed to locate material files if the input path contained 'wrong' path delimiters.

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@471 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2009-08-24 08:46:04 +00:00
parent 3435623463
commit 64168ba975
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/ObjFileParser.cpp
View File

@@ -57,10 +57,7 @@ const std::string ObjFileParser::DEFAULT_MATERIAL = AI_DEFAULT_MATERIAL_NAME;
// -------------------------------------------------------------------
// Constructor with loaded data and directories.
ObjFileParser::ObjFileParser(std::vector<char> &Data,
const std::string &strAbsPath,
const std::string &strModelName, IOSystem* _io) :
m_strAbsPath(strAbsPath),
ObjFileParser::ObjFileParser(std::vector<char> &Data,const std::string &strModelName, IOSystem* _io) :
m_DataIt(Data.begin()),
m_DataItEnd(Data.end()),
m_pModel(NULL),
@@ -440,13 +437,12 @@ void ObjFileParser::getMaterialLib()
m_DataIt++;
// Check for existence
std::string strMatName(pStart, &(*m_DataIt));
std::string absName = m_strAbsPath + io->getOsSeparator() + strMatName;
IOStream *pFile = io->Open(absName.c_str());
const std::string strMatName(pStart, &(*m_DataIt));
IOStream *pFile = io->Open(strMatName);
if (!pFile )
{
DefaultLogger::get()->error("OBJ: Unable to locate material file " + absName);
DefaultLogger::get()->error("OBJ: Unable to locate material file " + strMatName);
m_DataIt = skipLine<DataArrayIt>( m_DataIt, m_DataItEnd, m_uiLine );
return;
}
@@ -457,7 +453,7 @@ void ObjFileParser::getMaterialLib()
io->Close( pFile );
// Importing the material library
ObjFileMtlImporter mtlImporter( buffer, absName, m_pModel );
ObjFileMtlImporter mtlImporter( buffer, strMatName, m_pModel );
}
// -------------------------------------------------------------------