Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:10:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5520 from howard-stearns/single-animation-vs-blend

Browse source 
Don't let individual startAnimation get messed up by blend/fade.
This commit is contained in:
Seth Alves 2015-08-06 18:55:14 -07:00
commit 66f595f4b2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/animation/src/Rig.cpp
View file

@ -70,6 +70,7 @@ void Rig::startAnimation(const QString& url, float fps, float priority,
handle = createAnimationHandle(); handle = createAnimationHandle();
handle->setURL(url); handle->setURL(url);
} }
handle->setFade(1.0f); // If you want to fade, use the startAnimationByRole system.
handle->setFPS(fps); handle->setFPS(fps);
handle->setPriority(priority); handle->setPriority(priority);
handle->setLoop(loop); handle->setLoop(loop);
@ -150,7 +151,8 @@ void Rig::stopAnimationByRole(const QString& role) {
void Rig::stopAnimation(const QString& url) { void Rig::stopAnimation(const QString& url) {
foreach (const AnimationHandlePointer& handle, getRunningAnimations()) { foreach (const AnimationHandlePointer& handle, getRunningAnimations()) {
if (handle->getURL() == url) { if (handle->getURL() == url) {
handle->stop(); handle->setFade(0.0f); // right away. Will be remove during updateAnimations, without locking
handle->setFadePerSecond(-1.0f); // so that the updateAnimation code notices
} }
} }
} }
@ -472,7 +474,9 @@ void Rig::updateAnimations(float deltaTime, glm::mat4 parentTransform) {
float fadeSumSoFar = 0.0f; float fadeSumSoFar = 0.0f;
foreach (const AnimationHandlePointer& handle, _runningAnimations) { foreach (const AnimationHandlePointer& handle, _runningAnimations) {
handle->setPriority(1.0f); handle->setPriority(1.0f);
float normalizedFade = handle->getFade() / fadeTotal; // if no fadeTotal, everyone's (typically just one running) is starting at zero. In that case, blend equally.
float normalizedFade = (fadeTotal != 0.0f) ? (handle->getFade() / fadeTotal) : (1.0f / _runningAnimations.count());
assert(normalizedFade != 0.0f);
// simulate() will blend each animation result into the result so far, based on the pairwise mix at at each step. // simulate() will blend each animation result into the result so far, based on the pairwise mix at at each step.
// i.e., slerp the 'mix' distance from the result so far towards this iteration's animation result. // i.e., slerp the 'mix' distance from the result so far towards this iteration's animation result.
// The formula here for mix is based on the idea that, at each step: // The formula here for mix is based on the idea that, at each step: