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

simplify animation load and code

Browse source
This commit is contained in:
Howard Stearns 2017-04-29 14:39:35 -07:00 committed by Chris Collins
parent e2dd00bdc4
commit 13e10873ce
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/system/makeUserConnection.js
View file

@ -260,7 +260,20 @@
return avatar.getJointPosition(handJointIndex); return avatar.getJointPosition(handJointIndex);
} }
var animationData = {};
function shakeHandsAnimation() { function shakeHandsAnimation() {
return animationData;
}
function endHandshakeAnimation() {
if (animHandlerId) {
debug("removing animation");
animHandlerId = MyAvatar.removeAnimationStateHandler(animHandlerId);
}
}
function startHandshakeAnimation() {
endHandshakeAnimation(); // just in case order of press/unpress is broken
debug("adding animation");
// all we are doing here is moving the right hand to a spot // all we are doing here is moving the right hand to a spot
// that is in front of and a bit above the hips. Basing how // that is in front of and a bit above the hips. Basing how
// far in front as scaling with the avatar's height (say hips // far in front as scaling with the avatar's height (say hips
@ -273,7 +286,8 @@
} }
result.rightHandPosition = Vec3.multiply(offset, {x: -0.25, y: 0.8, z: 1.3}); result.rightHandPosition = Vec3.multiply(offset, {x: -0.25, y: 0.8, z: 1.3});
result.rightHandRotation = Quat.fromPitchYawRollDegrees(90, 0, 90); result.rightHandRotation = Quat.fromPitchYawRollDegrees(90, 0, 90);
return result;
animHandlerId = MyAvatar.addAnimationStateHandler(shakeHandsAnimation, []);
} }
function positionFractionallyTowards(posA, posB, frac) { function positionFractionallyTowards(posA, posB, frac) {
@ -460,12 +474,7 @@
// waiting message. Either way, they will start connecting eachother at that point. // waiting message. Either way, they will start connecting eachother at that point.
function startHandshake(fromKeyboard) { function startHandshake(fromKeyboard) {
if (fromKeyboard) { if (fromKeyboard) {
debug("adding animation"); startHandshakeAnimation();
// just in case order of press/unpress is broken
if (animHandlerId) {
animHandlerId = MyAvatar.removeAnimationStateHandler(animHandlerId);
}
animHandlerId = MyAvatar.addAnimationStateHandler(shakeHandsAnimation, []);
} }
debug("starting handshake for", currentHand); debug("starting handshake for", currentHand);
pollCount = 0; pollCount = 0;
@ -525,10 +534,7 @@
key: "done" key: "done"
}); });
if (animHandlerId) { endHandshakeAnimation();
debug("removing animation");
MyAvatar.removeAnimationStateHandler(animHandlerId);
}
// No-op if we were successful, but this way we ensure that failures and abandoned handshakes don't leave us // No-op if we were successful, but this way we ensure that failures and abandoned handshakes don't leave us
// in a weird state. // in a weird state.
request({uri: requestUrl, method: 'DELETE'}, debug); request({uri: requestUrl, method: 'DELETE'}, debug);