diff options
| author | aap <aap@papnet.eu> | 2020-05-10 23:47:53 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-10 23:47:53 +0200 |
| commit | 198b80f56032352cce5e9b887c942fdcff793d13 (patch) | |
| tree | cbdc4c72c2d58268cf933189f24d4a80664ebab5 /src/animation/AnimBlendAssociation.cpp | |
| parent | vehicle model descriptions; a bit of heli code (diff) | |
| download | re3-198b80f56032352cce5e9b887c942fdcff793d13.tar re3-198b80f56032352cce5e9b887c942fdcff793d13.tar.gz re3-198b80f56032352cce5e9b887c942fdcff793d13.tar.bz2 re3-198b80f56032352cce5e9b887c942fdcff793d13.tar.lz re3-198b80f56032352cce5e9b887c942fdcff793d13.tar.xz re3-198b80f56032352cce5e9b887c942fdcff793d13.tar.zst re3-198b80f56032352cce5e9b887c942fdcff793d13.zip | |
Diffstat (limited to 'src/animation/AnimBlendAssociation.cpp')
| -rw-r--r-- | src/animation/AnimBlendAssociation.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp index 78f8eb95..9a29601b 100644 --- a/src/animation/AnimBlendAssociation.cpp +++ b/src/animation/AnimBlendAssociation.cpp @@ -7,7 +7,7 @@ #include "AnimBlendAssociation.h" #include "RwHelper.h" -//--MIAMI: file done except for one TODO +//--MIAMI: file done CAnimBlendAssociation::CAnimBlendAssociation(void) { @@ -160,6 +160,13 @@ CAnimBlendAssociation::Start(float time) SetCurrentTime(time); } +void +CAnimBlendAssociation::UpdateTimeStep(float timeDelta, float relSpeed) +{ + if(IsRunning()) + timeStep = (flags & ASSOC_MOVEMENT ? relSpeed*hierarchy->totalLength : speed) * timeDelta; +} + bool CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed) { @@ -170,10 +177,6 @@ CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed) return true; } - // TODO(MIAMI): we still need this for some reason -#ifndef NOT_YET - timeStep = (flags & ASSOC_MOVEMENT ? relSpeed*hierarchy->totalLength : speed) * timeDelta; -#endif currentTime += timeStep; if(currentTime >= hierarchy->totalLength){ |