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

- Fix a compiler warning ( double to float ). 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@392 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2009-04-18 18:03:54 +00:00
parent ea085bddd1
commit 9dfe7764b2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/ColladaLoader.cpp
View File

@ -883,7 +883,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
continue; continue;
// resolve the data pointers for all anim channels. Find the minimum time while we're at it // resolve the data pointers for all anim channels. Find the minimum time while we're at it
float startTime = 1e20, endTime = -1e20; float startTime = 1e20f, endTime = -1e20f;
for( std::vector<ChannelEntry>::iterator it = entries.begin(); it != entries.end(); ++it) for( std::vector<ChannelEntry>::iterator it = entries.begin(); it != entries.end(); ++it)
{ {
ChannelEntry& e = *it; ChannelEntry& e = *it;
@ -959,7 +959,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
resultTrafos.push_back( mat); resultTrafos.push_back( mat);
// find next point in time to evaluate. That's the closest frame larger than the current in any channel // find next point in time to evaluate. That's the closest frame larger than the current in any channel
float nextTime = 1e20; float nextTime = 1e20f;
for( std::vector<ChannelEntry>::iterator it = entries.begin(); it != entries.end(); ++it) for( std::vector<ChannelEntry>::iterator it = entries.begin(); it != entries.end(); ++it)
{ {
ChannelEntry& e = *it; ChannelEntry& e = *it;