Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 14:42:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove extra joint search

Browse source
This commit is contained in:
Howard Stearns 2017-04-30 14:19:33 -07:00
parent 292065a918
commit bc9049cb42
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/system/makeUserConnection.js
View file

@ -399,14 +399,12 @@
}
}
function isNearby(id, handString) {
function isNearby() {
if (currentHand) {
var handPosition = getHandPosition(MyAvatar, currentHandJointIndex);
var avatar = AvatarList.getAvatar(id);
var avatar = AvatarList.getAvatar(connectingId);
if (avatar) {
var otherHand = stringToHand(handString);
var otherHandJointIndex = getIdealHandJointIndex(avatar, otherHand);
var distance = Vec3.distance(getHandPosition(avatar, otherHandJointIndex), handPosition);
var distance = Vec3.distance(getHandPosition(avatar, connectingHandJointIndex), handPosition);
return (distance < MAX_AVATAR_DISTANCE);
}
}
@ -728,7 +726,7 @@
if (state !== STATES.CONNECTING) {
debug("stopping connecting interval, state changed");
stopConnecting();
} else if (!isNearby(id, handString)) {
} else if (!isNearby()) {
// gotta go back to waiting
debug(id, "moved, back to waiting");
stopConnecting();
@ -800,9 +798,8 @@
delete waitingList[senderID];
if (state === STATES.WAITING && (!connectingId || connectingId === senderID)) {
if (message.id === MyAvatar.sessionUUID) {
setupConnecting(senderID, message[HAND_STRING_PROPERTY]);
stopWaiting();
startConnecting(senderID, connectingHandString);
startConnecting(senderID, message[HAND_STRING_PROPERTY]);
} else if (connectingId) {
// this is for someone else (we lost race in connectionRequest),
// so lets start over