Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android - Display Names - Use my avatar uuid directly when finding ray intersection

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-05-14 15:26:57 -03:00
parent aaa6038d28
commit e7abf3c7be
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/system/+android/displayNames.js
View file

@ -21,7 +21,6 @@ var TEXT_MARGIN = 0.025;
var HIDE_MS = 10000;
var currentTouchToAnalyze = null;
var rayExclusionList = []; // Updated at sessionUUID changes
var currentlyShownAvatar = {
avatarID: null,
@ -113,7 +112,7 @@ function touchEnd(event) {
}
var pickRay = Camera.computePickRay(event.x, event.y);
var avatarRay = AvatarManager.findRayIntersection(pickRay, [], rayExclusionList);
var avatarRay = AvatarManager.findRayIntersection(pickRay, [], [MyAvatar.sessionUUID])
if (avatarRay.intersects) {
touchedAvatar(avatarRay.avatarID, AvatarManager.getAvatar(avatarRay.avatarID));
@ -124,10 +123,6 @@ function touchEnd(event) {
currentTouchToAnalyze = null;
}
function excludeMyAvatar() {
rayExclusionList = [MyAvatar.sessionUUID];
}
var runAtLeastOnce = false;
function ending() {
@ -147,8 +142,6 @@ function ending() {
if (currentlyShownAvatar.avatar) {
currentlyShownAvatar.avatar = null;
}
MyAvatar.sessionUUIDChanged.disconnect(excludeMyAvatar);
}
function init() {
@ -161,9 +154,6 @@ function init() {
ending();
});
rayExclusionList = [MyAvatar.sessionUUID];
MyAvatar.sessionUUIDChanged.connect(excludeMyAvatar);
runAtLeastOnce = true;
}