Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 04:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

put back ignoredEntities functionality in teleport

Browse source
This commit is contained in:
SamGondelman 2017-07-20 14:17:52 -07:00
parent c7f0f03fce
commit 5de0970365
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/system/controllers/teleport.js
View file

@ -516,6 +516,15 @@ function cleanup() {
}
Script.scriptEnding.connect(cleanup);
var setIgnoredEntities = function () {
LaserPointers.setIgnoredEntities(teleporter.teleportRayRightVisible, ignoredEntities);
LaserPointers.setIgnoredEntities(teleporter.teleportRayRightInvisible, ignoredEntities);
LaserPointers.setIgnoredEntities(teleporter.teleportRayLeftVisible, ignoredEntities);
LaserPointers.setIgnoredEntities(teleporter.teleportRayLeftInvisible, ignoredEntities);
LaserPointers.setIgnoredEntities(teleporter.teleportRayHeadVisible, ignoredEntities);
LaserPointers.setIgnoredEntities(teleporter.teleportRayHeadInvisible, ignoredEntities);
}
var isDisabled = false;
var handleTeleportMessages = function(channel, message, sender) {
if (sender === MyAvatar.sessionUUID) {
@ -533,13 +542,13 @@ var handleTeleportMessages = function(channel, message, sender) {
isDisabled = false;
}
} else if (channel === 'Hifi-Teleport-Ignore-Add' && !Uuid.isNull(message) && ignoredEntities.indexOf(message) === -1) {
// TODO:
// add ability to ignore entities to LaserPointers
ignoredEntities.push(message);
setIgnoredEntities();
} else if (channel === 'Hifi-Teleport-Ignore-Remove' && !Uuid.isNull(message)) {
var removeIndex = ignoredEntities.indexOf(message);
if (removeIndex > -1) {
ignoredEntities.splice(removeIndex, 1);
setIgnoredEntities();
}
}
}