Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 250 vs 251 for /trunk/Source Code/Geometry/Animations/AnimationController.cpp

Diff revisions: vs.
  @@ -60,7 +60,7 @@
60 60 std::string tes = found->second->_name;
61 61 found->second->_offsetMatrix = bone->mOffsetMatrix;
62 62 _bones.push_back(found->second);
63 - _bonesToIndex[found->first] = _bones.size()-1;
63 + _bonesToIndex[found->first] = (U32)_bones.size()-1;
64 64 }
65 65 }
66 66 }
  @@ -70,7 +70,7 @@
70 70 mat4<F32> rotationmat;
71 71 vectorImpl<mat4<F32> > vec;
72 72 for(size_t i(0); i< _animations.size(); i++){// pre calculate the animations
73 - SetAnimIndex(i);
73 + SetAnimIndex((I32)i);
74 74 D32 dt = 0;
75 75 for(D32 ticks = 0; ticks < _animations[i]._duration; ticks += _animations[i]._ticksPerSecond/ANIMATION_TICKS_PER_SECOND){
76 76 dt +=timestep;