From 15394056ebdfa7871fa4ad22d990bb4cf04d079b Mon Sep 17 00:00:00 2001 From: humbletim Date: Fri, 20 Jan 2017 22:27:43 -0500 Subject: [PATCH 1/2] * add isInEditMode to utils.js * update grab.js to use the latest Settings edit mode detection approach * add edit guards to handControllerGrab.js and grab.js * update edit.js to consistently initialize Setting's edit flag --- scripts/system/controllers/grab.js | 25 +------------------ .../system/controllers/handControllerGrab.js | 7 +++--- scripts/system/edit.js | 3 +-- scripts/system/libraries/utils.js | 6 +++++ 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/scripts/system/controllers/grab.js b/scripts/system/controllers/grab.js index 3ce44c2672..38a07c469d 100644 --- a/scripts/system/controllers/grab.js +++ b/scripts/system/controllers/grab.js @@ -45,8 +45,6 @@ var DEFAULT_GRABBABLE_DATA = { var ACTION_TTL = 10; // seconds -var enabled = true; - function getTag() { return "grab-" + MyAvatar.sessionUUID; } @@ -321,7 +319,7 @@ Grabber.prototype.computeNewGrabPlane = function() { } Grabber.prototype.pressEvent = function(event) { - if (!enabled) { + if (isInEditMode()) { return; } @@ -633,31 +631,10 @@ function keyReleaseEvent(event) { grabber.keyReleaseEvent(event); } -function editEvent(channel, message, sender, localOnly) { - if (channel != "edit-events") { - return; - } - if (sender != MyAvatar.sessionUUID) { - return; - } - if (!localOnly) { - return; - } - try { - var data = JSON.parse(message); - if ("enabled" in data) { - enabled = !data["enabled"]; - } - } catch(e) { - } -} - Controller.mousePressEvent.connect(pressEvent); Controller.mouseMoveEvent.connect(moveEvent); Controller.mouseReleaseEvent.connect(releaseEvent); Controller.keyPressEvent.connect(keyPressEvent); Controller.keyReleaseEvent.connect(keyReleaseEvent); -Messages.subscribe("edit-events"); -Messages.messageReceived.connect(editEvent); }()); // END LOCAL_SCOPE diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index 57698bd0dc..51dd40fe4d 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -493,11 +493,9 @@ function removeMyAvatarFromCollidesWith(origCollidesWith) { // If another script is managing the reticle (as is done by HandControllerPointer), we should not be setting it here, // and we should not be showing lasers when someone else is using the Reticle to indicate a 2D minor mode. var EXTERNALLY_MANAGED_2D_MINOR_MODE = true; -var EDIT_SETTING = "io.highfidelity.isEditting"; function isEditing() { - var actualSettingValue = Settings.getValue(EDIT_SETTING) === "false" ? false : !!Settings.getValue(EDIT_SETTING); - return EXTERNALLY_MANAGED_2D_MINOR_MODE && actualSettingValue; + return EXTERNALLY_MANAGED_2D_MINOR_MODE && isInEditMode(); } function isIn2DMode() { @@ -844,6 +842,9 @@ function MyController(hand) { }; this.callEntityMethodOnGrabbed = function(entityMethodName) { + if (isInEditMode()) { + return; + } var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; Entities.callEntityMethod(this.grabbedEntity, entityMethodName, args); }; diff --git a/scripts/system/edit.js b/scripts/system/edit.js index afcfd50bb8..ad04c8b139 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -429,7 +429,6 @@ var toolBar = (function () { }); }); - that.setActive(false); } @@ -446,6 +445,7 @@ var toolBar = (function () { }; that.setActive = function (active) { + Settings.setValue(EDIT_SETTING, active); if (active === isActive) { return; } @@ -457,7 +457,6 @@ var toolBar = (function () { enabled: active })); isActive = active; - Settings.setValue(EDIT_SETTING, active); if (!isActive) { entityListTool.setVisible(false); gridTool.setVisible(false); diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js index 9bd29d663a..2e490e5c30 100644 --- a/scripts/system/libraries/utils.js +++ b/scripts/system/libraries/utils.js @@ -6,6 +6,12 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +// note: this constant is currently duplicated in edit.js +EDIT_SETTING = "io.highfidelity.isEditting"; +isInEditMode = function isInEditMode() { + return Settings.getValue(EDIT_SETTING) === "false" ? false : !!Settings.getValue(EDIT_SETTING); +}; + if (!Function.prototype.bind) { Function.prototype.bind = function(oThis) { if (typeof this !== 'function') { From d20ac20ff2cf2256dd860e16c068c01f0f0f2ace Mon Sep 17 00:00:00 2001 From: humbletim Date: Mon, 23 Jan 2017 01:31:11 -0500 Subject: [PATCH 2/2] move isInEditMode guard to setState --- scripts/system/controllers/handControllerGrab.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index 51dd40fe4d..6608b9cc92 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -842,14 +842,14 @@ function MyController(hand) { }; this.callEntityMethodOnGrabbed = function(entityMethodName) { - if (isInEditMode()) { - return; - } var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; Entities.callEntityMethod(this.grabbedEntity, entityMethodName, args); }; this.setState = function(newState, reason) { + if (isInEditMode() && newState !== STATE_OFF && newState !== STATE_SEARCHING) { + return; + } setGrabCommunications((newState === STATE_DISTANCE_HOLDING) || (newState === STATE_NEAR_GRABBING)); if (WANT_DEBUG || WANT_DEBUG_STATE) { var oldStateName = stateToName(this.state);