From fc977e21e60ce872d8434cae1a20493dc8706b6a Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 4 Nov 2014 09:14:14 -0800 Subject: [PATCH 1/3] Remove print statements --- examples/libraries/entityCameraTool.js | 1 - examples/newEditEntities.js | 1 - 2 files changed, 2 deletions(-) diff --git a/examples/libraries/entityCameraTool.js b/examples/libraries/entityCameraTool.js index 2f03cb28c8..c9757bde7d 100644 --- a/examples/libraries/entityCameraTool.js +++ b/examples/libraries/entityCameraTool.js @@ -339,7 +339,6 @@ CameraManager = function() { // Last mode that was first or third person var lastAvatarCameraMode = "first person"; Camera.modeUpdated.connect(function(newMode) { - print("Camera mode has been updated: " + newMode); if (newMode == "first person" || newMode == "third person") { lastAvatarCameraMode = newMode; that.disable(true); diff --git a/examples/newEditEntities.js b/examples/newEditEntities.js index ea1f69e15f..92c4b36a0b 100644 --- a/examples/newEditEntities.js +++ b/examples/newEditEntities.js @@ -820,7 +820,6 @@ function applyEntityProperties(data) { var properties = data.createEntities[i].properties; var newEntityID = Entities.addEntity(properties); DELETED_ENTITY_MAP[entityID.id] = newEntityID; - print(newEntityID.isKnownID); if (data.selectCreated) { selectedEntityIDs.push(newEntityID); } From 573e6f119f13912b75d87fde5bd259d841024d7c Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 4 Nov 2014 10:06:17 -0800 Subject: [PATCH 2/3] Add entity camera options to settings --- examples/newEditEntities.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/newEditEntities.js b/examples/newEditEntities.js index 92c4b36a0b..fd956fc95a 100644 --- a/examples/newEditEntities.js +++ b/examples/newEditEntities.js @@ -51,8 +51,11 @@ var wantEntityGlow = false; var SPAWN_DISTANCE = 1; var DEFAULT_DIMENSION = 0.20; -var MENU_INSPECT_TOOL_ENABLED = 'Inspect Tool'; -var MENU_EASE_ON_FOCUS = 'Ease Orientation on Focus'; +var MENU_INSPECT_TOOL_ENABLED = "Inspect Tool"; +var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus"; + +var SETTING_INSPECT_TOOL_ENABLED = "inspectToolEnabled"; +var SETTING_EASE_ON_FOCUS = "cameraEaseOnFocus"; var modelURLs = [ HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX", @@ -590,8 +593,10 @@ function setupModelMenus() { Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" }); Menu.addMenuItem({ menuName: "Developer", menuItemName: "Debug Ryans Rotation Problems", isCheckable: true }); - Menu.addMenuItem({ menuName: "View", menuItemName: MENU_INSPECT_TOOL_ENABLED, afterItem: "Edit Entities Help...", isCheckable: true }); - Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED, isCheckable: true }); + Menu.addMenuItem({ menuName: "View", menuItemName: MENU_INSPECT_TOOL_ENABLED, afterItem: "Edit Entities Help...", + isCheckable: true, isChecked: Settings.getValue(SETTING_INSPECT_TOOL_ENABLED) == "true" }); + Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED, + isCheckable: true, isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true" }); } setupModelMenus(); // do this when first running our script. @@ -619,6 +624,9 @@ function cleanupModelMenus() { } Script.scriptEnding.connect(function() { + Settings.setValue(SETTING_INSPECT_TOOL_ENABLED, Menu.isOptionChecked(MENU_INSPECT_TOOL_ENABLED)); + Settings.setValue(SETTING_EASE_ON_FOCUS, Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); + progressDialog.cleanup(); toolBar.cleanup(); cleanupModelMenus(); From 2e8e31fce93d15a93b1c6aa09f361f2b84787037 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 4 Nov 2014 10:06:45 -0800 Subject: [PATCH 3/3] Update inspect tool behavior to pan correctly --- examples/newEditEntities.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/newEditEntities.js b/examples/newEditEntities.js index fd956fc95a..575541e9f0 100644 --- a/examples/newEditEntities.js +++ b/examples/newEditEntities.js @@ -500,10 +500,14 @@ function mousePressEvent(event) { } } else if (Menu.isOptionChecked(MENU_INSPECT_TOOL_ENABLED)) { var result = findClickedEntity(event); - if (result !== null && event.isRightButton) { - var currentProperties = Entities.getEntityProperties(result.entityID); - cameraManager.enable(); - cameraManager.focus(currentProperties.position, null, Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); + if (event.isRightButton) { + if (result !== null) { + var currentProperties = Entities.getEntityProperties(result.entityID); + cameraManager.enable(); + cameraManager.focus(currentProperties.position, null, Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); + cameraManager.mousePressEvent(event); + } + } else { cameraManager.mousePressEvent(event); } }