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

bugfix: add correct handling for metric line end for example file.

Browse Source 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
This commit is contained in:
Kim Kulling
2014-11-02 20:30:45 +01:00
parent 1a5695ff48
commit dbf9536213
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/OpenGEXParser.cpp
View File

@@ -189,6 +189,17 @@ bool OpenGEXParser::skipComments() {
return skipped;
}
//------------------------------------------------------------------------------------------------
void OpenGEXParser::readUntilEndOfLine() {
while( !IsLineEnd( m_buffer[ m_index ] ) ) {
++m_index;
}
++m_index;
if( IsLineEnd( m_buffer[ m_index ] ) ) {
++m_index;
}
}
//------------------------------------------------------------------------------------------------
bool OpenGEXParser::parseNextNode() {
std::string token( getNextToken() );
@@ -202,8 +213,11 @@ bool OpenGEXParser::parseNextNode() {
if( !getNodeData( nodeType ) ) {
return false;
}
readUntilEndOfLine();
m_nodeTypeStack.pop_back();
}
return true;
@@ -329,21 +343,19 @@ bool OpenGEXParser::getMetricAttributeKey( std::string &attribName ) {
//------------------------------------------------------------------------------------------------
bool OpenGEXParser::onMetricNode( const std::string &attribName ) {
float value( 0.0f );
bool success( true );
if( "distance" == attribName ) {
float distance( 0.0f );
if( getFloatData( 1, &distance ) ) {
m_model.m_metrics.m_distance = distance;
if( getFloatData( 1, &value ) ) {
m_model.m_metrics.m_distance = value;
}
} else if( "angle" == attribName ) {
float angle( 0.0f );
if( getFloatData( 1, &angle ) ) {
m_model.m_metrics.m_angle = angle;
if( getFloatData( 1, &value ) ) {
m_model.m_metrics.m_angle = value;
}
} else if( "time" == attribName ) {
float time( 0.0f );
if( getFloatData( 1, &time ) ) {
m_model.m_metrics.m_time = time;
if( getFloatData( 1, &value ) ) {
m_model.m_metrics.m_time = value;
}
} else if( "up" == attribName ) {
std::string up;