From 2556b4790b8d37c93355337e3b020348a9020773 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 27 Jan 2015 11:28:20 -0800 Subject: [PATCH 1/2] Update inspect.js to not activate if camera is in independent mode --- examples/inspect.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/inspect.js b/examples/inspect.js index ff0925db97..d730a7e53f 100644 --- a/examples/inspect.js +++ b/examples/inspect.js @@ -158,6 +158,11 @@ function handleModes() { avatarOrientation.w != MyAvatar.orientation.w)) { newMode = noMode; } + + if (mode == noMode && newMode != noMode && Camera.mode == "independent") { + newMode = noMode; + } + // if leaving noMode if (mode == noMode && newMode != noMode) { saveCameraState(); From 80002551f92332bcf7c99b214da4c6c1c56f165b Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 27 Jan 2015 11:28:39 -0800 Subject: [PATCH 2/2] Update editEntities camera to not enable if camera is in independent mode --- examples/libraries/entityCameraTool.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/libraries/entityCameraTool.js b/examples/libraries/entityCameraTool.js index b9170dc25d..f5095bb149 100644 --- a/examples/libraries/entityCameraTool.js +++ b/examples/libraries/entityCameraTool.js @@ -80,7 +80,8 @@ CameraManager = function() { that.lastMousePosition = { x: 0, y: 0 }; that.enable = function() { - if (that.enabled) return; + if (Camera.mode == "independent" || that.enabled) return; + that.enabled = true; that.mode = MODE_INACTIVE;