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

Change time type from float to double in osgAnimation

Browse Source
This commit is contained in:
Cedric Pinson
2010-03-25 17:50:29 +00:00
parent fe5527f332
commit 35fa541350
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgAnimation/Animation.cpp
View File

@@ -80,7 +80,7 @@ void Animation::setDuration(double duration)
_duration = duration;
}
float Animation::getDuration() const
double Animation::getDuration() const
{
return _duration;
}
@@ -95,14 +95,14 @@ void Animation::setWeight (float weight)
_weight = weight;
}
bool Animation::update (float time, int priority)
bool Animation::update (double time, int priority)
{
if (!_duration) // if not initialized then do it
computeDuration();
double ratio = _originalDuration / _duration;
float t = (time - _startTime) * ratio;
double t = (time - _startTime) * ratio;
switch (_playmode)
{
case ONCE:
@@ -117,7 +117,7 @@ bool Animation::update (float time, int priority)
if (!_duration)
t = _startTime;
else if (t > _duration)
t = fmod(t, (float)_duration);
t = fmod(t, _duration);
// std::cout << "t " << t << " duration " << _duration << std::endl;
break;
case PPONG: