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

add raypick blacklisting to hand grab script

Browse source
This commit is contained in:
James B. Pollack 2015-12-27 12:37:33 -08:00
parent 8e2a79ba4c
commit 28c53822b1
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
examples/controllers/handControllerGrab.js
View file

@ -116,6 +116,11 @@ var DEFAULT_GRABBABLE_DATA = {
invertSolidWhileHeld: false invertSolidWhileHeld: false
}; };
// sometimes we want to exclude objects from being picked
var USE_BLACKLIST = true;
var blacklist = [];
//we've created various ways of visualizing looking for and moving distant objects //we've created various ways of visualizing looking for and moving distant objects
var USE_ENTITY_LINES_FOR_SEARCHING = false; var USE_ENTITY_LINES_FOR_SEARCHING = false;
var USE_OVERLAY_LINES_FOR_SEARCHING = false; var USE_OVERLAY_LINES_FOR_SEARCHING = false;
@ -771,7 +776,14 @@ function MyController(hand) {
}) })
} }
var intersection = Entities.findRayIntersection(pickRayBacked, true); var intersection;
if(USE_BLACKLIST===true){
intersection = Entities.findRayIntersection(pickRay, true, [], blacklist);
}
else{
intersection = Entities.findRayIntersection(pickRayBacked, true);
}
if (intersection.intersects) { if (intersection.intersects) {
// the ray is intersecting something we can move. // the ray is intersecting something we can move.
@ -1626,6 +1638,7 @@ function update() {
Messages.subscribe('Hifi-Hand-Disabler'); Messages.subscribe('Hifi-Hand-Disabler');
Messages.subscribe('Hifi-Hand-Grab'); Messages.subscribe('Hifi-Hand-Grab');
Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
handleHandMessages = function(channel, message, sender) { handleHandMessages = function(channel, message, sender) {
if (sender === MyAvatar.sessionUUID) { if (sender === MyAvatar.sessionUUID) {
@ -1649,6 +1662,24 @@ handleHandMessages = function(channel, message, sender) {
} catch (e) { } } catch (e) { }
} }
else if (channel === 'Hifi-Hand-RayPick-Blacklist') {
try {
var data = JSON.parse(message);
var action = data.action;
var id = data.id;
var index = blacklist.indexOf(id);
if (action === 'add' && index ===-1) {
blacklist.push(id);
}
if (action === 'remove') {
if (index > -1) {
blacklist.splice(index, 1);
}
}
} catch (e) {}
}
} }
} }