wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Speed up animation transition

Browse source
This commit is contained in:
Vsevolod Kremianskii 2021-05-25 13:02:02 +07:00
parent 953e6946c5
commit 54f4b00579
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/engine/scene/node/modelnode_animation.cpp
View file

@ -32,6 +32,8 @@ namespace reone {
namespace scene {
static constexpr float kTransitionLength = 0.25f;
void ModelSceneNode::playAnimation(const string &name, AnimationProperties properties) {
shared_ptr<Animation> anim(_model->getAnimation(name));
if (anim) {
@ -67,7 +69,10 @@ void ModelSceneNode::playAnimation(shared_ptr<Animation> anim, shared_ptr<LipAni
}
// Add animation on top
_animChannels.push_front(AnimationChannel(anim, lipAnim, properties));
_animChannels[0].transition = transition;
if (transition) {
_animChannels[0].transition = true;
_animChannels[0].time = glm::max(0.0f, _animChannels[0].anim->transitionTime() - kTransitionLength);
}
while (_animChannels.size() > 2ll) {
_animChannels.pop_back();
}