From 6e8267999754d846aa446c4c4807a6416695071d Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 2 Feb 2015 11:19:11 -0800 Subject: [PATCH 01/13] Permanently re-enable audio selection on Windows --- interface/src/Audio.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 2bc5aa5023..6dd9b7985c 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -134,23 +134,13 @@ void Audio::audioMixerKilled() { QAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) { QAudioDeviceInfo result; -// Temporarily enable audio device selection in Windows again to test how it behaves now -//#ifdef WIN32 -#if FALSE - // NOTE - // this is a workaround for a windows only QtBug https://bugreports.qt-project.org/browse/QTBUG-16117 - // static QAudioDeviceInfo objects get deallocated when QList objects go out of scope - result = (mode == QAudio::AudioInput) ? - QAudioDeviceInfo::defaultInputDevice() : - QAudioDeviceInfo::defaultOutputDevice(); -#else foreach(QAudioDeviceInfo audioDevice, QAudioDeviceInfo::availableDevices(mode)) { if (audioDevice.deviceName().trimmed() == deviceName.trimmed()) { result = audioDevice; break; } } -#endif + return result; } From ee49ce08cb8bae9a180795dc2cf299654db11621 Mon Sep 17 00:00:00 2001 From: Chris Collins Date: Wed, 4 Feb 2015 09:53:38 -0800 Subject: [PATCH 02/13] Added the script look with mouse to default script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Look with touch does not work on PC’s or any mouse that does not accept two finger touch. I have therefore added look with mouse to default scripts. --- examples/defaultScripts.js | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/defaultScripts.js b/examples/defaultScripts.js index ea13694f0c..65682deb74 100644 --- a/examples/defaultScripts.js +++ b/examples/defaultScripts.js @@ -17,3 +17,4 @@ Script.load("headMove.js"); Script.load("inspect.js"); Script.load("lobby.js"); Script.load("notifications.js"); +Script.load("lookWithMouse.js") From a2002d169f5a1807c20417c9d777ed3d7f4889ab Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 4 Feb 2015 10:27:33 -0800 Subject: [PATCH 03/13] fix for exception handled lookup in LimitedNodeList --- libraries/networking/src/LimitedNodeList.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 4957084279..06b3b6a0db 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -412,25 +412,27 @@ void LimitedNodeList::handleNodeKill(const SharedNodePointer& node) { SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t nodeType, const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket) { - try { - SharedNodePointer matchingNode = _nodeHash.at(uuid); + NodeHash::const_iterator it = _nodeHash.find(uuid); + + if (it != _nodeHash.end()) { + SharedNodePointer& matchingNode = it->second; matchingNode->setPublicSocket(publicSocket); matchingNode->setLocalSocket(localSocket); return matchingNode; - } catch (std::out_of_range) { + } else { // we didn't have this node, so add them Node* newNode = new Node(uuid, nodeType, publicSocket, localSocket); - SharedNodePointer newNodeSharedPointer(newNode, &QObject::deleteLater); + SharedNodePointer newNodePointer(newNode); - _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodeSharedPointer)); + _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodePointer)); qDebug() << "Added" << *newNode; - emit nodeAdded(newNodeSharedPointer); + emit nodeAdded(newNodePointer); - return newNodeSharedPointer; + return newNodePointer; } } From 01a00b51278a3666d76e2703e65e5337afad855f Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 10:40:50 -0800 Subject: [PATCH 04/13] Disable editEntities always-on --- examples/editEntities.js | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/examples/editEntities.js b/examples/editEntities.js index 3a70d2020e..3686134a88 100644 --- a/examples/editEntities.js +++ b/examples/editEntities.js @@ -46,28 +46,8 @@ gridTool.setVisible(false); var entityListTool = EntityListTool(); -var hasShownPropertiesTool = false; - -var entityListVisible = false; - selectionManager.addEventListener(function() { selectionDisplay.updateHandles(); - if (selectionManager.hasSelection() && !hasShownPropertiesTool) { - // Open properties and model list, but force selection of model list tab - propertiesTool.setVisible(false); - entityListTool.setVisible(false); - gridTool.setVisible(false); - propertiesTool.setVisible(true); - entityListTool.setVisible(true); - gridTool.setVisible(true); - Window.setFocus(); - hasShownPropertiesTool = true; - } - if (!selectionManager.hasSelection()) { - toolBar.setActive(false); - } else { - toolBar.setActive(true); - } }); var windowDimensions = Controller.getViewportDimensions(); From 4fbc7a5dcdd13079ed7ab7cdc4299a9f26c82a61 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 10:42:01 -0800 Subject: [PATCH 05/13] Add focus easing and auto-focus to menu and settings --- examples/editEntities.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/examples/editEntities.js b/examples/editEntities.js index 3686134a88..4cc317e8b6 100644 --- a/examples/editEntities.js +++ b/examples/editEntities.js @@ -74,9 +74,11 @@ var DEFAULT_DIMENSIONS = { }; var MENU_INSPECT_TOOL_ENABLED = "Inspect Tool"; +var MENU_AUTO_FOCUS_ON_SELECT = "Auto Focus on Select"; var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus"; var SETTING_INSPECT_TOOL_ENABLED = "inspectToolEnabled"; +var SETTING_AUTO_FOCUS_ON_SELECT = "autoFocusOnSelect"; var SETTING_EASE_ON_FOCUS = "cameraEaseOnFocus"; var modelURLs = [ @@ -515,7 +517,7 @@ function mousePressEvent(event) { if (result !== null) { var currentProperties = Entities.getEntityProperties(result.entityID); cameraManager.enable(); - cameraManager.focus(currentProperties.position, null, true); + cameraManager.focus(currentProperties.position, null, Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); cameraManager.mousePressEvent(event); } } else { @@ -661,9 +663,11 @@ function mouseClickEvent(event) { print("Model selected: " + foundEntity.id); selectionDisplay.select(selectedEntityID, event); - cameraManager.focus(selectionManager.worldPosition, - selectionManager.worldDimensions, - true); + if (Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)) { + cameraManager.focus(selectionManager.worldPosition, + selectionManager.worldDimensions, + Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); + } } } } @@ -705,7 +709,9 @@ function setupModelMenus() { Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" }); - Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED, + Menu.addMenuItem({ menuName: "View", menuItemName: MENU_AUTO_FOCUS_ON_SELECT, afterItem: MENU_INSPECT_TOOL_ENABLED, + isCheckable: true, isChecked: Settings.getValue(SETTING_AUTO_FOCUS_ON_SELECT) == "true" }); + Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_AUTO_FOCUS_ON_SELECT, isCheckable: true, isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true" }); Entities.setLightsArePickable(false); @@ -731,11 +737,12 @@ function cleanupModelMenus() { Menu.removeMenuItem("File", "Import Models"); Menu.removeMenuItem("View", MENU_INSPECT_TOOL_ENABLED); + Menu.removeMenuItem("View", MENU_AUTO_FOCUS_ON_SELECT); Menu.removeMenuItem("View", MENU_EASE_ON_FOCUS); } Script.scriptEnding.connect(function() { - Settings.setValue(SETTING_INSPECT_TOOL_ENABLED, Menu.isOptionChecked(MENU_INSPECT_TOOL_ENABLED)); + Settings.setValue(SETTING_AUTO_FOCUS_ON_SELECT, Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)); Settings.setValue(SETTING_EASE_ON_FOCUS, Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); progressDialog.cleanup(); From 09752589b83a166b4bff8e9e72ec31de53e125b5 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 10:43:28 -0800 Subject: [PATCH 06/13] Reenable on/off button --- examples/editEntities.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/editEntities.js b/examples/editEntities.js index 4cc317e8b6..9c4c9a5776 100644 --- a/examples/editEntities.js +++ b/examples/editEntities.js @@ -120,10 +120,9 @@ var toolBar = (function () { // Hide active button for now - this may come back, so not deleting yet. activeButton = toolBar.addTool({ imageURL: toolIconUrl + "models-tool.svg", - // subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, - subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: 0, height: 0 }, - width: 0,//toolWidth, - height: 0,//toolHeight, + subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, + width: toolWidth, + height: toolHeight, alpha: 0.9, visible: true }, true, false); @@ -235,7 +234,10 @@ var toolBar = (function () { } else { hasShownPropertiesTool = false; cameraManager.enable(); - grid.setEnabled(true); + entityListTool.setVisible(true); + gridTool.setVisible(true); + propertiesTool.setVisible(true); + Window.setFocus(); } } toolBar.selectTool(activeButton, active); From 36238bb5dfb30873c623da0dbeaac596a8b476a8 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 10:43:55 -0800 Subject: [PATCH 07/13] Update editEntities to use left click for select --- examples/editEntities.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/editEntities.js b/examples/editEntities.js index 9c4c9a5776..c0c74b8f33 100644 --- a/examples/editEntities.js +++ b/examples/editEntities.js @@ -535,6 +535,9 @@ var idleMouseTimerId = null; var IDLE_MOUSE_TIMEOUT = 200; function mouseMoveEvent(event) { + if (!isActive) { + return; + } if (idleMouseTimerId) { Script.clearTimeout(idleMouseTimerId); } @@ -602,7 +605,7 @@ function mouseReleaseEvent(event) { } function mouseClickEvent(event) { - if (!event.isRightButton) { + if (!event.isLeftButton || !isActive) { return; } From 02d828443b6290cae5297277b5b0988e3d08e97f Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 10:44:54 -0800 Subject: [PATCH 08/13] Update zoom sensitivity when using keys --- examples/libraries/entityCameraTool.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/examples/libraries/entityCameraTool.js b/examples/libraries/entityCameraTool.js index bf5bf6b105..947da45594 100644 --- a/examples/libraries/entityCameraTool.js +++ b/examples/libraries/entityCameraTool.js @@ -15,8 +15,8 @@ var MOUSE_SENSITIVITY = 0.9; var SCROLL_SENSITIVITY = 0.05; var PAN_ZOOM_SCALE_RATIO = 0.4; -var KEY_ORBIT_SENSITIVITY = 40; -var KEY_ZOOM_SENSITIVITY = 10; +var KEY_ORBIT_SENSITIVITY = 90; +var KEY_ZOOM_SENSITIVITY = 3; // Scaling applied based on the size of the object being focused var FOCUS_ZOOM_SCALE = 1.3; @@ -433,8 +433,13 @@ CameraManager = function() { that.targetYaw += (actions.orbitRight - actions.orbitLeft) * dt * KEY_ORBIT_SENSITIVITY; that.targetPitch += (actions.orbitUp - actions.orbitDown) * dt * KEY_ORBIT_SENSITIVITY; that.targetPitch = clamp(that.targetPitch, -90, 90); - that.targetZoomDistance += (actions.orbitBackward - actions.orbitForward) * dt * KEY_ZOOM_SENSITIVITY; - that.targetZoomDistance = clamp(that.targetZoomDistance, MIN_ZOOM_DISTANCE, MAX_ZOOM_DISTANCE); + + var dZoom = actions.orbitBackward - actions.orbitForward; + if (dZoom) { + dZoom *= that.targetZoomDistance * dt * KEY_ZOOM_SENSITIVITY; + that.targetZoomDistance += dZoom; + that.targetZoomDistance = clamp(that.targetZoomDistance, MIN_ZOOM_DISTANCE, MAX_ZOOM_DISTANCE); + } if (easing) { From ded035094a5286dbc1116c51a2e289d4340b03af Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 4 Feb 2015 10:45:04 -0800 Subject: [PATCH 09/13] actually delete resources... even on windows --- libraries/networking/src/ResourceCache.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 9d61129d78..613eb93228 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -248,11 +248,7 @@ void Resource::allReferencesCleared() { _cache->addUnusedResource(self); } else { -#ifndef WIN32 - // Note to Andrzej this causes a consistent crash on windows/vs2013 - // patching here as a very temporary workaround. --craig delete this; -#endif // !WIN32 } } From 3af025574f0c3eeb7b55554ffbae8347865f537c Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 10:45:07 -0800 Subject: [PATCH 10/13] Decrease distance from object when focusing --- examples/libraries/entityCameraTool.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/libraries/entityCameraTool.js b/examples/libraries/entityCameraTool.js index 947da45594..bbd28dd38a 100644 --- a/examples/libraries/entityCameraTool.js +++ b/examples/libraries/entityCameraTool.js @@ -18,8 +18,8 @@ var PAN_ZOOM_SCALE_RATIO = 0.4; var KEY_ORBIT_SENSITIVITY = 90; var KEY_ZOOM_SENSITIVITY = 3; -// Scaling applied based on the size of the object being focused -var FOCUS_ZOOM_SCALE = 1.3; +// Scaling applied based on the size of the object being focused (Larger values focus further away) +var FOCUS_ZOOM_SCALE = 2.3; // Minimum zoom level when focusing on an object var FOCUS_MIN_ZOOM = 0.5; From 2b00e3fadc61872b005e9dff072b16d2ecdf16d8 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 10:49:49 -0800 Subject: [PATCH 11/13] Add force option to deleteEntity --- libraries/entities/src/EntityTree.cpp | 10 +++++----- libraries/entities/src/EntityTree.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index a0a8a33ca8..fa64540c4e 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -228,7 +228,7 @@ void EntityTree::setSimulation(EntitySimulation* simulation) { _simulation = simulation; } -void EntityTree::deleteEntity(const EntityItemID& entityID) { +void EntityTree::deleteEntity(const EntityItemID& entityID, bool force) { EntityTreeElement* containingElement = getContainingElement(entityID); if (!containingElement) { qDebug() << "UNEXPECTED!!!! EntityTree::deleteEntity() entityID doesn't exist!!! entityID=" << entityID; @@ -241,7 +241,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID) { return; } - if (existingEntity->getLocked()) { + if (existingEntity->getLocked() && !force) { qDebug() << "ERROR! EntityTree::deleteEntity() trying to delete locked entity. entityID=" << entityID; return; } @@ -255,7 +255,7 @@ void EntityTree::deleteEntity(const EntityItemID& entityID) { _isDirty = true; } -void EntityTree::deleteEntities(QSet entityIDs) { +void EntityTree::deleteEntities(QSet entityIDs, bool force) { // NOTE: callers must lock the tree before using this method DeleteEntityOperator theOperator(this); foreach(const EntityItemID& entityID, entityIDs) { @@ -271,7 +271,7 @@ void EntityTree::deleteEntities(QSet entityIDs) { continue; } - if (existingEntity->getLocked()) { + if (existingEntity->getLocked() && !force) { qDebug() << "ERROR! EntityTree::deleteEntities() trying to delete locked entity. entityID=" << entityID; continue; } @@ -667,7 +667,7 @@ void EntityTree::update() { foreach (EntityItem* entity, entitiesToDelete) { idsToDelete.insert(entity->getEntityItemID()); } - deleteEntities(idsToDelete); + deleteEntities(idsToDelete, true); } unlock(); } diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h index 405cbecd99..b4621f1a10 100644 --- a/libraries/entities/src/EntityTree.h +++ b/libraries/entities/src/EntityTree.h @@ -91,8 +91,8 @@ public: // use this method if you have a pointer to the entity (avoid an extra entity lookup) bool updateEntity(EntityItem* entity, const EntityItemProperties& properties); - void deleteEntity(const EntityItemID& entityID); - void deleteEntities(QSet entityIDs); + void deleteEntity(const EntityItemID& entityID, bool force = false); + void deleteEntities(QSet entityIDs, bool force = false); void removeEntityFromSimulation(EntityItem* entity); const EntityItem* findClosestEntity(glm::vec3 position, float targetRadius); From efed79d76cf41aae66813f403f5c5c0065a5308e Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 13:37:11 -0800 Subject: [PATCH 12/13] Update the default properties for text entities --- examples/editEntities.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/editEntities.js b/examples/editEntities.js index c0c74b8f33..220f10dffa 100644 --- a/examples/editEntities.js +++ b/examples/editEntities.js @@ -424,11 +424,11 @@ var toolBar = (function () { Entities.addEntity({ type: "Text", position: grid.snapToSurface(grid.snapToGrid(position, false, DEFAULT_DIMENSIONS), DEFAULT_DIMENSIONS), - dimensions: DEFAULT_DIMENSIONS, - backgroundColor: { red: 0, green: 0, blue: 0 }, + dimensions: { x: 0.5, y: 0.3, z: 0.01 }, + backgroundColor: { red: 64, green: 64, blue: 64 }, textColor: { red: 255, green: 255, blue: 255 }, text: "some text", - lineHight: "0.1" + lineHeight: 0.06 }); } else { print("Can't create box: Text would be out of bounds."); From 0e28f669065be93d3f1fb9ae81d23d2eee4a2f84 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 4 Feb 2015 13:45:06 -0800 Subject: [PATCH 13/13] Fix rotation of selection shadow for editEntities --- examples/libraries/entitySelectionTool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 4b931f0c57..85be97b1ce 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -1221,7 +1221,7 @@ SelectionDisplay = (function () { x: selectionManager.worldDimensions.x, y: selectionManager.worldDimensions.z }, - rotation: Quat.fromPitchYawRollDegrees(0, 0, 0), + rotation: Quat.fromPitchYawRollDegrees(90, 0, 0), });