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

fix for clearJointData() in JS scripts

Browse source 
let the JointState class verify animation priority
This commit is contained in:
Andrew Meadows 2014-08-25 10:40:28 -07:00
parent 3fbbeecb8c
commit 6cdee21a50
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/renderer/Model.cpp
View file

@ -708,12 +708,10 @@ void Model::clearJointAnimationPriority(int index) {
void Model::setJointState(int index, bool valid, const glm::quat& rotation, float priority) { void Model::setJointState(int index, bool valid, const glm::quat& rotation, float priority) {
if (index != -1 && index < _jointStates.size()) { if (index != -1 && index < _jointStates.size()) {
JointState& state = _jointStates[index]; JointState& state = _jointStates[index];
if (priority >= state._animationPriority) { if (valid) {
if (valid) { state.setRotationInConstrainedFrame(rotation, priority);
state.setRotationInConstrainedFrame(rotation, priority); } else {
} else { state.restoreRotation(1.0f, priority);
state.restoreRotation(1.0f, priority);
}
} }
} }
} }