Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 16:13:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplified avatar touch code + Fix Typo + Add my avatar to the exclusion list + Explain mouse events

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-05-11 21:27:42 -03:00
parent e3d7d65186
commit d39f7f7a58
1 changed files with 12 additions and 28 deletions

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

@ -20,8 +20,8 @@ var TEXT_MARGIN = 0.025;
var HIDE_MS = 10000;
var currentTouchToAnalize = null;
var rayExclusionList = [];
var currentTouchToAnalyze = null;
var rayExclusionList = []; // Updated at sessionUUID changes
var currentlyShownAvatar = {
avatarID: null,
@ -102,47 +102,26 @@ function touchedAvatar(avatarID, avatarData) {
}
function touchBegin(event) {
var pickRay = Camera.computePickRay(event.x, event.y);
var avatarRay = AvatarManager.findRayIntersection(pickRay, [], rayExclusionList);
if (avatarRay.intersects) {
currentTouchToAnalize = {
touchBegin: event,
avatarRay: avatarRay
};
printd("[AVATARNAME] touchBegin intersection " + JSON.stringify(currentTouchToAnalize));
} else {
printd("[AVATARNAME] touchBegin no intersection");
}
currentTouchToAnalyze = event;
}
function touchEnd(event) {
if (!currentTouchToAnalize) {
printd("[AVATARNAME] touchEnd no current touch");
currentTouchToAnalize = null;
return;
}
// manage touches only if begin an end do:
// - touch/release the same avatar
// - minimal distance (so no apparent movent was intended but a touch/click)
// - (hold or short click don't matter)
if (Vec3.distance({x: event.x, y: event.y }, {x: currentTouchToAnalize.touchBegin.x, y: currentTouchToAnalize.touchBegin.y}) > MAX_DISTANCE_PX) {
if (Vec3.distance({x: event.x, y: event.y }, {x: currentTouchToAnalyze.x, y: currentTouchToAnalyze.y}) > MAX_DISTANCE_PX) {
printd("[AVATARNAME] touchEnd moved too much");
currentTouchToAnalize = null;
currentTouchToAnalyze = null;
return;
}
var pickRay = Camera.computePickRay(event.x, event.y);
var avatarRay = AvatarManager.findRayIntersection(pickRay, [], rayExclusionList);
if (avatarRay.intersects && avatarRay.avatarID == currentTouchToAnalize.avatarRay.avatarID) {
if (avatarRay.intersects) {
touchedAvatar(avatarRay.avatarID, AvatarManager.getAvatar(avatarRay.avatarID));
} else {
printd("[AVATARNAME] touchEnd released outside the avatar");
}
currentTouchToAnalize = null;
currentTouchToAnalyze = null;
}
function ending() {
@ -169,6 +148,11 @@ function init() {
Script.scriptEnding.connect(function () {
ending();
});
rayExclusionList = [MyAvatar.sessionUUID];
MyAvatar.sessionUUIDChanged.connect(function() {
rayExclusionList = [MyAvatar.sessionUUID];
});
}
init();