Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 14:16:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify boolean statements, revise several settle anims

Browse source
This commit is contained in:
dooglifeSF 2019-11-08 13:46:38 -08:00
parent 02045a9fdf
commit 055d5cdf9b
6 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/avatar/animations/settle_to_idle02.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/settle_to_idle03.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/settle_to_idle04.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/settle_to_idle_small.fbx
View file

Binary file not shown.

2
interface/resources/avatar/avatar-animation.json
View file

@ -5452,7 +5452,7 @@
"children": [ "children": [
], ],
"data": { "data": {
"endFrame": 34, "endFrame": 40,
"loopFlag": false, "loopFlag": false,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "timeScale": 1,

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

@ -1457,15 +1457,17 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos
_animVars.set("isInputBackward", false); _animVars.set("isInputBackward", false);
_animVars.set("isInputRight", false); _animVars.set("isInputRight", false);
_animVars.set("isInputLeft", false); _animVars.set("isInputLeft", false);
_animVars.set("isNotInput", true);
if (_isMovingWithMomentum) { // directly reflects input
_animVars.set("isNotInputSlow", true); _animVars.set("isNotInput", true);
_animVars.set("isNotInputNoMomentum", false);
} else { // no input + speed drops to SLOW_SPEED_THRESHOLD
_animVars.set("isNotInputSlow", false); // (don't transition run->idle - slow to walk first)
_animVars.set("isNotInputNoMomentum", true); _animVars.set("isNotInputSlow", _isMovingWithMomentum);
}
// no input + speed didn't get above HAS_MOMENTUM_THRESHOLD since last idle
// (brief inputs and movement adjustments)
_animVars.set("isNotInputNoMomentum", !_isMovingWithMomentum);
} else { } else {