From 5de0970365c06bc06217c850825cb58b72421bd3 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 20 Jul 2017 14:17:52 -0700 Subject: [PATCH] put back ignoredEntities functionality in teleport --- scripts/system/controllers/teleport.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/system/controllers/teleport.js b/scripts/system/controllers/teleport.js index eaeb7767ac..fc22d21089 100644 --- a/scripts/system/controllers/teleport.js +++ b/scripts/system/controllers/teleport.js @@ -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(); } } }