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

Fixes for away.js

Browse source
This commit is contained in:
Anthony J. Thibault 2016-02-02 12:08:52 -08:00
parent c4e1509aa2
commit 656608e2ff
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/meshes/defaultAvatar_full/avatar-animation.json
View file

@ -377,6 +377,7 @@
"interpTarget": 30, "interpTarget": 30,
"interpDuration": 30, "interpDuration": 30,
"transitions": [ "transitions": [
{ "var": "isNotAway", "state": "awayOutro" },
{ "var": "awayIntroOnDone", "state": "away"} { "var": "awayIntroOnDone", "state": "away"}
] ]
}, },

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

@ -784,11 +784,14 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos
t += deltaTime; t += deltaTime;
if (_enableInverseKinematics) { if (_enableInverseKinematics != _lastEnableInverseKinematics) {
_animVars.set("ikOverlayAlpha", 1.0f); if (_enableInverseKinematics) {
} else { _animVars.set("ikOverlayAlpha", 1.0f);
_animVars.set("ikOverlayAlpha", 0.0f); } else {
_animVars.set("ikOverlayAlpha", 0.0f);
}
} }
_lastEnableInverseKinematics = _enableInverseKinematics;
} }
_lastFront = front; _lastFront = front;

1
libraries/animation/src/Rig.h
View file

@ -301,6 +301,7 @@ public:
std::map<QString, AnimNode::Pointer> _origRoleAnimations; std::map<QString, AnimNode::Pointer> _origRoleAnimations;
std::vector<AnimNode::Pointer> _prefetchedAnimations; std::vector<AnimNode::Pointer> _prefetchedAnimations;
bool _lastEnableInverseKinematics { false };
bool _enableInverseKinematics { true }; bool _enableInverseKinematics { true };
private: private: