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

fix compiler warning. 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/502/head
Kim Kulling 2015-03-17 14:24:28 +01:00
parent 207906f039
commit 7d7ccfd630
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/OpenGEXImporter.h
View File

@ -65,10 +65,12 @@ struct MetricInfo {
std::string m_stringValue; std::string m_stringValue;
float m_floatValue; float m_floatValue;
int m_intValue;
MetricInfo() MetricInfo()
: m_stringValue( "" ) : m_stringValue( "" )
, m_floatValue( 0.0f ) { , m_floatValue( 0.0f )
, m_intValue( -1 ) {
// empty // empty
} }
}; };
@ -102,16 +104,33 @@ protected:
void handleMetricNode( ODDLParser::DDLNode *node, aiScene *pScene ); void handleMetricNode( ODDLParser::DDLNode *node, aiScene *pScene );
void handleNameNode( ODDLParser::DDLNode *node, aiScene *pScene ); void handleNameNode( ODDLParser::DDLNode *node, aiScene *pScene );
void handleObjectRefNode( ODDLParser::DDLNode *node, aiScene *pScene ); void handleObjectRefNode( ODDLParser::DDLNode *node, aiScene *pScene );
void handleMaterialRefNode( ODDLParser::DDLNode *node, aiScene *pScene );
void handleGeometryNode( ODDLParser::DDLNode *node, aiScene *pScene ); void handleGeometryNode( ODDLParser::DDLNode *node, aiScene *pScene );
void handleGeometryObject( ODDLParser::DDLNode *node, aiScene *pScene ); void handleGeometryObject( ODDLParser::DDLNode *node, aiScene *pScene );
void handleMaterial( ODDLParser::DDLNode *node, aiScene *pScene );
void resolveReferences(); void resolveReferences();
private: private:
struct RefInfo {
enum Type {
MeshRef,
MaterialRef
};
aiNode *m_node;
Type m_type;
std::vector<std::string> m_Names;
RefInfo( aiNode *node, Type type, std::vector<std::string> &names );
};
std::vector<aiMesh*> m_meshCache; std::vector<aiMesh*> m_meshCache;
std::map<std::string, size_t> m_mesh2refMap; std::map<std::string, size_t> m_mesh2refMap;
ODDLParser::Context *m_ctx; ODDLParser::Context *m_ctx;
MetricInfo m_metrics[ MetricInfo::Max ]; MetricInfo m_metrics[ MetricInfo::Max ];
aiNode *m_currentNode; aiNode *m_currentNode;
std::vector<RefInfo*> m_unresolvedRefStack;
}; };
} // Namespace OpenGEX } // Namespace OpenGEX