From 6157f4fa55c4c1ce82657aced2c3bd75982bc283 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Wed, 9 Aug 2017 11:56:25 -0700 Subject: [PATCH] script fixes --- scripts/system/controllers/handControllerGrab.js | 1 + scripts/system/controllers/handControllerPointer.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index dccf8e890b..44f79a5570 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -3442,6 +3442,7 @@ function MyController(hand) { }; this.offEnter = function() { + var existingSearchDistance = this.searchSphereDistance; this.release(); if (hoveredEntityID) { diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index f169204206..538fe0b1e4 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -160,7 +160,7 @@ var systemLaserOn = false; var triggerPath = { type: "line3d", - color: LASER_SEARCH_COLOR, + color: LASER_TRIGGER_COLOR, ignoreRayIntersection: true, visible: true, alpha: LASER_ALPHA, @@ -171,7 +171,7 @@ var triggerPath = { var triggerEnd = { type: "sphere", dimensions: {x: END_DIAMETER, y: END_DIAMETER, z: END_DIAMETER}, - color: LASER_SEARCH_COLOR, + color: LASER_TRIGGER_COLOR, ignoreRayIntersection: true, visible: true, alpha: LASER_ALPHA, @@ -181,7 +181,7 @@ var triggerEnd = { var searchPath = { type: "line3d", - color: LASER_TRIGGER_COLOR, + color: LASER_SEARCH_COLOR, ignoreRayIntersection: true, visible: true, alpha: LASER_ALPHA, @@ -192,7 +192,7 @@ var searchPath = { var searchEnd = { type: "sphere", dimensions: {x: END_DIAMETER, y: END_DIAMETER, z: END_DIAMETER}, - color: LASER_TRIGGER_COLOR, + color: LASER_SEARCH_COLOR, ignoreRayIntersection: true, visible: true, alpha: LASER_ALPHA,