FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Michael Platings

Browse Source 
I attach a simple fix that makes osgAnimation animations loop correctly when their duration is different from the original duration.
This commit is contained in:
Cedric Pinson 2010-06-09 13:08:49 +00:00
parent 9262015d11
commit 50979d2447
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgAnimation/Animation.cpp
View File

@ -106,29 +106,29 @@ bool Animation::update (double time, int priority)
switch (_playmode)
{
case ONCE:
if (t > _duration)
if (t > _originalDuration)
return false;
break;
case STAY:
if (t > _duration)
t = _duration;
if (t > _originalDuration)
t = _originalDuration;
break;
case LOOP:
if (!_duration)
if (!_originalDuration)
t = _startTime;
else if (t > _duration)
t = fmod(t, _duration);
else if (t > _originalDuration)
t = fmod(t, _originalDuration);
// std::cout << "t " << t << " duration " << _duration << std::endl;
break;
case PPONG:
if (!_duration)
if (!_originalDuration)
t = _startTime;
else
{
int tt = (int) (t / _duration);
t = fmod(t, _duration);
int tt = (int) (t / _originalDuration);
t = fmod(t, _originalDuration);
if (tt%2)
t = _duration - t;
t = _originalDuration - t;
}
break;
}