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

Use correct lookup.

pull/1793/head
Kim Kulling 2018-02-20 22:08:40 +01:00
parent 8950504cf0
commit 7cd1a66c8b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/D3MFImporter.cpp
View File

@ -205,10 +205,11 @@ private:
const std::string nodeName( xmlReader->getNodeName() ); const std::string nodeName( xmlReader->getNodeName() );
if(xmlReader->getNodeName() == D3MF::XmlTag::triangle) { if(xmlReader->getNodeName() == D3MF::XmlTag::triangle) {
faces.push_back(ReadTriangle()); faces.push_back(ReadTriangle());
} else if ( nodeName == D3MF::XmlTag::pid ) { const char *pidToken( xmlReader->getAttributeValue( D3MF::XmlTag::pid.c_str() ) );
const std::string matId( xmlReader->getAttributeValue( nodeName.c_str() ) ); if ( nullptr != pidToken ) {
int matIdx( std::atoi( matId.c_str() ) ); int matIdx( std::atoi( pidToken ) );
mesh->mMaterialIndex = matIdx; mesh->mMaterialIndex = matIdx;
}
} }
} }
@ -234,6 +235,7 @@ private:
void ReadBaseMaterials() { void ReadBaseMaterials() {
while ( ReadToEndElement( D3MF::XmlTag::basematerials ) ) { while ( ReadToEndElement( D3MF::XmlTag::basematerials ) ) {
mMaterials.push_back( readMaterialDef() ); mMaterials.push_back( readMaterialDef() );
xmlReader->read();
} }
} }
@ -324,8 +326,7 @@ private:
return false; return false;
} }
bool ReadToEndElement(const std::string& closeTag) bool ReadToEndElement(const std::string& closeTag) {
{
while(xmlReader->read()) while(xmlReader->read())
{ {
if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT) { if (xmlReader->getNodeType() == irr::io::EXN_ELEMENT) {