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

Colladaloader: fix usage of floorf.

pull/756/head
Kim Kulling 2016-01-13 10:04:24 +01:00
parent 42c1f9d3ba
commit 18c0e41d8f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/ColladaLoader.cpp
View File

@ -55,6 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "Defines.h" #include "Defines.h"
#include "time.h" #include "time.h"
#include "math.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include "../include/assimp/DefaultLogger.hpp" #include "../include/assimp/DefaultLogger.hpp"
#include "../include/assimp/Importer.hpp" #include "../include/assimp/Importer.hpp"
@ -1181,7 +1182,7 @@ void ColladaLoader::CreateAnimation( aiScene* pScene, const ColladaParser& pPars
float last_eval_angle = last_key_angle + (cur_key_angle - last_key_angle) * (time - last_key_time) / (cur_key_time - last_key_time); float last_eval_angle = last_key_angle + (cur_key_angle - last_key_angle) * (time - last_key_time) / (cur_key_time - last_key_time);
float delta = std::fabs(cur_key_angle - last_eval_angle); float delta = std::fabs(cur_key_angle - last_eval_angle);
if (delta >= 180.0f) { if (delta >= 180.0f) {
int subSampleCount = static_cast<int>(std::floorf(delta / 90.0f)); int subSampleCount = static_cast<int>(floorf(delta / 90.0f));
if (cur_key_time != time) { if (cur_key_time != time) {
float nextSampleTime = time + (cur_key_time - time) / subSampleCount; float nextSampleTime = time + (cur_key_time - time) / subSampleCount;
nextTime = std::min(nextTime, nextSampleTime); nextTime = std::min(nextTime, nextSampleTime);