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

OpenGEXImporter: fix compiler warning.

pull/1034/head^2
Kim Kulling 2016-10-15 21:45:09 +02:00
parent 7681089abc
commit 46d78f57d5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/OpenGEXImporter.cpp
View File

@ -124,7 +124,7 @@ namespace Grammar {
MaterialToken, MaterialToken,
ColorToken, ColorToken,
ParamToken, ParamToken,
TextureToken, TextureToken,
AttenToken AttenToken
}; };
@ -237,7 +237,7 @@ OpenGEXImporter::VertexContainer::~VertexContainer() {
delete[] m_vertices; delete[] m_vertices;
delete[] m_colors; delete[] m_colors;
delete[] m_normals; delete[] m_normals;
for(auto &texcoords : m_textureCoords) { for(auto &texcoords : m_textureCoords) {
delete [] texcoords; delete [] texcoords;
} }
@ -413,7 +413,7 @@ void OpenGEXImporter::handleNodes( DDLNode *node, aiScene *pScene ) {
case Grammar::ColorToken: case Grammar::ColorToken:
handleColorNode( *it, pScene ); handleColorNode( *it, pScene );
break; break;
case Grammar::ParamToken: case Grammar::ParamToken:
handleParamNode( *it, pScene ); handleParamNode( *it, pScene );
break; break;
@ -479,7 +479,7 @@ void OpenGEXImporter::handleNameNode( DDLNode *node, aiScene *pScene ) {
} }
const std::string name( val->getString() ); const std::string name( val->getString() );
if( m_tokenType == Grammar::GeometryNodeToken || m_tokenType == Grammar::LightNodeToken if( m_tokenType == Grammar::GeometryNodeToken || m_tokenType == Grammar::LightNodeToken
|| m_tokenType == Grammar::CameraNodeToken ) { || m_tokenType == Grammar::CameraNodeToken ) {
m_currentNode->mName.Set( name.c_str() ); m_currentNode->mName.Set( name.c_str() );
} else if( m_tokenType == Grammar::MaterialToken ) { } else if( m_tokenType == Grammar::MaterialToken ) {
@ -515,7 +515,7 @@ void OpenGEXImporter::handleObjectRefNode( DDLNode *node, aiScene *pScene ) {
std::vector<std::string> objRefNames; std::vector<std::string> objRefNames;
getRefNames( node, objRefNames ); getRefNames( node, objRefNames );
// when we are dealing with a geometry node prepare the mesh cache // when we are dealing with a geometry node prepare the mesh cache
if ( m_tokenType == Grammar::GeometryNodeToken ) { if ( m_tokenType == Grammar::GeometryNodeToken ) {
m_currentNode->mNumMeshes = objRefNames.size(); m_currentNode->mNumMeshes = objRefNames.size();
@ -596,7 +596,7 @@ void OpenGEXImporter::handleGeometryObject( DDLNode *node, aiScene *pScene ) {
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
void OpenGEXImporter::handleCameraObject( ODDLParser::DDLNode *node, aiScene *pScene ) { void OpenGEXImporter::handleCameraObject( ODDLParser::DDLNode *node, aiScene *pScene ) {
// parameters will be parsed normally in the tree, so just go for it // parameters will be parsed normally in the tree, so just go for it
handleNodes( node, pScene ); handleNodes( node, pScene );
} }
@ -757,7 +757,6 @@ static void fillColor4( aiColor4D *col4, Value *vals ) {
ai_assert( nullptr != col4 ); ai_assert( nullptr != col4 );
ai_assert( nullptr != vals ); ai_assert( nullptr != vals );
float r( 0.0f ), g( 0.0f ), b( 0.0f ), a ( 1.0f );
Value *next( vals ); Value *next( vals );
col4->r = next->getFloat(); col4->r = next->getFloat();
next = next->m_next; next = next->m_next;
@ -1169,7 +1168,7 @@ void OpenGEXImporter::pushNode( aiNode *node, aiScene *pScene ) {
if ( nullptr == node ) { if ( nullptr == node ) {
return; return;
} }
ChildInfo *info( nullptr ); ChildInfo *info( nullptr );
if( m_nodeStack.empty() ) { if( m_nodeStack.empty() ) {
node->mParent = pScene->mRootNode; node->mParent = pScene->mRootNode;