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

Get rid of warnings on GCC4.4 with -wall

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-02-06 23:52:41 +00:00
parent 7dcbff5d5c
commit 17326515d4
33 changed files with 206 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/IRRLoader.cpp
View File

@@ -298,6 +298,10 @@ void IRRImporter::ComputeAnimations(Node* root, aiNode* real, std::vector<aiNode
{
ai_assert(NULL != root && NULL != real);
// XXX totally WIP - doesn't produce proper results, need to evaluate
// whether there's any use for Irrlicht's proprietary scene format
// outside Irrlicht ...
if (root->animators.empty()) {
return;
}
@@ -404,7 +408,7 @@ void IRRImporter::ComputeAnimations(Node* root, aiNode* real, std::vector<aiNode
// find out how many time units we'll need for the finest
// track (in seconds) - this defines the number of output
// keys (fps * seconds)
float max ;
float max = 0.f;
if (angles[0])
max = (float)lcm / angles[0];
if (angles[1])
@@ -555,6 +559,9 @@ void IRRImporter::ComputeAnimations(Node* root, aiNode* real, std::vector<aiNode
}
}
break;
default:
// UNKNOWN , OTHER
break;
};
if (anim) {
anims.push_back(anim);
@@ -813,6 +820,9 @@ void IRRImporter::GenerateGraph(Node* root,aiNode* rootOut ,aiScene* scene,
DefaultLogger::get()->error("IRR: Unsupported node - TERRAIN");
}
break;
default:
// DUMMY
break;
};
// Check whether we added a mesh (or more than one ...). In this case
@@ -1182,8 +1192,8 @@ void IRRImporter::InternReadFile( const std::string& pFile,
}
// radius of the sphere to be generated -
// or alternatively, size of the cube
else if (Node::SPHERE == curNode->type && prop.name == "Radius"
|| Node::CUBE == curNode->type && prop.name == "Size" ) {
else if ((Node::SPHERE == curNode->type && prop.name == "Radius")
|| (Node::CUBE == curNode->type && prop.name == "Size" )) {
curNode->sphereRadius = prop.value;
}
@@ -1248,7 +1258,7 @@ void IRRImporter::InternReadFile( const std::string& pFile,
DefaultLogger::get()->error("Ignoring light of unknown type: " + prop.value);
}
}
else if (prop.name == "Mesh" && Node::MESH == curNode->type ||
else if ((prop.name == "Mesh" && Node::MESH == curNode->type) ||
Node::ANIMMESH == curNode->type)
{
/* This is the file name of the mesh - either