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

Merge pull request #4171 from Atlante45/hydra_grab_fix

Browse source 
Hydra grab fix
This commit is contained in:
Philip Rosedale 2015-01-26 19:48:30 -08:00
commit 4c10f6f23b
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/controllers/hydra/squeezeHands.js
View file

@ -60,11 +60,9 @@ Script.update.connect(function(deltaTime) {
} }
if ((leftFrame != lastLeftFrame) && leftHandAnimation.length){ if ((leftFrame != lastLeftFrame) && leftHandAnimation.length){
MyAvatar.stopAnimation(leftHandAnimation);
MyAvatar.startAnimation(leftHandAnimation, 30.0, 1.0, false, true, leftFrame, leftFrame); MyAvatar.startAnimation(leftHandAnimation, 30.0, 1.0, false, true, leftFrame, leftFrame);
} }
if ((rightFrame != lastRightFrame) && rightHandAnimation.length) { if ((rightFrame != lastRightFrame) && rightHandAnimation.length) {
MyAvatar.stopAnimation(rightHandAnimation);
MyAvatar.startAnimation(rightHandAnimation, 30.0, 1.0, false, true, rightFrame, rightFrame); MyAvatar.startAnimation(rightHandAnimation, 30.0, 1.0, false, true, rightFrame, rightFrame);
} }

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;