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

fix that

Browse source
This commit is contained in:
Howard Stearns 2017-04-29 15:50:04 -07:00
parent d7a2e571a7
commit 9c83e21e17
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/system/makeUserConnection.js
View file

@ -261,6 +261,19 @@
} }
var animationData = {}; var animationData = {};
function updateAnimationData() {
// 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
// far in front as scaling with the avatar's height (say hips
// to head distance)
var headIndex = MyAvatar.getJointIndex("Head");
var offset = 0.5; // default distance of hand in front of you
if (headIndex) {
offset = 0.8 * MyAvatar.getAbsoluteJointTranslationInObjectFrame(headIndex).y;
}
animationData.rightHandPosition = Vec3.multiply(offset, {x: -0.25, y: 0.8, z: 1.3});
animationData.rightHandRotation = Quat.fromPitchYawRollDegrees(90, 0, 90);
}
function shakeHandsAnimation() { function shakeHandsAnimation() {
return animationData; return animationData;
} }
@ -273,20 +286,7 @@
function startHandshakeAnimation() { function startHandshakeAnimation() {
endHandshakeAnimation(); // just in case order of press/unpress is broken endHandshakeAnimation(); // just in case order of press/unpress is broken
debug("adding animation"); debug("adding animation");
updateAnimationData();
// 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
// far in front as scaling with the avatar's height (say hips
// to head distance)
var headIndex = MyAvatar.getJointIndex("Head");
var offset = 0.5; // default distance of hand in front of you
var result = {};
if (headIndex) {
offset = 0.8 * MyAvatar.getAbsoluteJointTranslationInObjectFrame(headIndex).y;
}
result.rightHandPosition = Vec3.multiply(offset, {x: -0.25, y: 0.8, z: 1.3});
result.rightHandRotation = Quat.fromPitchYawRollDegrees(90, 0, 90);
animHandlerId = MyAvatar.addAnimationStateHandler(shakeHandsAnimation, []); animHandlerId = MyAvatar.addAnimationStateHandler(shakeHandsAnimation, []);
} }