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

Restore joints state on stopAnimation

Browse source
This commit is contained in:
Atlante45 2015-01-26 19:12:18 -08:00
parent 2108cac38e
commit f84f6e9b66
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/render-utils/src/AnimationHandle.cpp
View file

@ -74,6 +74,7 @@ void AnimationHandle::setRunning(bool running) {
} }
} else { } else {
_model->_runningAnimations.removeOne(_self); _model->_runningAnimations.removeOne(_self);
restoreJoints();
replaceMatchingPriorities(0.0f); replaceMatchingPriorities(0.0f);
} }
emit runningChanged(isRunning()); emit runningChanged(isRunning());
@ -173,3 +174,13 @@ void AnimationHandle::replaceMatchingPriorities(float newPriority) {
} }
} }
void AnimationHandle::restoreJoints() {
for (int i = 0; i < _jointMappings.size(); i++) {
int mapping = _jointMappings.at(i);
if (mapping != -1) {
JointState& state = _model->_jointStates[mapping];
state.restoreRotation(1.0f, state._animationPriority);
}
}
}

1
libraries/render-utils/src/AnimationHandle.h
View file

@ -92,6 +92,7 @@ private:
void simulate(float deltaTime); void simulate(float deltaTime);
void applyFrame(float frameIndex); void applyFrame(float frameIndex);
void replaceMatchingPriorities(float newPriority); void replaceMatchingPriorities(float newPriority);
void restoreJoints();
Model* _model; Model* _model;
WeakAnimationHandlePointer _self; WeakAnimationHandlePointer _self;