From 7579102b1ac0526ee8ad136b11caa5e588843841 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 20 Jun 2016 15:50:49 -0700 Subject: [PATCH 01/33] updates --- .../DomainContent/Toybox/bow/bow.js | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index b287966d2c..9a0da44961 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -125,6 +125,18 @@ Entities.deleteEntity(this.arrow); }, + startNearGrab:function(entityID, args){ + _this.startEquip(entityID, args); + }, + + continueNearGrab:function(entityID, args){ + _this.continueEquip(entityID, args); + }, + + releaseGrab:function(){ + _this.releaseEquip(); + }, + startEquip: function(entityID, args) { this.hand = args[0]; avatarID = args[1]; @@ -137,6 +149,9 @@ var data = getEntityCustomData('grabbableKey', this.entityID, {}); data.grabbable = false; setEntityCustomData('grabbableKey', this.entityID, data); + Entities.editEntity(_this.entityID, { + collidesWith: "" + }) }, continueEquip: function(entityID, args) { @@ -181,6 +196,9 @@ Entities.deleteEntity(this.arrow); this.aiming = false; this.hasArrowNotched = false; + Entities.editEntity(_this.entityID, { + collidesWith: "static,dynamic,kinematic,otherAvatar,myAvatar" + }) }, createArrow: function() { @@ -526,4 +544,4 @@ }; return new Bow(); -}); +}); \ No newline at end of file From aa742a50ca27549e3641221b9678b18b9ff1eac5 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 20 Jun 2016 16:19:34 -0700 Subject: [PATCH 02/33] release --- unpublishedScripts/DomainContent/Toybox/bow/bow.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index 9a0da44961..7dccf06628 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -133,8 +133,8 @@ _this.continueEquip(entityID, args); }, - releaseGrab:function(){ - _this.releaseEquip(); + releaseGrab:function(entityID, args){ + _this.releaseEquip(entityID, args); }, startEquip: function(entityID, args) { From f6d19ba32fc53edbe5172c44a07fef21e2b4a0a5 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 20 Jun 2016 16:25:48 -0700 Subject: [PATCH 03/33] add short haptic pulse on release --- unpublishedScripts/DomainContent/Toybox/bow/bow.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index 7dccf06628..cba45087a9 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -479,10 +479,14 @@ // rotation: arrowProps.rotation }; + //actually shoot the arrow and play its sound Entities.editEntity(this.arrow, arrowProperties); this.playShootArrowSound(); + var whichHand = this.hand==='left' ? 0 :1; + Controller.triggerShortHapticPulse(whichHand, 2); + //clear the strings back to only the single straight one this.deleteStrings(); Entities.editEntity(this.preNotchString, { From d8aeb26a6ceae98c97550ad9d9d54239200f801e Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 20 Jun 2016 16:26:48 -0700 Subject: [PATCH 04/33] haptic --- unpublishedScripts/DomainContent/Toybox/bow/bow.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index cba45087a9..2430b68076 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -125,15 +125,15 @@ Entities.deleteEntity(this.arrow); }, - startNearGrab:function(entityID, args){ + startNearGrab: function(entityID, args) { _this.startEquip(entityID, args); }, - continueNearGrab:function(entityID, args){ + continueNearGrab: function(entityID, args) { _this.continueEquip(entityID, args); }, - releaseGrab:function(entityID, args){ + releaseGrab: function(entityID, args) { _this.releaseEquip(entityID, args); }, @@ -484,7 +484,7 @@ Entities.editEntity(this.arrow, arrowProperties); this.playShootArrowSound(); - var whichHand = this.hand==='left' ? 0 :1; + var whichHand = this.hand === 'left' ? 0 : 1; Controller.triggerShortHapticPulse(whichHand, 2); //clear the strings back to only the single straight one From 7307bc6a1b6a80dfed4ec0245bca365d6009a3b0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 Jun 2016 09:51:25 -0700 Subject: [PATCH 05/33] revert to domain connection refusal check with string --- libraries/networking/src/DomainHandler.cpp | 22 +++------------------- libraries/networking/src/DomainHandler.h | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index 170669dede..3213e7319a 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -407,25 +407,9 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer(); diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h index 3ab583d597..be8ccbe50f 100644 --- a/libraries/networking/src/DomainHandler.h +++ b/libraries/networking/src/DomainHandler.h @@ -144,7 +144,7 @@ private: QString _pendingPath; QTimer _settingsTimer; - QList _domainConnectionRefusals; + QStringList _domainConnectionRefusals; bool _hasSignalledProtocolMismatch { false }; bool _hasCheckedForAccessToken { false }; int _connectionDenialsSinceKeypairRegen { 0 }; From f9b3165350bfee7243268e38ab91777538a5e4bf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 23 Jun 2016 09:37:17 -0700 Subject: [PATCH 06/33] use a QSet instead of a QStringList --- libraries/networking/src/DomainHandler.cpp | 2 +- libraries/networking/src/DomainHandler.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index 3213e7319a..c4b979e0b8 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -408,7 +408,7 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer _domainConnectionRefusals; bool _hasSignalledProtocolMismatch { false }; bool _hasCheckedForAccessToken { false }; int _connectionDenialsSinceKeypairRegen { 0 }; From 18a1f74c3752bd35a6d93f5135027453c0a9a671 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 28 Jun 2016 10:32:43 -0700 Subject: [PATCH 07/33] remove unused boolean for signalling protocol mismatch --- libraries/networking/src/DomainHandler.cpp | 1 - libraries/networking/src/DomainHandler.h | 1 - 2 files changed, 2 deletions(-) diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index c4b979e0b8..739c0f8f4a 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -117,7 +117,6 @@ void DomainHandler::hardReset() { _hostname = QString(); _sockAddr.clear(); - _hasSignalledProtocolMismatch = false; _domainConnectionRefusals.clear(); _hasCheckedForAccessToken = false; diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h index 0c041da47d..50639a4817 100644 --- a/libraries/networking/src/DomainHandler.h +++ b/libraries/networking/src/DomainHandler.h @@ -145,7 +145,6 @@ private: QTimer _settingsTimer; QSet _domainConnectionRefusals; - bool _hasSignalledProtocolMismatch { false }; bool _hasCheckedForAccessToken { false }; int _connectionDenialsSinceKeypairRegen { 0 }; From 799686f29d46eb53c96742a53cea1bf9b4a7eea4 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Tue, 28 Jun 2016 11:36:08 -0700 Subject: [PATCH 08/33] Only update the (invisible) cursor position from hand controllers when the trigger is partially squeezed. --- .../controllers/handControllerPointer.js | 71 ++++++++++++------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index a0f1f47b3c..981600f0bd 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -187,6 +187,32 @@ function overlayFromWorldPoint(point) { return { x: horizontalPixels, y: verticalPixels }; } +function activeHudPoint2d(activeHand) { // if controller is valid, update reticle position and answer 2d point. Otherwise falsey. + var controllerPose = Controller.getPoseValue(activeHand); + // Valid if any plugged-in hand controller is "on". (uncradled Hydra, green-lighted Vive...) + if (!controllerPose.valid) { + return; // Controller is cradled. + } + var controllerPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, controllerPose.translation), + MyAvatar.position); + // This gets point direction right, but if you want general quaternion it would be more complicated: + var controllerDirection = Quat.getUp(Quat.multiply(MyAvatar.orientation, controllerPose.rotation)); + + var hudPoint3d = calculateRayUICollisionPoint(controllerPosition, controllerDirection); + if (!hudPoint3d) { + if (Menu.isOptionChecked("Overlays")) { // With our hud resetting strategy, hudPoint3d should be valid here + print('Controller is parallel to HUD'); // so let us know that our assumptions are wrong. + } + return; + } + var hudPoint2d = overlayFromWorldPoint(hudPoint3d); + + // We don't know yet if we'll want to make the cursor or laser visble, but we need to move it to see if + // it's pointing at a QML tool (aka system overlay). + setReticlePosition(hudPoint2d); + return hudPoint2d; +} + // MOUSE ACTIVITY -------- // var isSeeking = false; @@ -351,8 +377,23 @@ function isPointingAtOverlayStartedNonFullTrigger(trigger) { } clickMapping.from(rightTrigger.full).when(isPointingAtOverlayStartedNonFullTrigger(rightTrigger)).to(Controller.Actions.ReticleClick); clickMapping.from(leftTrigger.full).when(isPointingAtOverlayStartedNonFullTrigger(leftTrigger)).to(Controller.Actions.ReticleClick); -clickMapping.from(Controller.Standard.RightSecondaryThumb).peek().to(Controller.Actions.ContextMenu); -clickMapping.from(Controller.Standard.LeftSecondaryThumb).peek().to(Controller.Actions.ContextMenu); +// The following is essentially like Left and Right versions of +// clickMapping.from(Controller.Standard.RightSecondaryThumb).peek().to(Controller.Actions.ContextMenu); +// except that we first update the reticle position from the appropriate hand position, before invoking the ContextMenu. +var wantsMenu = 0; +clickMapping.from(function () { return wantsMenu; }).to(Controller.Actions.ContextMenu); +clickMapping.from(Controller.Standard.RightSecondaryThumb).peek().to(function (clicked) { + if (clicked) { + activeHudPoint2d(Controller.Standard.RightHand); + } + wantsMenu = clicked; +}); +clickMapping.from(Controller.Standard.LeftSecondaryThumb).peek().to(function (clicked) { + if (clicked) { + activeHudPoint2d(Controller.Standard.LeftHand); + } + wantsMenu = clicked; +}); clickMapping.from(Controller.Hardware.Keyboard.RightMouseClicked).peek().to(function () { // Allow the reticle depth to be set correctly: // Wait a tick for the context menu to be displayed, and then simulate a (non-hand-controller) mouse move @@ -408,28 +449,13 @@ function update() { } leftTrigger.update(); rightTrigger.update(); - var controllerPose = Controller.getPoseValue(activeHand); - // Valid if any plugged-in hand controller is "on". (uncradled Hydra, green-lighted Vive...) - if (!controllerPose.valid) { - return off(); // Controller is cradled. + if (!activeTrigger.state) { + return off(); // No trigger } - var controllerPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, controllerPose.translation), - MyAvatar.position); - // This gets point direction right, but if you want general quaternion it would be more complicated: - var controllerDirection = Quat.getUp(Quat.multiply(MyAvatar.orientation, controllerPose.rotation)); - - var hudPoint3d = calculateRayUICollisionPoint(controllerPosition, controllerDirection); - if (!hudPoint3d) { - if (Menu.isOptionChecked("Overlays")) { // With our hud resetting strategy, hudPoint3d should be valid here - print('Controller is parallel to HUD'); // so let us know that our assumptions are wrong. - } + var hudPoint2d = activeHudPoint2d(activeHand); + if (!hudPoint2d) { return off(); } - var hudPoint2d = overlayFromWorldPoint(hudPoint3d); - - // We don't know yet if we'll want to make the cursor visble, but we need to move it to see if - // it's pointing at a QML tool (aka system overlay). - setReticlePosition(hudPoint2d); // If there's a HUD element at the (newly moved) reticle, just make it visible and bail. if (isPointingAtOverlay(hudPoint2d)) { if (HMD.active) { @@ -446,9 +472,6 @@ function update() { return; } // We are not pointing at a HUD element (but it could be a 3d overlay). - if (!activeTrigger.state) { - return off(); // No trigger - } clearSystemLaser(); Reticle.visible = false; } From c492d125e080a018d20b56b322a43a523ecb9e2e Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Tue, 28 Jun 2016 13:19:03 -0700 Subject: [PATCH 09/33] limit hand controller actions to recommended area --- scripts/system/controllers/handControllerPointer.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index a0f1f47b3c..8e2edbe467 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -125,8 +125,18 @@ function ignoreMouseActivity() { weMovedReticle = false; return true; } +var reticleMinX, reticleMaxX, reticleMinY, reticleMaxY; +function updateRecommendedArea() { + var rectangle = Controller.getRecommendedOverlayRect(); + reticleMinX = rectangle.x; + reticleMaxX = rectangle.x + rectangle.width; + reticleMinY = rectangle.y; + reticleMaxY = rectangle.y + rectangle.height; +} var setReticlePosition = function (point2d) { weMovedReticle = true; + point2d.x = Math.max(reticleMinX, Math.min(point2d.x, reticleMaxX)); + point2d.y = Math.max(reticleMinY, Math.min(point2d.y, reticleMaxY)); Reticle.setPosition(point2d); }; @@ -463,6 +473,7 @@ Script.scriptEnding.connect(function () { var SETTINGS_CHANGE_RECHECK_INTERVAL = 10 * 1000; // milliseconds function checkSettings() { updateFieldOfView(); + updateRecommendedArea(); } checkSettings(); var settingsChecker = Script.setInterval(checkSettings, SETTINGS_CHANGE_RECHECK_INTERVAL); From e538625fe07a062988351c35b77cdf07cbc01b69 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 28 Jun 2016 16:35:32 -0700 Subject: [PATCH 10/33] fix warning about convex hull vertex count cap --- libraries/physics/src/PhysicalEntitySimulation.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/physics/src/PhysicalEntitySimulation.cpp b/libraries/physics/src/PhysicalEntitySimulation.cpp index cdf33a6edb..9714059e7c 100644 --- a/libraries/physics/src/PhysicalEntitySimulation.cpp +++ b/libraries/physics/src/PhysicalEntitySimulation.cpp @@ -218,10 +218,12 @@ void PhysicalEntitySimulation::getObjectsToAddToPhysics(VectorOfMotionStates& re ShapeInfo shapeInfo; entity->computeShapeInfo(shapeInfo); int numPoints = shapeInfo.getLargestSubshapePointCount(); - if (numPoints > MAX_HULL_POINTS) { - qWarning() << "convex hull with" << numPoints - << "points for entity" << entity->getName() - << "at" << entity->getPosition() << " will be reduced"; + if (shapeInfo.getType() == SHAPE_TYPE_COMPOUND) { + if (numPoints > MAX_HULL_POINTS) { + qWarning() << "convex hull with" << numPoints + << "points for entity" << entity->getName() + << "at" << entity->getPosition() << " will be reduced"; + } } btCollisionShape* shape = ObjectMotionState::getShapeManager()->getShape(shapeInfo); if (shape) { From 74781c078638fbddd9a0fe5c5cbb6960a91526e9 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 28 Jun 2016 16:36:10 -0700 Subject: [PATCH 11/33] boxify static meshes with too many vertices --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 366e365107..43fea75eac 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -696,6 +696,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) { QVector localTransforms; const FBXGeometry& geometry = _model->getFBXGeometry(); int numberOfMeshes = geometry.meshes.size(); + int totalNumVertices = 0; for (int i = 0; i < numberOfMeshes; i++) { const FBXMesh& mesh = geometry.meshes.at(i); if (mesh.clusters.size() > 0) { @@ -706,6 +707,13 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) { glm::mat4 identity; localTransforms.push_back(identity); } + totalNumVertices += mesh.vertices.size(); + } + const int MAX_VERTICES_PER_STATIC_MESH = 1e6; + if (totalNumVertices > MAX_VERTICES_PER_STATIC_MESH) { + qWarning() << "model" << getModelURL() << "has too many vertices" << totalNumVertices << "and will collide as a box."; + info.setParams(SHAPE_TYPE_BOX, 0.5f * dimensions); + return; } updateModelBounds(); From d650c50a5bc5754cfbdc7f0a7d3cd1df62e90428 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Tue, 28 Jun 2016 17:44:30 -0700 Subject: [PATCH 12/33] Use normal Script.update (60hz) instead of a timer (@20hz). --- scripts/system/controllers/handControllerPointer.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index a0f1f47b3c..f7a85b2a43 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -398,7 +398,7 @@ function update() { } updateSeeking(true); if (!handControllerLockOut.expired(now)) { - return off(); // Let them use mouse it in peace. + return off(); // Let them use mouse in peace. } if (!Menu.isOptionChecked("First Person")) { return off(); // What to do? menus can be behind hand! @@ -406,13 +406,13 @@ function update() { if (!Window.hasFocus() || !Reticle.allowMouseCapture) { return off(); // Don't mess with other apps or paused mouse activity } - leftTrigger.update(); - rightTrigger.update(); var controllerPose = Controller.getPoseValue(activeHand); // Valid if any plugged-in hand controller is "on". (uncradled Hydra, green-lighted Vive...) if (!controllerPose.valid) { return off(); // Controller is cradled. } + leftTrigger.update(); + rightTrigger.update(); var controllerPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, controllerPose.translation), MyAvatar.position); // This gets point direction right, but if you want general quaternion it would be more complicated: @@ -452,12 +452,7 @@ function update() { clearSystemLaser(); Reticle.visible = false; } - -var UPDATE_INTERVAL = 50; // milliseconds. Script.update is too frequent. -var updater = Script.setInterval(update, UPDATE_INTERVAL); -Script.scriptEnding.connect(function () { - Script.clearInterval(updater); -}); +setupHandler(Script.update, update); // Check periodically for changes to setup. var SETTINGS_CHANGE_RECHECK_INTERVAL = 10 * 1000; // milliseconds From b551bc3c1ae20be28d312184e50fa2d0dd56461d Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Tue, 28 Jun 2016 18:01:09 -0700 Subject: [PATCH 13/33] Use the whole area, less a margin. --- scripts/system/controllers/handControllerPointer.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index 8e2edbe467..00aca2af86 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -125,13 +125,12 @@ function ignoreMouseActivity() { weMovedReticle = false; return true; } -var reticleMinX, reticleMaxX, reticleMinY, reticleMaxY; +var MARGIN = 50; +var reticleMinX = MARGIN, reticleMaxX, reticleMinY = MARGIN, reticleMaxY; function updateRecommendedArea() { - var rectangle = Controller.getRecommendedOverlayRect(); - reticleMinX = rectangle.x; - reticleMaxX = rectangle.x + rectangle.width; - reticleMinY = rectangle.y; - reticleMaxY = rectangle.y + rectangle.height; + var dims = Controller.getViewportDimensions(); + reticleMaxX = dims.x - MARGIN; + reticleMaxY = dims.y - MARGIN; } var setReticlePosition = function (point2d) { weMovedReticle = true; From 962f9d5f22b1debaf131c1322742cc4e06edb582 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 28 Jun 2016 18:10:06 -0700 Subject: [PATCH 14/33] Don't update the shown state of the tool window when it's already invisible --- interface/resources/qml/ToolWindow.qml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/ToolWindow.qml b/interface/resources/qml/ToolWindow.qml index bbfc74493d..c957a37886 100644 --- a/interface/resources/qml/ToolWindow.qml +++ b/interface/resources/qml/ToolWindow.qml @@ -137,12 +137,15 @@ ScrollingWindow { } function updateVisiblity() { - for (var i = 0; i < tabView.count; ++i) { - if (tabView.getTab(i).enabled) { - return; + if (visible) { + for (var i = 0; i < tabView.count; ++i) { + if (tabView.getTab(i).enabled) { + console.log("QQQ tab is visible, returning early"); + return; + } } + shown = false; } - shown = false; } function findIndexForUrl(source) { From 21d2c977a36f656b0a1c3c56afa435c8c1c5098f Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 28 Jun 2016 18:30:07 -0700 Subject: [PATCH 15/33] Remove roll from cursor in HMD --- .../src/display-plugins/CompositorHelper.cpp | 2 +- libraries/shared/src/GLMHelpers.cpp | 6 ++++++ libraries/shared/src/GLMHelpers.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp index 032350a07c..89ff2e0c8d 100644 --- a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp +++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp @@ -425,7 +425,7 @@ glm::mat4 CompositorHelper::getReticleTransform(const glm::mat4& eyePose, const d = glm::normalize(overlaySurfacePoint); } reticlePosition = headPosition + (d * getReticleDepth()); - quat reticleOrientation = glm::quat_cast(_currentDisplayPlugin->getHeadPose()); + quat reticleOrientation = cancelOutRoll(glm::quat_cast(_currentDisplayPlugin->getHeadPose())); vec3 reticleScale = vec3(Cursor::Manager::instance().getScale() * reticleSize * getReticleDepth()); return glm::inverse(eyePose) * createMatFromScaleQuatAndPos(reticleScale, reticleOrientation, reticlePosition); } else { diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp index 556c313f95..8dbd0a146f 100644 --- a/libraries/shared/src/GLMHelpers.cpp +++ b/libraries/shared/src/GLMHelpers.cpp @@ -466,6 +466,12 @@ glm::mat4 createMatFromScaleQuatAndPos(const glm::vec3& scale, const glm::quat& glm::vec4(zAxis, 0.0f), glm::vec4(trans, 1.0f)); } +// cancel out roll +glm::quat cancelOutRoll(const glm::quat& q) { + glm::vec3 forward = q * glm::vec3(0.0f, 0.0f, -1.0f); + return glm::quat_cast(glm::inverse(glm::lookAt(Vectors::ZERO, forward, Vectors::UP))); +} + // cancel out roll and pitch glm::quat cancelOutRollAndPitch(const glm::quat& q) { glm::vec3 zAxis = q * glm::vec3(0.0f, 0.0f, 1.0f); diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h index ae9ec25195..ef3bfeb674 100644 --- a/libraries/shared/src/GLMHelpers.h +++ b/libraries/shared/src/GLMHelpers.h @@ -221,6 +221,7 @@ glm::detail::tvec4 lerp(const glm::detail::tvec4& x, const glm::deta glm::mat4 createMatFromQuatAndPos(const glm::quat& q, const glm::vec3& p); glm::mat4 createMatFromScaleQuatAndPos(const glm::vec3& scale, const glm::quat& rot, const glm::vec3& trans); +glm::quat cancelOutRoll(const glm::quat& q); glm::quat cancelOutRollAndPitch(const glm::quat& q); glm::mat4 cancelOutRollAndPitch(const glm::mat4& m); glm::vec3 transformPoint(const glm::mat4& m, const glm::vec3& p); From b649b30777a86733c98a596c3899a2c27506c850 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Wed, 29 Jun 2016 08:20:47 -0700 Subject: [PATCH 16/33] Reduce margin. --- scripts/system/controllers/handControllerPointer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index 00aca2af86..36442e92d1 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -125,7 +125,7 @@ function ignoreMouseActivity() { weMovedReticle = false; return true; } -var MARGIN = 50; +var MARGIN = 25; var reticleMinX = MARGIN, reticleMaxX, reticleMinY = MARGIN, reticleMaxY; function updateRecommendedArea() { var dims = Controller.getViewportDimensions(); From 5a9be817df1fc30898ca988efb5607150d8c93ce Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 29 Jun 2016 10:28:55 -0700 Subject: [PATCH 17/33] PR comments --- interface/resources/qml/ToolWindow.qml | 1 - libraries/shared/src/GLMHelpers.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/resources/qml/ToolWindow.qml b/interface/resources/qml/ToolWindow.qml index c957a37886..f6a4600e06 100644 --- a/interface/resources/qml/ToolWindow.qml +++ b/interface/resources/qml/ToolWindow.qml @@ -140,7 +140,6 @@ ScrollingWindow { if (visible) { for (var i = 0; i < tabView.count; ++i) { if (tabView.getTab(i).enabled) { - console.log("QQQ tab is visible, returning early"); return; } } diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp index 8dbd0a146f..0c02cd5b03 100644 --- a/libraries/shared/src/GLMHelpers.cpp +++ b/libraries/shared/src/GLMHelpers.cpp @@ -468,7 +468,7 @@ glm::mat4 createMatFromScaleQuatAndPos(const glm::vec3& scale, const glm::quat& // cancel out roll glm::quat cancelOutRoll(const glm::quat& q) { - glm::vec3 forward = q * glm::vec3(0.0f, 0.0f, -1.0f); + glm::vec3 forward = q * Vectors::FRONT; return glm::quat_cast(glm::inverse(glm::lookAt(Vectors::ZERO, forward, Vectors::UP))); } From fcb6e7869dce8583dca423fc94a0acafd44b757e Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 29 Jun 2016 10:54:24 -0700 Subject: [PATCH 18/33] logging --- .../DomainContent/Toybox/bow/bow.js | 5 ++- .../DomainContent/Toybox/bow/createBow.js | 41 ++++++++++++------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index 2430b68076..02854e4de4 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -484,8 +484,9 @@ Entities.editEntity(this.arrow, arrowProperties); this.playShootArrowSound(); - var whichHand = this.hand === 'left' ? 0 : 1; - Controller.triggerShortHapticPulse(whichHand, 2); + var backHand = this.hand === 'left' ? 1 : 0; + var haptic = Controller.triggerShortHapticPulse(1, backHand); + print('JBP TRIGGERED HAPTIC ' + haptic +" hand: "+ backHand) //clear the strings back to only the single straight one this.deleteStrings(); diff --git a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js index 5deec3f6bc..4daeba320a 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js @@ -62,24 +62,35 @@ function makeBow() { shapeType: 'compound', compoundShapeURL: COLLISION_HULL_URL, script: SCRIPT_URL, + collidesWith: 'dynamic,kinetmatic,static', userData: JSON.stringify({ grabbableKey: { invertSolidWhileHeld: true }, - wearable:{joints:{RightHand:[{x:0.03960523009300232, - y:0.01979270577430725, - z:0.03294898942112923}, - {x:-0.7257906794548035, - y:-0.4611682891845703, - z:0.4436084032058716, - w:-0.25251442193984985}], - LeftHand:[{x:0.0055799782276153564, - y:0.04354757443070412, - z:0.05119767785072327}, - {x:-0.14914104342460632, - y:0.6448180079460144, - z:-0.2888556718826294, - w:-0.6917579770088196}]}} + wearable: { + joints: { + RightHand: [{ + x: 0.03960523009300232, + y: 0.01979270577430725, + z: 0.03294898942112923 + }, { + x: -0.7257906794548035, + y: -0.4611682891845703, + z: 0.4436084032058716, + w: -0.25251442193984985 + }], + LeftHand: [{ + x: 0.0055799782276153564, + y: 0.04354757443070412, + z: 0.05119767785072327 + }, { + x: -0.14914104342460632, + y: 0.6448180079460144, + z: -0.2888556718826294, + w: -0.6917579770088196 + }] + } + } }) }; @@ -148,4 +159,4 @@ function cleanup() { Entities.deleteEntity(preNotchString); } -Script.scriptEnding.connect(cleanup); +Script.scriptEnding.connect(cleanup); \ No newline at end of file From 0e3b54c1303b26b8663b27eb32574b25fb25e2c9 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 29 Jun 2016 11:07:48 -0700 Subject: [PATCH 19/33] remove logging --- unpublishedScripts/DomainContent/Toybox/bow/bow.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index 02854e4de4..89a3d166d6 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -143,7 +143,6 @@ //disable the opposite hand in handControllerGrab.js by message var handToDisable = this.hand === 'right' ? 'left' : 'right'; - print("disabling hand: " + handToDisable); Messages.sendMessage('Hifi-Hand-Disabler', handToDisable); var data = getEntityCustomData('grabbableKey', this.entityID, {}); @@ -202,7 +201,7 @@ }, createArrow: function() { - print('create arrow') + // print('create arrow') this.playArrowNotchSound(); var arrow = Entities.addEntity({ @@ -486,7 +485,6 @@ var backHand = this.hand === 'left' ? 1 : 0; var haptic = Controller.triggerShortHapticPulse(1, backHand); - print('JBP TRIGGERED HAPTIC ' + haptic +" hand: "+ backHand) //clear the strings back to only the single straight one this.deleteStrings(); From 6d3129899beadd857582a00ee395be3733ca9142 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 29 Jun 2016 11:47:41 -0700 Subject: [PATCH 20/33] remove prints, fix typo, formatting --- .../DomainContent/Toybox/bow/bow.js | 43 ++++++++----------- .../DomainContent/Toybox/bow/createBow.js | 2 +- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/unpublishedScripts/DomainContent/Toybox/bow/bow.js b/unpublishedScripts/DomainContent/Toybox/bow/bow.js index 89a3d166d6..0c16bcbc7b 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/bow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/bow.js @@ -183,7 +183,6 @@ }, releaseEquip: function(entityID, args) { - // print('RELEASE GRAB EVENT') Messages.sendMessage('Hifi-Hand-Disabler', "none") this.stringDrawn = false; @@ -201,7 +200,6 @@ }, createArrow: function() { - // print('create arrow') this.playArrowNotchSound(); var arrow = Entities.addEntity({ @@ -226,25 +224,24 @@ var makeArrowStick = function(entityA, entityB, collision) { Entities.editEntity(entityA, { - angularVelocity: { - x: 0, - y: 0, - z: 0 - }, - velocity: { - x: 0, - y: 0, - z: 0 - }, - gravity: { - x: 0, - y: 0, - z: 0 - }, - position: collision.contactPoint, - dynamic: false - }) - // print('ARROW COLLIDED WITH::' + entityB); + angularVelocity: { + x: 0, + y: 0, + z: 0 + }, + velocity: { + x: 0, + y: 0, + z: 0 + }, + gravity: { + x: 0, + y: 0, + z: 0 + }, + position: collision.contactPoint, + dynamic: false + }) Script.removeEventHandler(arrow, "collisionWithEntity", makeArrowStick) } @@ -300,7 +297,6 @@ }, updateStringPositions: function() { - // print('update string positions!!!') var upVector = Quat.getUp(this.bowProperties.rotation); var upOffset = Vec3.multiply(upVector, TOP_NOTCH_OFFSET); var downVector = Vec3.multiply(-1, Quat.getUp(this.bowProperties.rotation)); @@ -371,7 +367,6 @@ if (this.triggerValue < DRAW_STRING_THRESHOLD && this.stringDrawn === true) { // firing the arrow - // print('HIT RELEASE LOOP IN CHECK'); this.drawStrings(); this.hasArrowNotched = false; @@ -381,7 +376,6 @@ } else if (this.triggerValue > DRAW_STRING_THRESHOLD && this.stringDrawn === true) { - // print('HIT CONTINUE LOOP IN CHECK') //continuing to aim the arrow this.aiming = true; @@ -389,7 +383,6 @@ this.updateArrowPositionInNotch(); } else if (this.triggerValue > DRAW_STRING_THRESHOLD && this.stringDrawn === false) { - // print('HIT START LOOP IN CHECK'); this.arrow = this.createArrow(); this.playStringPullSound(); diff --git a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js index 4daeba320a..f1ed9eb263 100644 --- a/unpublishedScripts/DomainContent/Toybox/bow/createBow.js +++ b/unpublishedScripts/DomainContent/Toybox/bow/createBow.js @@ -62,7 +62,7 @@ function makeBow() { shapeType: 'compound', compoundShapeURL: COLLISION_HULL_URL, script: SCRIPT_URL, - collidesWith: 'dynamic,kinetmatic,static', + collidesWith: 'dynamic,kinematic,static', userData: JSON.stringify({ grabbableKey: { invertSolidWhileHeld: true From b0422106373e13dcf22ca181fde8853c0a5edf3e Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Fri, 24 Jun 2016 15:08:55 -0700 Subject: [PATCH 21/33] Addition of equipHotspots --- .../system/controllers/handControllerGrab.js | 103 ++++++++++++++---- 1 file changed, 81 insertions(+), 22 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index f86ff158f6..e971450aff 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -324,6 +324,14 @@ EntityPropertiesCache.prototype.getWearableProps = function(entityID) { return undefined; } }; +EntityPropertiesCache.prototype.getEquipHotspotsProps = function(entityID) { + var props = this.cache[entityID]; + if (props) { + return props.userData.equipHotspots ? props.userData.equipHotspots : {}; + } else { + return undefined; + } +}; function MyController(hand) { this.hand = hand; @@ -1083,8 +1091,8 @@ function MyController(hand) { }; this.entityIsEquippableWithDistanceCheck = function (entityID, handPosition) { + var distance, handJointName; var props = this.entityPropertyCache.getProps(entityID); - var distance = Vec3.distance(props.position, handPosition); var grabProps = this.entityPropertyCache.getGrabProps(entityID); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); @@ -1096,30 +1104,81 @@ function MyController(hand) { return false; } - if (distance > EQUIP_RADIUS) { - if (debug) { - print("equip is skipping '" + props.name + "': too far away, " + distance + " meters"); - } - return false; - } + var equipHotspotsProps = this.entityPropertyCache.getEquipHotspotsProps(entityID); + if (equipHotspotsProps && equipHotspotsProps.length > 0) { + var i, length = equipHotspotsProps.length; + for (i = 0; i < length; i++) { + var hotspot = equipHotspotsProps[i]; + if (!hotspot.position) { + if (debug) { + print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing a position"); + } + continue; + } - var wearableProps = this.entityPropertyCache.getWearableProps(entityID); - if (!wearableProps || !wearableProps.joints) { - if (debug) { - print("equip is skipping '" + props.name + "': no wearable attach-point"); - } - return false; - } + if (!hotspot.radius) { + if (debug) { + print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing a radius"); + } + continue; + } - var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; - if (!wearableProps.joints[handJointName]) { - if (debug) { - print("equip is skipping '" + props.name + "': no wearable joint for " + handJointName); - } - return false; - } + distance = Vec3.distance(hotspot.position, handPosition); + if (distance > hotspot.radius) { + if (debug) { + print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is too far away, " + distance + " meters"); + } + continue; + } - return true; + if (!hotspot.joints) { + if (debug) { + print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing joints"); + } + continue; + } + + handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; + if (!hotspot.joints[handJointName]) { + if (debug) { + print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing joint." + handJointName); + } + continue; + } + + return true; + } + + return false; + + } else { + + distance = Vec3.distance(props.position, handPosition); + if (distance > EQUIP_RADIUS) { + if (debug) { + print("equip is skipping '" + props.name + "': too far away, " + distance + " meters"); + } + return false; + } + + var wearableProps = this.entityPropertyCache.getWearableProps(entityID); + if (!wearableProps || !wearableProps.joints) { + if (debug) { + print("equip is skipping '" + props.name + "': no wearable attach-point"); + } + return false; + } + + handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; + if (!wearableProps.joints[handJointName]) { + if (debug) { + print("equip is skipping '" + props.name + "': no wearable joint for " + handJointName); + } + return false; + } + + return true; + } }; this.entityIsGrabbable = function (entityID) { From 1b98c7347324c78aa069004c6dc47105e282ea0b Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Fri, 24 Jun 2016 18:08:25 -0700 Subject: [PATCH 22/33] WIP, equip-points work but they don't use the proper attach point. --- .../system/controllers/handControllerGrab.js | 177 ++++++++---------- scripts/system/libraries/Xform.js | 8 + 2 files changed, 82 insertions(+), 103 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index e971450aff..c814b4396f 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -10,9 +10,10 @@ // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, Reticle, Messages, setEntityCustomData, getEntityCustomData, vec3toStr */ +/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, Reticle, Messages, setEntityCustomData, getEntityCustomData, vec3toStr, Xform */ Script.include("/~/system/libraries/utils.js"); +Script.include("../libraries/Xform.js"); // // add lines where the hand ray picking is happening @@ -931,7 +932,8 @@ function MyController(hand) { this.hotspotOverlays.push({ entityID: undefined, overlay: overlay, - type: "hand" + type: "hand", + localPosition: {x: 0, y: 0, z: 0} }); } @@ -941,35 +943,38 @@ function MyController(hand) { var _this = this; this.entityPropertyCache.getEntities().forEach(function (entityID) { + var props = _this.entityPropertyCache.getProps(entityID); if (_this.entityIsEquippableWithoutDistanceCheck(entityID)) { - props = _this.entityPropertyCache.getProps(entityID); + var equipHotspots = _this.collectEquipHotspots(entityID); + var entityXform = new Xform(props.rotation, props.position); + var i, length = equipHotspots.length; + for (i = 0; i < length; i++) { + var hotspot = equipHotspots[i]; + overlay = Overlays.addOverlay("sphere", { + position: entityXform.xformPoint(hotspot.position), + size: hotspot.radius * 2, + color: EQUIP_SPHERE_COLOR, + alpha: EQUIP_SPHERE_ALPHA, + solid: true, + visible: true, + ignoreRayIntersection: true, + drawInFront: false + }); - overlay = Overlays.addOverlay("sphere", { - rotation: props.rotation, - position: props.position, - size: EQUIP_RADIUS * 2, - color: EQUIP_SPHERE_COLOR, - alpha: EQUIP_SPHERE_ALPHA, - solid: true, - visible: true, - ignoreRayIntersection: true, - drawInFront: false - }); - - _this.hotspotOverlays.push({ - entityID: entityID, - overlay: overlay, - type: "equip" - }); + _this.hotspotOverlays.push({ + entityID: entityID, + overlay: overlay, + type: "equip", + localPosition: hotspot.position + }); + } } if (DRAW_GRAB_BOXES && _this.entityIsGrabbable(entityID)) { - props = _this.entityPropertyCache.getProps(entityID); - overlay = Overlays.addOverlay("cube", { rotation: props.rotation, position: props.position, - size: props.dimensions, //{x: props.dimensions.x, y: props.dimensions.y, z: props.dimensions.z}, + size: props.dimensions, color: GRAB_BOX_COLOR, alpha: GRAB_BOX_ALPHA, solid: true, @@ -981,7 +986,8 @@ function MyController(hand) { _this.hotspotOverlays.push({ entityID: entityID, overlay: overlay, - type: "near" + type: "near", + localPosition: {x: 0, y: 0, z: 0} }); } }); @@ -996,7 +1002,8 @@ function MyController(hand) { } else if (overlayInfo.type === "equip") { _this.entityPropertyCache.updateEntity(overlayInfo.entityID); props = _this.entityPropertyCache.getProps(overlayInfo.entityID); - Overlays.editOverlay(overlayInfo.overlay, { position: props.position, rotation: props.rotation }); + var entityXform = new Xform(props.rotation, props.position); + Overlays.editOverlay(overlayInfo.overlay, { position: entityXform.xformPoint(overlayInfo.localPosition), rotation: props.rotation }); } else if (overlayInfo.type === "near") { _this.entityPropertyCache.updateEntity(overlayInfo.entityID); props = _this.entityPropertyCache.getProps(overlayInfo.entityID); @@ -1084,17 +1091,41 @@ function MyController(hand) { return grabbableProps && grabbableProps.wantsTrigger; }; - this.entityIsEquippableWithoutDistanceCheck = function (entityID) { - var props = this.entityPropertyCache.getProps(entityID); - var handPosition = props.position; - return this.entityIsEquippableWithDistanceCheck(entityID, handPosition); + this.collectEquipHotspots = function (entityID) { + var result = []; + var equipHotspotsProps = this.entityPropertyCache.getEquipHotspotsProps(entityID); + if (equipHotspotsProps && equipHotspotsProps.length > 0) { + var i, length = equipHotspotsProps.length; + for (i = 0; i < length; i++) { + var hotspot = equipHotspotsProps[i]; + if (hotspot.position && hotspot.radius && hotspot.joints) { + result.push({ + position: hotspot.position, + radius: hotspot.radius, + joints: hotspot.joints + }); + } + } + } else { + var wearableProps = this.entityPropertyCache.getWearableProps(entityID); + if (wearableProps && wearableProps.joints) { + result.push({ + position: {x: 0, y: 0, z: 0}, + radius: EQUIP_RADIUS, + joints: wearableProps.joints + }); + } + } + return result; }; - this.entityIsEquippableWithDistanceCheck = function (entityID, handPosition) { - var distance, handJointName; + this.entityIsEquippableWithDistanceCheck = function (entityID, handPosition, skipDistanceCheck) { + var distance; + var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; var props = this.entityPropertyCache.getProps(entityID); var grabProps = this.entityPropertyCache.getGrabProps(entityID); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); + var entityXform = new Xform(props.rotation, props.position); var refCount = ("refCount" in grabProps) ? grabProps.refCount : 0; if (refCount > 0) { @@ -1104,81 +1135,21 @@ function MyController(hand) { return false; } - var equipHotspotsProps = this.entityPropertyCache.getEquipHotspotsProps(entityID); - if (equipHotspotsProps && equipHotspotsProps.length > 0) { - var i, length = equipHotspotsProps.length; - for (i = 0; i < length; i++) { - var hotspot = equipHotspotsProps[i]; - if (!hotspot.position) { - if (debug) { - print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing a position"); - } - continue; - } - - if (!hotspot.radius) { - if (debug) { - print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing a radius"); - } - continue; - } - - distance = Vec3.distance(hotspot.position, handPosition); - if (distance > hotspot.radius) { - if (debug) { - print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is too far away, " + distance + " meters"); - } - continue; - } - - if (!hotspot.joints) { - if (debug) { - print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing joints"); - } - continue; - } - - handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; - if (!hotspot.joints[handJointName]) { - if (debug) { - print("equip is skipping '" + props.name + "': equip hotspot[" + i + "] is missing joint." + handJointName); - } - continue; - } - + var equipHotspots = this.collectEquipHotspots(entityID); + var i, length = equipHotspots.length; + for (i = 0; i < length; i++) { + var hotspot = equipHotspots[i]; + distance = Vec3.distance(entityXform.xformPoint(hotspot.position), handPosition); + if ((skipDistanceCheck || distance < hotspot.radius) && hotspot.joints[handJointName]) { return true; } - - return false; - - } else { - - distance = Vec3.distance(props.position, handPosition); - if (distance > EQUIP_RADIUS) { - if (debug) { - print("equip is skipping '" + props.name + "': too far away, " + distance + " meters"); - } - return false; - } - - var wearableProps = this.entityPropertyCache.getWearableProps(entityID); - if (!wearableProps || !wearableProps.joints) { - if (debug) { - print("equip is skipping '" + props.name + "': no wearable attach-point"); - } - return false; - } - - handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; - if (!wearableProps.joints[handJointName]) { - if (debug) { - print("equip is skipping '" + props.name + "': no wearable joint for " + handJointName); - } - return false; - } - - return true; } + return false; + }; + + this.entityIsEquippableWithoutDistanceCheck = function (entityID) { + var handPosition = this.getHandPosition(); + return this.entityIsEquippableWithDistanceCheck(entityID, handPosition, true); }; this.entityIsGrabbable = function (entityID) { diff --git a/scripts/system/libraries/Xform.js b/scripts/system/libraries/Xform.js index 75051c4983..1aa43cf30b 100644 --- a/scripts/system/libraries/Xform.js +++ b/scripts/system/libraries/Xform.js @@ -33,6 +33,14 @@ Xform.prototype.mirrorX = function() { {x: -this.pos.x, y: this.pos.y, z: this.pos.z}); }; +Xform.prototype.xformVector = function (vector) { + return Vec3.multiplyQbyV(this.rot, vector); +} + +Xform.prototype.xformPoint = function (point) { + return Vec3.sum(Vec3.multiplyQbyV(this.rot, point), this.pos); +} + Xform.prototype.toString = function() { var rot = this.rot; var pos = this.pos; From 43d4dba4c0323d40bed0186269a6456995607ad9 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 27 Jun 2016 18:05:45 -0700 Subject: [PATCH 23/33] iterate over hotspots not entities. This makes it possible to render multiple hotspots per entity. Also, it will use the same logic to decide how to deal with overlapping entity equip hotspots. --- .../system/controllers/handControllerGrab.js | 145 +++++++++--------- scripts/system/libraries/utils.js | 8 +- 2 files changed, 78 insertions(+), 75 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index c814b4396f..fe95dda596 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -10,7 +10,7 @@ // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, Reticle, Messages, setEntityCustomData, getEntityCustomData, vec3toStr, Xform */ +/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, Reticle, Messages, setEntityCustomData, getEntityCustomData, vec3toStr, flatten, Xform */ Script.include("/~/system/libraries/utils.js"); Script.include("../libraries/Xform.js"); @@ -879,7 +879,7 @@ function MyController(hand) { }; this.createHotspots = function () { - var props, overlay; + var _this = this; var HAND_EQUIP_SPHERE_COLOR = { red: 90, green: 255, blue: 90 }; var HAND_EQUIP_SPHERE_ALPHA = 0.7; @@ -897,6 +897,7 @@ function MyController(hand) { this.hotspotOverlays = []; + var overlay; if (DRAW_HAND_SPHERES) { // add tiny green sphere around the palm. var handPosition = this.getHandPosition(); @@ -910,7 +911,6 @@ function MyController(hand) { ignoreRayIntersection: true, drawInFront: false }); - this.hotspotOverlays.push({ entityID: undefined, overlay: overlay, @@ -928,7 +928,6 @@ function MyController(hand) { ignoreRayIntersection: true, drawInFront: false }); - this.hotspotOverlays.push({ entityID: undefined, overlay: overlay, @@ -941,55 +940,54 @@ function MyController(hand) { this.entityPropertyCache.clear(); this.entityPropertyCache.findEntities(MyAvatar.position, HOTSPOT_DRAW_DISTANCE); - var _this = this; - this.entityPropertyCache.getEntities().forEach(function (entityID) { - var props = _this.entityPropertyCache.getProps(entityID); - if (_this.entityIsEquippableWithoutDistanceCheck(entityID)) { - var equipHotspots = _this.collectEquipHotspots(entityID); - var entityXform = new Xform(props.rotation, props.position); - var i, length = equipHotspots.length; - for (i = 0; i < length; i++) { - var hotspot = equipHotspots[i]; - overlay = Overlays.addOverlay("sphere", { - position: entityXform.xformPoint(hotspot.position), - size: hotspot.radius * 2, - color: EQUIP_SPHERE_COLOR, - alpha: EQUIP_SPHERE_ALPHA, + if (DRAW_GRAB_BOXES) { + // add blue box overlays for grabbable entities. + this.entityPropertyCache.getEntities().forEach(function (entityID) { + var props = _this.entityPropertyCache.getProps(entityID); + if (_this.entityIsGrabbable(entityID)) { + var overlay = Overlays.addOverlay("cube", { + rotation: props.rotation, + position: props.position, + size: props.dimensions, + color: GRAB_BOX_COLOR, + alpha: GRAB_BOX_ALPHA, solid: true, visible: true, ignoreRayIntersection: true, drawInFront: false }); - _this.hotspotOverlays.push({ entityID: entityID, overlay: overlay, - type: "equip", - localPosition: hotspot.position + type: "near", + localPosition: {x: 0, y: 0, z: 0} }); } - } + }); + } - if (DRAW_GRAB_BOXES && _this.entityIsGrabbable(entityID)) { - overlay = Overlays.addOverlay("cube", { - rotation: props.rotation, - position: props.position, - size: props.dimensions, - color: GRAB_BOX_COLOR, - alpha: GRAB_BOX_ALPHA, - solid: true, - visible: true, - ignoreRayIntersection: true, - drawInFront: false - }); - - _this.hotspotOverlays.push({ - entityID: entityID, - overlay: overlay, - type: "near", - localPosition: {x: 0, y: 0, z: 0} - }); - } + // add green spheres for each equippable hotspot. + flatten(this.entityPropertyCache.getEntities().map(function (entityID) { + return _this.collectEquipHotspots(entityID); + })).filter(function (hotspot) { + return _this.hotspotIsEquippable(hotspot); + }).forEach(function (hotspot) { + var overlay = Overlays.addOverlay("sphere", { + position: hotspot.worldPosition, + size: hotspot.radius * 2, + color: EQUIP_SPHERE_COLOR, + alpha: EQUIP_SPHERE_ALPHA, + solid: true, + visible: true, + ignoreRayIntersection: true, + drawInFront: false + }); + _this.hotspotOverlays.push({ + entityID: hotspot.entityID, + overlay: overlay, + type: "equip", + localPosition: hotspot.localPosition + }); }); }; @@ -1091,8 +1089,18 @@ function MyController(hand) { return grabbableProps && grabbableProps.wantsTrigger; }; + /// @param {UUID} entityID + // @returns {Object[]} array of objects with the following fields. + // * entityID {UUID} + // * localPosition {Vec3} position of the hotspot in object space. + // * worldPosition {vec3} position of the hotspot in world space. + // * radius {number} radius of equip hotspot + // * joints {Object} keys are joint names values are arrays of two elements: + // offset position {Vec3} and offset rotation {Quat}, both are in the coordinate system of the joint. this.collectEquipHotspots = function (entityID) { var result = []; + var props = this.entityPropertyCache.getProps(entityID); + var entityXform = new Xform(props.rotation, props.position); var equipHotspotsProps = this.entityPropertyCache.getEquipHotspotsProps(entityID); if (equipHotspotsProps && equipHotspotsProps.length > 0) { var i, length = equipHotspotsProps.length; @@ -1100,7 +1108,9 @@ function MyController(hand) { var hotspot = equipHotspotsProps[i]; if (hotspot.position && hotspot.radius && hotspot.joints) { result.push({ - position: hotspot.position, + entityID: entityID, + localPosition: hotspot.position, + worldPosition: entityXform.xformPoint(hotspot.position), radius: hotspot.radius, joints: hotspot.joints }); @@ -1110,7 +1120,9 @@ function MyController(hand) { var wearableProps = this.entityPropertyCache.getWearableProps(entityID); if (wearableProps && wearableProps.joints) { result.push({ - position: {x: 0, y: 0, z: 0}, + entityID: entityID, + localPosition: {x: 0, y: 0, z: 0}, + worldPosition: entityXform.pos, radius: EQUIP_RADIUS, joints: wearableProps.joints }); @@ -1119,13 +1131,10 @@ function MyController(hand) { return result; }; - this.entityIsEquippableWithDistanceCheck = function (entityID, handPosition, skipDistanceCheck) { - var distance; - var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; - var props = this.entityPropertyCache.getProps(entityID); - var grabProps = this.entityPropertyCache.getGrabProps(entityID); + this.hotspotIsEquippable = function (hotspot) { + var props = this.entityPropertyCache.getProps(hotspot.entityID); + var grabProps = this.entityPropertyCache.getGrabProps(hotspot.entityID); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); - var entityXform = new Xform(props.rotation, props.position); var refCount = ("refCount" in grabProps) ? grabProps.refCount : 0; if (refCount > 0) { @@ -1135,21 +1144,7 @@ function MyController(hand) { return false; } - var equipHotspots = this.collectEquipHotspots(entityID); - var i, length = equipHotspots.length; - for (i = 0; i < length; i++) { - var hotspot = equipHotspots[i]; - distance = Vec3.distance(entityXform.xformPoint(hotspot.position), handPosition); - if ((skipDistanceCheck || distance < hotspot.radius) && hotspot.joints[handJointName]) { - return true; - } - } - return false; - }; - - this.entityIsEquippableWithoutDistanceCheck = function (entityID) { - var handPosition = this.getHandPosition(); - return this.entityIsEquippableWithDistanceCheck(entityID, handPosition, true); + return true; }; this.entityIsGrabbable = function (entityID) { @@ -1285,22 +1280,24 @@ function MyController(hand) { this.entityPropertyCache.findEntities(handPosition, NEAR_GRAB_RADIUS); var candidateEntities = this.entityPropertyCache.getEntities(); - var equippableEntities = candidateEntities.filter(function (entity) { - return _this.entityIsEquippableWithDistanceCheck(entity, handPosition); + var equippableHotspots = flatten(candidateEntities.map(function (entityID) { + return _this.collectEquipHotspots(entityID); + })).filter(function (hotspot) { + return _this.hotspotIsEquippable(hotspot) && Vec3.distance(hotspot.worldPosition, handPosition) < hotspot.radius; }); var entity; - if (equippableEntities.length > 0) { + if (equippableHotspots.length > 0) { // sort by distance - equippableEntities.sort(function (a, b) { - var aDistance = Vec3.distance(_this.entityPropertyCache.getProps(a).position, handPosition); - var bDistance = Vec3.distance(_this.entityPropertyCache.getProps(b).position, handPosition); + equippableHotspots.sort(function (a, b) { + var aDistance = Vec3.distance(a.worldPosition, handPosition); + var bDistance = Vec3.distance(b.worldPosition, handPosition); return aDistance - bDistance; }); - entity = equippableEntities[0]; if (this.triggerSmoothedGrab()) { - this.grabbedEntity = entity; - this.setState(STATE_HOLD, "eqipping '" + this.entityPropertyCache.getProps(entity).name + "'"); + this.grabbedHotspot = equippableHotspots[0]; + this.grabbedEntity = equippableHotspots[0].entityID; + this.setState(STATE_HOLD, "eqipping '" + this.entityPropertyCache.getProps(this.grabbedEntity).name + "'"); return; } else { // TODO: highlight the equippable object? diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js index f39f4d7913..b7de9b012c 100644 --- a/scripts/system/libraries/utils.js +++ b/scripts/system/libraries/utils.js @@ -309,5 +309,11 @@ calculateHandSizeRatio = function() { clamp = function(val, min, max){ return Math.max(min, Math.min(max, val)) - } +} +// flattens an array of arrays into a single array +// example: flatten([[1], [3, 4], []) => [1, 3, 4] +// NOTE: only does one level of flattening, it is not recursive. +flatten = function(array) { + return [].concat.apply([], array); +} From 6072487c9c388374e707a17fdb69b7d629e7f37b Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 29 Jun 2016 17:28:53 -0700 Subject: [PATCH 24/33] Equip-points attachments work Also made handControllerGrab.js eslint clean. --- .../system/controllers/handControllerGrab.js | 197 ++++++++---------- 1 file changed, 82 insertions(+), 115 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index fe95dda596..d37602f8e6 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -10,7 +10,7 @@ // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -/*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, Reticle, Messages, setEntityCustomData, getEntityCustomData, vec3toStr, flatten, Xform */ +/* global setEntityCustomData, getEntityCustomData, vec3toStr, flatten, Xform */ Script.include("/~/system/libraries/utils.js"); Script.include("../libraries/Xform.js"); @@ -139,7 +139,7 @@ var DEFAULT_GRABBABLE_DATA = { var USE_BLACKLIST = true; var blacklist = []; -//we've created various ways of visualizing looking for and moving distant objects +// we've created various ways of visualizing looking for and moving distant objects var USE_ENTITY_LINES_FOR_SEARCHING = false; var USE_OVERLAY_LINES_FOR_SEARCHING = true; @@ -255,7 +255,8 @@ function isIn2DMode() { // In this version, we make our own determination of whether we're aimed a HUD element, // because other scripts (such as handControllerPointer) might be using some other visualization // instead of setting Reticle.visible. - return EXTERNALLY_MANAGED_2D_MINOR_MODE && (Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position)); + return (EXTERNALLY_MANAGED_2D_MINOR_MODE && + (Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position))); } function restore2DMode() { if (!EXTERNALLY_MANAGED_2D_MINOR_MODE) { @@ -274,7 +275,7 @@ EntityPropertiesCache.prototype.clear = function() { EntityPropertiesCache.prototype.findEntities = function(position, radius) { var entities = Entities.findEntities(position, radius); var _this = this; - entities.forEach(function (x) { + entities.forEach(function(x) { _this.updateEntity(x); }); }; @@ -286,7 +287,7 @@ EntityPropertiesCache.prototype.updateEntity = function(entityID) { if (props.userData) { try { userData = JSON.parse(props.userData); - } catch(err) { + } catch (err) { print("WARNING: malformed userData on " + entityID + ", name = " + props.name + ", error = " + err); } } @@ -296,9 +297,9 @@ EntityPropertiesCache.prototype.updateEntity = function(entityID) { }; EntityPropertiesCache.prototype.getEntities = function() { return Object.keys(this.cache); -} +}; EntityPropertiesCache.prototype.getProps = function(entityID) { - var obj = this.cache[entityID] + var obj = this.cache[entityID]; return obj ? obj : undefined; }; EntityPropertiesCache.prototype.getGrabbableProps = function(entityID) { @@ -346,7 +347,7 @@ function MyController(hand) { this.getHandRotation = function() { var controllerHandInput = (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand; return Quat.multiply(MyAvatar.orientation, Controller.getPoseValue(controllerHandInput).rotation); - } + }; this.actionID = null; // action this script created... this.grabbedEntity = null; // on this entity. @@ -359,11 +360,11 @@ function MyController(hand) { this.rawSecondaryValue = 0; this.rawThumbValue = 0; - //for visualizations + // for visualizations this.overlayLine = null; this.particleBeamObject = null; - //for lights + // for lights this.spotlight = null; this.pointlight = null; this.overlayLine = null; @@ -388,7 +389,7 @@ function MyController(hand) { var _this = this; var suppressedIn2D = [STATE_OFF, STATE_SEARCHING]; - this.ignoreInput = function () { + this.ignoreInput = function() { // We've made the decision to use 'this' for new code, even though it is fragile, // in order to keep/ the code uniform without making any no-op line changes. return (-1 !== suppressedIn2D.indexOf(this.state)) && isIn2DMode(); @@ -419,7 +420,7 @@ function MyController(hand) { this.callEntityMethodOnGrabbed = function(entityMethodName) { var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID]; Entities.callEntityMethod(this.grabbedEntity, entityMethodName, args); - } + }; this.setState = function(newState, reason) { @@ -517,7 +518,7 @@ function MyController(hand) { ignoreRayIntersection: true, drawInFront: true, // Even when burried inside of something, show it. visible: true - } + }; this.searchSphere = Overlays.addOverlay("sphere", sphereProperties); } else { Overlays.editOverlay(this.searchSphere, { @@ -527,7 +528,7 @@ function MyController(hand) { visible: true }); } - } + }; this.overlayLineOn = function(closePoint, farPoint, color) { if (this.overlayLine === null) { @@ -576,7 +577,7 @@ function MyController(hand) { this.overlayLineOn(handPosition, searchSphereLocation, (this.triggerSmoothedGrab() || this.secondarySqueezed()) ? INTERSECT_COLOR : NO_INTERSECT_COLOR); } - } + }; this.handleDistantParticleBeam = function(handPosition, objectPosition, color) { @@ -643,7 +644,7 @@ function MyController(hand) { "alphaFinish": 1, "additiveBlending": 0, "textures": "https://hifi-content.s3.amazonaws.com/alan/dev/textures/grabsprite-3.png" - } + }; this.particleBeamObject = Entities.addEntity(particleBeamPropertiesObject); }; @@ -657,7 +658,7 @@ function MyController(hand) { emitSpeed: speed, speedSpread: spread, lifespan: lifespan - }) + }); }; this.evalLightWorldTransform = function(modelPos, modelRot) { @@ -711,9 +712,9 @@ function MyController(hand) { this.spotlight = Entities.addEntity(lightProperties); } else { Entities.editEntity(this.spotlight, { - //without this, this light would maintain rotation with its parent + // without this, this light would maintain rotation with its parent rotation: Quat.fromPitchYawRollDegrees(-90, 0, 0) - }) + }); } }; @@ -777,7 +778,7 @@ function MyController(hand) { Entities.deleteEntity(this.particleBeamObject); this.particleBeamObject = null; } - } + }; this.turnLightsOff = function() { if (this.spotlight !== null) { @@ -853,7 +854,7 @@ function MyController(hand) { this.thumbPress = function(value) { _this.rawThumbValue = value; - } + }; this.thumbPressed = function() { return _this.rawThumbValue > THUMB_ON_VALUE; @@ -878,7 +879,7 @@ function MyController(hand) { } }; - this.createHotspots = function () { + this.createHotspots = function() { var _this = this; var HAND_EQUIP_SPHERE_COLOR = { red: 90, green: 255, blue: 90 }; @@ -942,7 +943,7 @@ function MyController(hand) { if (DRAW_GRAB_BOXES) { // add blue box overlays for grabbable entities. - this.entityPropertyCache.getEntities().forEach(function (entityID) { + this.entityPropertyCache.getEntities().forEach(function(entityID) { var props = _this.entityPropertyCache.getProps(entityID); if (_this.entityIsGrabbable(entityID)) { var overlay = Overlays.addOverlay("cube", { @@ -967,11 +968,11 @@ function MyController(hand) { } // add green spheres for each equippable hotspot. - flatten(this.entityPropertyCache.getEntities().map(function (entityID) { + flatten(this.entityPropertyCache.getEntities().map(function(entityID) { return _this.collectEquipHotspots(entityID); - })).filter(function (hotspot) { + })).filter(function(hotspot) { return _this.hotspotIsEquippable(hotspot); - }).forEach(function (hotspot) { + }).forEach(function(hotspot) { var overlay = Overlays.addOverlay("sphere", { position: hotspot.worldPosition, size: hotspot.radius * 2, @@ -994,14 +995,17 @@ function MyController(hand) { this.updateHotspots = function() { var _this = this; var props; - this.hotspotOverlays.forEach(function (overlayInfo) { + this.hotspotOverlays.forEach(function(overlayInfo) { if (overlayInfo.type === "hand") { Overlays.editOverlay(overlayInfo.overlay, { position: _this.getHandPosition() }); } else if (overlayInfo.type === "equip") { _this.entityPropertyCache.updateEntity(overlayInfo.entityID); props = _this.entityPropertyCache.getProps(overlayInfo.entityID); var entityXform = new Xform(props.rotation, props.position); - Overlays.editOverlay(overlayInfo.overlay, { position: entityXform.xformPoint(overlayInfo.localPosition), rotation: props.rotation }); + Overlays.editOverlay(overlayInfo.overlay, { + position: entityXform.xformPoint(overlayInfo.localPosition), + rotation: props.rotation + }); } else if (overlayInfo.type === "near") { _this.entityPropertyCache.updateEntity(overlayInfo.entityID); props = _this.entityPropertyCache.getProps(overlayInfo.entityID); @@ -1011,7 +1015,7 @@ function MyController(hand) { }; this.destroyHotspots = function() { - this.hotspotOverlays.forEach(function (overlayInfo) { + this.hotspotOverlays.forEach(function(overlayInfo) { Overlays.deleteOverlay(overlayInfo.overlay); }); this.hotspotOverlays = []; @@ -1025,14 +1029,14 @@ function MyController(hand) { this.destroyHotspots(); }; - /// // Performs ray pick test from the hand controller into the world // @param {number} which hand to use, RIGHT_HAND or LEFT_HAND // @returns {object} returns object with two keys entityID and distance // this.calcRayPickInfo = function(hand) { - var pose = Controller.getPoseValue((hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand); + var standardControllerValue = (hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand; + var pose = Controller.getPoseValue(standardControllerValue); var worldHandPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, pose.translation), MyAvatar.position); var worldHandRotation = Quat.multiply(MyAvatar.orientation, pose.rotation); @@ -1071,33 +1075,37 @@ function MyController(hand) { } var overlayIntersection = Overlays.findRayIntersection(pickRayBacked); - if (!intersection.intersects || (overlayIntersection.intersects && (intersection.distance > overlayIntersection.distance))) { + if (!intersection.intersects || + (overlayIntersection.intersects && (intersection.distance > overlayIntersection.distance))) { intersection = overlayIntersection; } if (intersection.intersects) { - return { entityID: intersection.entityID, - searchRay: pickRay, - distance: Vec3.distance(pickRay.origin, intersection.intersection) } + return { + entityID: intersection.entityID, + searchRay: pickRay, + distance: Vec3.distance(pickRay.origin, intersection.intersection) + }; } else { return result; } }; - this.entityWantsTrigger = function (entityID) { + this.entityWantsTrigger = function(entityID) { var grabbableProps = this.entityPropertyCache.getGrabbableProps(entityID); return grabbableProps && grabbableProps.wantsTrigger; }; - /// @param {UUID} entityID - // @returns {Object[]} array of objects with the following fields. + // returns a list of all equip-hotspots assosiated with this entity. + // @param {UUID} entityID + // @returns {Object[]} array of objects with the following fields. // * entityID {UUID} // * localPosition {Vec3} position of the hotspot in object space. // * worldPosition {vec3} position of the hotspot in world space. // * radius {number} radius of equip hotspot // * joints {Object} keys are joint names values are arrays of two elements: // offset position {Vec3} and offset rotation {Quat}, both are in the coordinate system of the joint. - this.collectEquipHotspots = function (entityID) { + this.collectEquipHotspots = function(entityID) { var result = []; var props = this.entityPropertyCache.getProps(entityID); var entityXform = new Xform(props.rotation, props.position); @@ -1131,7 +1139,7 @@ function MyController(hand) { return result; }; - this.hotspotIsEquippable = function (hotspot) { + this.hotspotIsEquippable = function(hotspot) { var props = this.entityPropertyCache.getProps(hotspot.entityID); var grabProps = this.entityPropertyCache.getGrabProps(hotspot.entityID); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); @@ -1147,7 +1155,7 @@ function MyController(hand) { return true; }; - this.entityIsGrabbable = function (entityID) { + this.entityIsGrabbable = function(entityID) { var grabbableProps = this.entityPropertyCache.getGrabbableProps(entityID); var grabProps = this.entityPropertyCache.getGrabProps(entityID); var props = this.entityPropertyCache.getProps(entityID); @@ -1280,16 +1288,16 @@ function MyController(hand) { this.entityPropertyCache.findEntities(handPosition, NEAR_GRAB_RADIUS); var candidateEntities = this.entityPropertyCache.getEntities(); - var equippableHotspots = flatten(candidateEntities.map(function (entityID) { + var equippableHotspots = flatten(candidateEntities.map(function(entityID) { return _this.collectEquipHotspots(entityID); - })).filter(function (hotspot) { + })).filter(function(hotspot) { return _this.hotspotIsEquippable(hotspot) && Vec3.distance(hotspot.worldPosition, handPosition) < hotspot.radius; }); var entity; if (equippableHotspots.length > 0) { // sort by distance - equippableHotspots.sort(function (a, b) { + equippableHotspots.sort(function(a, b) { var aDistance = Vec3.distance(a.worldPosition, handPosition); var bDistance = Vec3.distance(b.worldPosition, handPosition); return aDistance - bDistance; @@ -1304,7 +1312,7 @@ function MyController(hand) { } } - var grabbableEntities = candidateEntities.filter(function (entity) { + var grabbableEntities = candidateEntities.filter(function(entity) { return _this.entityIsNearGrabbable(entity, handPosition, NEAR_GRAB_MAX_DISTANCE); }); @@ -1321,7 +1329,7 @@ function MyController(hand) { if (grabbableEntities.length > 0) { // sort by distance - grabbableEntities.sort(function (a, b) { + grabbableEntities.sort(function(a, b) { var aDistance = Vec3.distance(_this.entityPropertyCache.getProps(a).position, handPosition); var bDistance = Vec3.distance(_this.entityPropertyCache.getProps(b).position, handPosition); return aDistance - bDistance; @@ -1381,9 +1389,11 @@ function MyController(hand) { } } - //search line visualizations + // search line visualizations if (USE_ENTITY_LINES_FOR_SEARCHING === true) { - this.lineOn(rayPickInfo.searchRay.origin, Vec3.multiply(rayPickInfo.searchRay.direction, LINE_LENGTH), NO_INTERSECT_COLOR); + this.lineOn(rayPickInfo.searchRay.origin, + Vec3.multiply(rayPickInfo.searchRay.direction, LINE_LENGTH), + NO_INTERSECT_COLOR); } this.searchIndicatorOn(rayPickInfo.searchRay); @@ -1398,11 +1408,11 @@ function MyController(hand) { timeScale = DISTANCE_HOLDING_ACTION_TIMEFRAME; } return timeScale; - } + }; this.getMass = function(dimensions, density) { return (dimensions.x * dimensions.y * dimensions.z) * density; - } + }; this.distanceHoldingEnter = function() { @@ -1529,7 +1539,8 @@ function MyController(hand) { var RADIAL_GRAB_AMPLIFIER = 10.0; if (Math.abs(this.grabRadialVelocity) > 0.0) { - this.grabRadius = this.grabRadius + (this.grabRadialVelocity * deltaObjectTime * this.grabRadius * RADIAL_GRAB_AMPLIFIER); + this.grabRadius = this.grabRadius + (this.grabRadialVelocity * deltaObjectTime * + this.grabRadius * RADIAL_GRAB_AMPLIFIER); } var newTargetPosition = Vec3.multiply(this.grabRadius, Quat.getUp(controllerRotation)); @@ -1557,30 +1568,9 @@ function MyController(hand) { } } - // var defaultConstraintData = { - // axisStart: false, - // axisEnd: false - // } - // - // var constraintData = getEntityCustomData('lightModifierKey', this.grabbedEntity, defaultConstraintData); - // var clampedVector; - // var targetPosition; - // if (constraintData.axisStart !== false) { - // clampedVector = this.projectVectorAlongAxis(this.currentObjectPosition, - // constraintData.axisStart, - // constraintData.axisEnd); - // targetPosition = clampedVector; - // } else { - // targetPosition = { - // x: this.currentObjectPosition.x, - // y: this.currentObjectPosition.y, - // z: this.currentObjectPosition.z - // } - // } - var handPosition = this.getHandPosition(); - //visualizations + // visualizations if (USE_ENTITY_LINES_FOR_MOVING === true) { this.lineOn(handPosition, Vec3.subtract(grabbedProperties.position, handPosition), INTERSECT_COLOR); } @@ -1588,7 +1578,7 @@ function MyController(hand) { this.overlayLineOn(handPosition, grabbedProperties.position, INTERSECT_COLOR); } if (USE_PARTICLE_BEAM_FOR_MOVING === true) { - this.handleDistantParticleBeam(handPosition, grabbedProperties.position, INTERSECT_COLOR) + this.handleDistantParticleBeam(handPosition, grabbedProperties.position, INTERSECT_COLOR); } if (USE_POINTLIGHT === true) { this.handlePointLight(this.grabbedEntity); @@ -1648,46 +1638,17 @@ function MyController(hand) { scalar = 1; } var projection = Vec3.sum(axisStart, Vec3.multiply(scalar, Vec3.normalize(bPrime))); - return projection + return projection; }; - this.hasPresetOffsets = function() { - var wearableData = getEntityCustomData('wearable', this.grabbedEntity, {joints: {}}); - if ("joints" in wearableData) { - var allowedJoints = wearableData.joints; - var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; - if (handJointName in allowedJoints) { - return true; - } - } - return false; - } - - this.getPresetPosition = function() { - var wearableData = getEntityCustomData('wearable', this.grabbedEntity, {joints: {}}); - var allowedJoints = wearableData.joints; - var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; - if (handJointName in allowedJoints) { - return allowedJoints[handJointName][0]; - } - } - - this.getPresetRotation = function() { - var wearableData = getEntityCustomData('wearable', this.grabbedEntity, {joints: {}}); - var allowedJoints = wearableData.joints; - var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; - if (handJointName in allowedJoints) { - return allowedJoints[handJointName][1]; - } - } - this.dropGestureReset = function() { this.fastHandMoveDetected = false; this.fastHandMoveTimer = 0; }; this.dropGestureProcess = function(deltaTime) { - var pose = Controller.getPoseValue((this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand); + var standardControllerValue = (this.hand === RIGHT_HAND) ? Controller.Standard.RightHand : Controller.Standard.LeftHand; + var pose = Controller.getPoseValue(standardControllerValue); var worldHandVelocity = Vec3.multiplyQbyV(MyAvatar.orientation, pose.velocity); var worldHandRotation = Quat.multiply(MyAvatar.orientation, pose.rotation); @@ -1745,13 +1706,17 @@ function MyController(hand) { var handPosition = this.getHandPosition(); var hasPresetPosition = false; - if (this.state == STATE_HOLD && this.hasPresetOffsets()) { + if (this.state == STATE_HOLD && this.grabbedHotspot) { var grabbableData = getEntityCustomData(GRABBABLE_DATA_KEY, this.grabbedEntity, DEFAULT_GRABBABLE_DATA); // if an object is "equipped" and has a predefined offset, use it. this.ignoreIK = grabbableData.ignoreIK ? grabbableData.ignoreIK : false; - this.offsetPosition = this.getPresetPosition(); - this.offsetRotation = this.getPresetRotation(); - hasPresetPosition = true; + + var handJointName = this.hand === RIGHT_HAND ? "RightHand" : "LeftHand"; + if (this.grabbedHotspot.joints[handJointName]) { + this.offsetPosition = this.grabbedHotspot.joints[handJointName][0]; + this.offsetRotation = this.grabbedHotspot.joints[handJointName][1]; + hasPresetPosition = true; + } } else { this.ignoreIK = false; @@ -1784,7 +1749,7 @@ function MyController(hand) { var reparentProps = { parentID: MyAvatar.sessionUUID, parentJointIndex: handJointIndex - } + }; if (hasPresetPosition) { reparentProps["localPosition"] = this.offsetPosition; reparentProps["localRotation"] = this.offsetRotation; @@ -2022,6 +1987,7 @@ function MyController(hand) { })); this.grabbedEntity = null; + this.grabbedHotspot = null; if (this.triggerSmoothedGrab()) { this.waitForTriggerRelease = true; @@ -2124,7 +2090,7 @@ function MyController(hand) { print("disconnecting stray child of hand: (" + _this.hand + ") " + childID); Entities.editEntity(childID, {parentID: NULL_UUID}); }); - } + }; this.deactivateEntity = function(entityID, noVelocity) { var deactiveProps; @@ -2149,7 +2115,7 @@ function MyController(hand) { // things that are held by parenting and dropped with no velocity will end up as "static" in bullet. If // it looks like the dropped thing should fall, give it a little velocity. - var props = Entities.getEntityProperties(entityID, ["parentID", "velocity", "dynamic", "shapeType"]) + var props = Entities.getEntityProperties(entityID, ["parentID", "velocity", "dynamic", "shapeType"]); var parentID = props.parentID; var doSetVelocity = false; @@ -2231,7 +2197,8 @@ mapping.from([Controller.Standard.RightPrimaryThumb]).peek().to(rightController. Controller.enableMapping(MAPPING_NAME); -//the section below allows the grab script to listen for messages that disable either one or both hands. useful for two handed items +// the section below allows the grab script to listen for messages +// that disable either one or both hands. useful for two handed items var handToDisable = 'none'; function update(deltaTime) { @@ -2294,7 +2261,7 @@ var handleHandMessages = function(channel, message, sender) { } } } -} +}; Messages.messageReceived.connect(handleHandMessages); From 759b3065fc8693bca06b89134b7a91a87cdccec4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 30 Jun 2016 20:48:19 +1200 Subject: [PATCH 25/33] Distinguish between file name and directory as prompt in file chooser --- interface/resources/qml/dialogs/FileDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml index 5372028da5..fa5be18cd3 100644 --- a/interface/resources/qml/dialogs/FileDialog.qml +++ b/interface/resources/qml/dialogs/FileDialog.qml @@ -603,7 +603,7 @@ ModalWindow { TextField { id: currentSelection - label: "Path:" + label: selectDirectory ? "Directory:" : "File name:" anchors { left: parent.left right: selectionType.visible ? selectionType.left: parent.right From 1f451269cd7b67bd94554a21f85830fefd92e546 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 30 Jun 2016 13:22:01 -0700 Subject: [PATCH 26/33] Allow scripts to receive a visibility changed signal from their windows --- libraries/ui/src/QmlWindowClass.cpp | 1 + libraries/ui/src/QmlWindowClass.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp index c0eba4abf3..7d56e51495 100644 --- a/libraries/ui/src/QmlWindowClass.cpp +++ b/libraries/ui/src/QmlWindowClass.cpp @@ -123,6 +123,7 @@ void QmlWindowClass::initQml(QVariantMap properties) { // Forward messages received from QML on to the script connect(_qmlWindow, SIGNAL(sendToScript(QVariant)), this, SLOT(qmlToScript(const QVariant&)), Qt::QueuedConnection); + connect(_qmlWindow, SIGNAL(visibleChanged()), this, SIGNAL(visibleChanged()), Qt::QueuedConnection); }); } Q_ASSERT(_qmlWindow); diff --git a/libraries/ui/src/QmlWindowClass.h b/libraries/ui/src/QmlWindowClass.h index e1865b133a..c30027df6e 100644 --- a/libraries/ui/src/QmlWindowClass.h +++ b/libraries/ui/src/QmlWindowClass.h @@ -24,7 +24,7 @@ class QmlWindowClass : public QObject { Q_OBJECT Q_PROPERTY(glm::vec2 position READ getPosition WRITE setPosition NOTIFY positionChanged) Q_PROPERTY(glm::vec2 size READ getSize WRITE setSize NOTIFY sizeChanged) - Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibilityChanged) + Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) public: static QScriptValue constructor(QScriptContext* context, QScriptEngine* engine); @@ -52,7 +52,7 @@ public slots: void sendToQml(const QVariant& message); signals: - void visibilityChanged(bool visible); // Tool window + void visibleChanged(); void positionChanged(); void sizeChanged(); void moved(glm::vec2 position); From 82b1cba81dcba949e1eaf3095c110a72ad90176e Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 30 Jun 2016 13:58:44 -0700 Subject: [PATCH 27/33] equip improvements Allow the user to equip an object while near or far grabbing it from the other hand. --- scripts/system/controllers/handControllerGrab.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index d37602f8e6..7a0bfc85cf 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -1144,10 +1144,11 @@ function MyController(hand) { var grabProps = this.entityPropertyCache.getGrabProps(hotspot.entityID); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); + // Controller.Standard.LeftHand var refCount = ("refCount" in grabProps) ? grabProps.refCount : 0; - if (refCount > 0) { + if (refCount > 0 && this.getOtherHandController().grabbedEntity != hotspot.entityID) { if (debug) { - print("equip is skipping '" + props.name + "': it is already grabbed"); + print("equip is skipping '" + props.name + "': grabbed by someone else"); } return false; } @@ -1698,6 +1699,12 @@ function MyController(hand) { this.grabbedEntity = saveGrabbedID; } + var otherHandController = this.getOtherHandController(); + if (otherHandController.grabbedEntity == this.grabbedEntity && + (otherHandController.state == STATE_NEAR_GRABBING || otherHandController.state == STATE_DISTANCE_HOLDING)) { + otherHandController.setState(STATE_OFF, "other hand grabbed this entity"); + } + var grabbedProperties = Entities.getEntityProperties(this.grabbedEntity, GRABBABLE_PROPERTIES); this.activateEntity(this.grabbedEntity, grabbedProperties, false); @@ -1818,7 +1825,6 @@ function MyController(hand) { return; } - var now = Date.now(); if (now - this.lastUnequipCheckTime > MSECS_PER_SEC * CHECK_TOO_FAR_UNEQUIP_TIME) { this.lastUnequipCheckTime = now; @@ -2176,6 +2182,10 @@ function MyController(hand) { } setEntityCustomData(GRAB_USER_DATA_KEY, entityID, data); }; + + this.getOtherHandController = function() { + return (this.hand === RIGHT_HAND) ? leftController : rightController; + }; } var rightController = new MyController(RIGHT_HAND); From 5b343c9b82e322f6452c4e3f48244fe55272457e Mon Sep 17 00:00:00 2001 From: Zander Otavka Date: Thu, 30 Jun 2016 14:18:07 -0700 Subject: [PATCH 28/33] Fix eslint descrepencies Prohibit trailing commas, and fix function spacing rule to be more in line with the coding standard. Also prohibit leading decimal points, also specified in coding standard. --- .eslintrc.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index e866713b11..a7f4291257 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -52,13 +52,14 @@ module.exports = { }, "rules": { "brace-style": ["error", "1tbs", { "allowSingleLine": false }], - "comma-dangle": ["error", "only-multiline"], + "comma-dangle": ["error", "never"], "camelcase": ["error"], "curly": ["error", "all"], "indent": ["error", 4, { "SwitchCase": 1 }], "keyword-spacing": ["error", { "before": true, "after": true }], "max-len": ["error", 128, 4], "new-cap": ["error"], + "no-floating-decimal": ["error"], //"no-magic-numbers": ["error", { "ignore": [0, 1], "ignoreArrayIndexes": true }], "no-multiple-empty-lines": ["error"], "no-multi-spaces": ["error"], @@ -67,6 +68,6 @@ module.exports = { "spaced-comment": ["error", "always", { "line": { "markers": ["/"] } }], - "space-before-function-paren": ["error", "never"] + "space-before-function-paren": ["error", {"anonymous": "always", "named": "never"}] } }; From dfb6cb1aa340f04d4116efc8c621fa3d08f08aca Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 30 Jun 2016 14:25:36 -0700 Subject: [PATCH 29/33] Updating entity list --- scripts/system/libraries/entityList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/libraries/entityList.js b/scripts/system/libraries/entityList.js index e9baeac86c..448293a2ac 100644 --- a/scripts/system/libraries/entityList.js +++ b/scripts/system/libraries/entityList.js @@ -111,8 +111,8 @@ EntityListTool = function(opts) { } }); - webView.visibilityChanged.connect(function (visible) { - if (visible) { + webView.visibleChanged.connect(function () { + if (webView.visible) { that.sendUpdate(); } }); From 69ffd63ba702417de9edc2b33bd24c05e9dee125 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 30 Jun 2016 15:42:48 -0700 Subject: [PATCH 30/33] fix snapshot sharing window --- interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml | 2 +- interface/src/Application.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml b/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml index 3dacb3b39c..f99b770a78 100644 --- a/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml +++ b/interface/resources/qml/hifi/dialogs/SnapshotShareDialog.qml @@ -7,7 +7,7 @@ import "../../windows" import "../../js/Utils.js" as Utils import "../models" -ScrollingWindow { +Window { id: root resizable: true width: 516 diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5978461dcf..1c9ec94dc4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4998,7 +4998,6 @@ void Application::takeSnapshot() { DependencyManager::get()->load("hifi/dialogs/SnapshotShareDialog.qml", [=](QQmlContext*, QObject* dialog) { dialog->setProperty("source", QUrl::fromLocalFile(fileName)); - connect(dialog, SIGNAL(uploadSnapshot(const QString& snapshot)), this, SLOT(uploadSnapshot(const QString& snapshot))); }); } From d8e5e3cbe4b1c7af668193d738e6ef0f941de7fa Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 30 Jun 2016 16:00:18 -0700 Subject: [PATCH 31/33] equip bug fix you should not be able to equip an object that is already equipped, with your other hand. --- scripts/system/controllers/handControllerGrab.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index 7a0bfc85cf..ecece8c4f7 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -1144,9 +1144,11 @@ function MyController(hand) { var grabProps = this.entityPropertyCache.getGrabProps(hotspot.entityID); var debug = (WANT_DEBUG_SEARCH_NAME && props.name === WANT_DEBUG_SEARCH_NAME); - // Controller.Standard.LeftHand var refCount = ("refCount" in grabProps) ? grabProps.refCount : 0; - if (refCount > 0 && this.getOtherHandController().grabbedEntity != hotspot.entityID) { + var okToEquipFromOtherHand = ((this.getOtherHandController().state == STATE_NEAR_GRABBING || + this.getOtherHandController().state == STATE_DISTANCE_HOLDING) && + this.getOtherHandController().grabbedEntity == hotspot.entityID); + if (refCount > 0 && !okToEquipFromOtherHand) { if (debug) { print("equip is skipping '" + props.name + "': grabbed by someone else"); } From b7926b8582829bc3ac444b401b5548f7872c21d8 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 30 Jun 2016 16:11:05 -0700 Subject: [PATCH 32/33] Don't render wire geometry with lighting effects --- interface/src/ui/overlays/Circle3DOverlay.cpp | 7 +++++-- interface/src/ui/overlays/Cube3DOverlay.cpp | 6 +++--- interface/src/ui/overlays/Grid3DOverlay.cpp | 5 +++-- interface/src/ui/overlays/Image3DOverlay.cpp | 8 +++++--- interface/src/ui/overlays/Line3DOverlay.cpp | 9 ++++++--- interface/src/ui/overlays/Rectangle3DOverlay.cpp | 8 +++++--- interface/src/ui/overlays/Sphere3DOverlay.cpp | 4 ++-- interface/src/ui/overlays/Web3DOverlay.cpp | 4 +++- libraries/render-utils/src/GeometryCache.cpp | 5 +++++ libraries/render-utils/src/GeometryCache.h | 8 +++++--- 10 files changed, 42 insertions(+), 22 deletions(-) diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp index 8fb3a36919..1abcb0f5c0 100644 --- a/interface/src/ui/overlays/Circle3DOverlay.cpp +++ b/interface/src/ui/overlays/Circle3DOverlay.cpp @@ -97,7 +97,7 @@ void Circle3DOverlay::render(RenderArgs* args) { _lastColor = colorX; auto geometryCache = DependencyManager::get(); - + Q_ASSERT(args->_batch); auto& batch = *args->_batch; @@ -149,6 +149,7 @@ void Circle3DOverlay::render(RenderArgs* args) { geometryCache->updateVertices(_quadVerticesID, points, color); } + geometryCache->bindSimpleProgram(batch); geometryCache->renderVertices(batch, gpu::TRIANGLES, _quadVerticesID); } else { @@ -187,6 +188,8 @@ void Circle3DOverlay::render(RenderArgs* args) { geometryCache->updateVertices(_lineVerticesID, points, color); } + // Render unlit + geometryCache->bindSimpleProgram(batch, false, false, true); if (getIsDashedLine()) { geometryCache->renderVertices(batch, gpu::LINES, _lineVerticesID); } else { @@ -279,7 +282,7 @@ void Circle3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Circle3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withoutCullFace(); + auto builder = render::ShapeKey::Builder().withOwnPipeline(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } diff --git a/interface/src/ui/overlays/Cube3DOverlay.cpp b/interface/src/ui/overlays/Cube3DOverlay.cpp index 38650f9fda..17894aa091 100644 --- a/interface/src/ui/overlays/Cube3DOverlay.cpp +++ b/interface/src/ui/overlays/Cube3DOverlay.cpp @@ -48,7 +48,7 @@ void Cube3DOverlay::render(RenderArgs* args) { auto geometryCache = DependencyManager::get(); auto pipeline = args->_pipeline; if (!pipeline) { - pipeline = geometryCache->getShapePipeline(); + pipeline = _isSolid ? geometryCache->getShapePipeline() : geometryCache->getWireShapePipeline(); } if (_isSolid) { @@ -56,7 +56,7 @@ void Cube3DOverlay::render(RenderArgs* args) { batch->setModelTransform(transform); geometryCache->renderSolidCubeInstance(*batch, cubeColor, pipeline); } else { - + geometryCache->bindSimpleProgram(*batch, false, false, true, true); if (getIsDashedLine()) { transform.setScale(1.0f); batch->setModelTransform(transform); @@ -97,7 +97,7 @@ void Cube3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Cube3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder(); + auto builder = render::ShapeKey::Builder().withOwnPipeline(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } diff --git a/interface/src/ui/overlays/Grid3DOverlay.cpp b/interface/src/ui/overlays/Grid3DOverlay.cpp index edc27e35f2..7d86395937 100644 --- a/interface/src/ui/overlays/Grid3DOverlay.cpp +++ b/interface/src/ui/overlays/Grid3DOverlay.cpp @@ -75,10 +75,11 @@ void Grid3DOverlay::render(RenderArgs* args) { transform.setScale(glm::vec3(getDimensions(), 1.0f)); transform.setTranslation(position); batch->setModelTransform(transform); - + auto geometryCache = DependencyManager::get(); + geometryCache->bindSimpleProgram(*batch, false, false, true, true); const float MINOR_GRID_EDGE = 0.0025f; const float MAJOR_GRID_EDGE = 0.005f; - DependencyManager::get()->renderGrid(*batch, minCorner, maxCorner, + geometryCache->renderGrid(*batch, minCorner, maxCorner, _minorGridRowDivisions, _minorGridColDivisions, MINOR_GRID_EDGE, _majorGridRowDivisions, _majorGridColDivisions, MAJOR_GRID_EDGE, gridColor, _drawInFront); diff --git a/interface/src/ui/overlays/Image3DOverlay.cpp b/interface/src/ui/overlays/Image3DOverlay.cpp index fd0d2bcedf..72ae246859 100644 --- a/interface/src/ui/overlays/Image3DOverlay.cpp +++ b/interface/src/ui/overlays/Image3DOverlay.cpp @@ -92,8 +92,10 @@ void Image3DOverlay::render(RenderArgs* args) { batch->setModelTransform(transform); batch->setResourceTexture(0, _texture->getGPUTexture()); - - DependencyManager::get()->renderQuad( + + auto geometryCache = DependencyManager::get(); + geometryCache->bindSimpleProgram(*batch, true, false); + geometryCache->renderQuad( *batch, topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, glm::vec4(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha) ); @@ -102,7 +104,7 @@ void Image3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Image3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withoutCullFace().withDepthBias(); + auto builder = render::ShapeKey::Builder().withOwnPipeline(); if (_emissive) { builder.withUnlit(); } diff --git a/interface/src/ui/overlays/Line3DOverlay.cpp b/interface/src/ui/overlays/Line3DOverlay.cpp index 3971e91211..d53b287f76 100644 --- a/interface/src/ui/overlays/Line3DOverlay.cpp +++ b/interface/src/ui/overlays/Line3DOverlay.cpp @@ -54,17 +54,20 @@ void Line3DOverlay::render(RenderArgs* args) { if (batch) { batch->setModelTransform(_transform); + auto geometryCache = DependencyManager::get(); + geometryCache->bindSimpleProgram(*batch, false, false, true, true); if (getIsDashedLine()) { // TODO: add support for color to renderDashedLine() - DependencyManager::get()->renderDashedLine(*batch, _start, _end, colorv4, _geometryCacheID); + geometryCache->renderDashedLine(*batch, _start, _end, colorv4, _geometryCacheID); } else { - DependencyManager::get()->renderLine(*batch, _start, _end, colorv4, _geometryCacheID); + + geometryCache->renderLine(*batch, _start, _end, colorv4, _geometryCacheID); } } } const render::ShapeKey Line3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withoutCullFace(); + auto builder = render::ShapeKey::Builder().withOwnPipeline(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.cpp b/interface/src/ui/overlays/Rectangle3DOverlay.cpp index 5a541fd58a..75d7ec565c 100644 --- a/interface/src/ui/overlays/Rectangle3DOverlay.cpp +++ b/interface/src/ui/overlays/Rectangle3DOverlay.cpp @@ -53,13 +53,15 @@ void Rectangle3DOverlay::render(RenderArgs* args) { transform.setRotation(rotation); batch->setModelTransform(transform); + auto geometryCache = DependencyManager::get(); if (getIsSolid()) { glm::vec3 topLeft(-halfDimensions.x, -halfDimensions.y, 0.0f); glm::vec3 bottomRight(halfDimensions.x, halfDimensions.y, 0.0f); - DependencyManager::get()->renderQuad(*batch, topLeft, bottomRight, rectangleColor); + geometryCache->bindSimpleProgram(*batch); + geometryCache->renderQuad(*batch, topLeft, bottomRight, rectangleColor); } else { - auto geometryCache = DependencyManager::get(); + geometryCache->bindSimpleProgram(*batch, false, false, true, true); if (getIsDashedLine()) { glm::vec3 point1(-halfDimensions.x, -halfDimensions.y, 0.0f); glm::vec3 point2(halfDimensions.x, -halfDimensions.y, 0.0f); @@ -89,7 +91,7 @@ void Rectangle3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Rectangle3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder(); + auto builder = render::ShapeKey::Builder().withOwnPipeline(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } diff --git a/interface/src/ui/overlays/Sphere3DOverlay.cpp b/interface/src/ui/overlays/Sphere3DOverlay.cpp index d50f2f7285..1dd61611f2 100644 --- a/interface/src/ui/overlays/Sphere3DOverlay.cpp +++ b/interface/src/ui/overlays/Sphere3DOverlay.cpp @@ -46,7 +46,7 @@ void Sphere3DOverlay::render(RenderArgs* args) { auto geometryCache = DependencyManager::get(); auto pipeline = args->_pipeline; if (!pipeline) { - pipeline = geometryCache->getShapePipeline(); + pipeline = _isSolid ? geometryCache->getShapePipeline() : geometryCache->getWireShapePipeline(); } if (_isSolid) { @@ -58,7 +58,7 @@ void Sphere3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Sphere3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder(); + auto builder = render::ShapeKey::Builder().withOwnPipeline(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index f5baecd96a..c9c24d3ab6 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -100,7 +100,9 @@ void Web3DOverlay::render(RenderArgs* args) { } batch.setModelTransform(transform); - DependencyManager::get()->renderQuad(batch, halfSize * -1.0f, halfSize, vec2(0), vec2(1), color); + auto geometryCache = DependencyManager::get(); + geometryCache->bindSimpleProgram(batch, true, false, true, false); + geometryCache->renderQuad(batch, halfSize * -1.0f, halfSize, vec2(0), vec2(1), color); batch.setResourceTexture(0, args->_whiteTexture); // restore default white color after me } diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp index 1154f27ee0..9ea4bd9905 100644 --- a/libraries/render-utils/src/GeometryCache.cpp +++ b/libraries/render-utils/src/GeometryCache.cpp @@ -309,6 +309,7 @@ gpu::Stream::FormatPointer& getInstancedSolidStreamFormat() { } render::ShapePipelinePointer GeometryCache::_simplePipeline; +render::ShapePipelinePointer GeometryCache::_simpleWirePipeline; GeometryCache::GeometryCache() : _nextID(0) @@ -324,6 +325,10 @@ GeometryCache::GeometryCache() : DependencyManager::get()->getNormalFittingTexture()); } ); + GeometryCache::_simpleWirePipeline = + std::make_shared(getSimplePipeline(false, false, true, true), nullptr, + [](const render::ShapePipeline&, gpu::Batch& batch) { } + ); } GeometryCache::~GeometryCache() { diff --git a/libraries/render-utils/src/GeometryCache.h b/libraries/render-utils/src/GeometryCache.h index c46a9bb084..9f18f1644c 100644 --- a/libraries/render-utils/src/GeometryCache.h +++ b/libraries/render-utils/src/GeometryCache.h @@ -157,7 +157,8 @@ public: gpu::PipelinePointer getSimplePipeline(bool textured = false, bool culled = true, bool unlit = false, bool depthBias = false); render::ShapePipelinePointer getShapePipeline() { return GeometryCache::_simplePipeline; } - + render::ShapePipelinePointer getWireShapePipeline() { return GeometryCache::_simpleWirePipeline; } + // Static (instanced) geometry void renderShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer); void renderWireShapeInstances(gpu::Batch& batch, Shape shape, size_t count, gpu::BufferPointer& colorBuffer); @@ -179,7 +180,7 @@ public: void renderWireSphereInstance(gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline = _simplePipeline); void renderWireSphereInstance(gpu::Batch& batch, const glm::vec3& color, - const render::ShapePipelinePointer& pipeline = _simplePipeline) { + const render::ShapePipelinePointer& pipeline = _simpleWirePipeline) { renderWireSphereInstance(batch, glm::vec4(color, 1.0f), pipeline); } @@ -193,7 +194,7 @@ public: void renderWireCubeInstance(gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline = _simplePipeline); void renderWireCubeInstance(gpu::Batch& batch, const glm::vec3& color, - const render::ShapePipelinePointer& pipeline = _simplePipeline) { + const render::ShapePipelinePointer& pipeline = _simpleWirePipeline) { renderWireCubeInstance(batch, glm::vec4(color, 1.0f), pipeline); } @@ -401,6 +402,7 @@ private: gpu::ShaderPointer _simpleShader; gpu::ShaderPointer _unlitShader; static render::ShapePipelinePointer _simplePipeline; + static render::ShapePipelinePointer _simpleWirePipeline; QHash _simplePrograms; }; From 5288d983763ea57e4e1d33f37cc21384a82c5ba5 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 30 Jun 2016 20:52:41 -0700 Subject: [PATCH 33/33] Using pipelines properly where appropriate --- interface/src/ui/overlays/Circle3DOverlay.cpp | 8 ++++---- interface/src/ui/overlays/Cube3DOverlay.cpp | 6 ++++-- interface/src/ui/overlays/Grid3DOverlay.cpp | 6 ++---- interface/src/ui/overlays/Image3DOverlay.cpp | 6 ++---- interface/src/ui/overlays/Sphere3DOverlay.cpp | 3 +++ 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp index 1abcb0f5c0..2896ce711e 100644 --- a/interface/src/ui/overlays/Circle3DOverlay.cpp +++ b/interface/src/ui/overlays/Circle3DOverlay.cpp @@ -149,7 +149,6 @@ void Circle3DOverlay::render(RenderArgs* args) { geometryCache->updateVertices(_quadVerticesID, points, color); } - geometryCache->bindSimpleProgram(batch); geometryCache->renderVertices(batch, gpu::TRIANGLES, _quadVerticesID); } else { @@ -188,8 +187,6 @@ void Circle3DOverlay::render(RenderArgs* args) { geometryCache->updateVertices(_lineVerticesID, points, color); } - // Render unlit - geometryCache->bindSimpleProgram(batch, false, false, true); if (getIsDashedLine()) { geometryCache->renderVertices(batch, gpu::LINES, _lineVerticesID); } else { @@ -282,10 +279,13 @@ void Circle3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Circle3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withOwnPipeline(); + auto builder = render::ShapeKey::Builder().withoutCullFace(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } + if (!getIsSolid()) { + builder.withUnlit().withDepthBias(); + } return builder.build(); } diff --git a/interface/src/ui/overlays/Cube3DOverlay.cpp b/interface/src/ui/overlays/Cube3DOverlay.cpp index 17894aa091..f72fb8d920 100644 --- a/interface/src/ui/overlays/Cube3DOverlay.cpp +++ b/interface/src/ui/overlays/Cube3DOverlay.cpp @@ -44,7 +44,6 @@ void Cube3DOverlay::render(RenderArgs* args) { Transform transform; transform.setTranslation(position); transform.setRotation(rotation); - auto geometryCache = DependencyManager::get(); auto pipeline = args->_pipeline; if (!pipeline) { @@ -97,10 +96,13 @@ void Cube3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Cube3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withOwnPipeline(); + auto builder = render::ShapeKey::Builder(); if (getAlpha() != 1.0f) { builder.withTranslucent(); } + if (!getIsSolid()) { + builder.withUnlit().withDepthBias(); + } return builder.build(); } diff --git a/interface/src/ui/overlays/Grid3DOverlay.cpp b/interface/src/ui/overlays/Grid3DOverlay.cpp index 7d86395937..e9bbcddf59 100644 --- a/interface/src/ui/overlays/Grid3DOverlay.cpp +++ b/interface/src/ui/overlays/Grid3DOverlay.cpp @@ -75,11 +75,9 @@ void Grid3DOverlay::render(RenderArgs* args) { transform.setScale(glm::vec3(getDimensions(), 1.0f)); transform.setTranslation(position); batch->setModelTransform(transform); - auto geometryCache = DependencyManager::get(); - geometryCache->bindSimpleProgram(*batch, false, false, true, true); const float MINOR_GRID_EDGE = 0.0025f; const float MAJOR_GRID_EDGE = 0.005f; - geometryCache->renderGrid(*batch, minCorner, maxCorner, + DependencyManager::get()->renderGrid(*batch, minCorner, maxCorner, _minorGridRowDivisions, _minorGridColDivisions, MINOR_GRID_EDGE, _majorGridRowDivisions, _majorGridColDivisions, MAJOR_GRID_EDGE, gridColor, _drawInFront); @@ -87,7 +85,7 @@ void Grid3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Grid3DOverlay::getShapeKey() { - return render::ShapeKey::Builder().withOwnPipeline(); + return render::ShapeKey::Builder().withOwnPipeline().withUnlit().withDepthBias(); } void Grid3DOverlay::setProperties(const QVariantMap& properties) { diff --git a/interface/src/ui/overlays/Image3DOverlay.cpp b/interface/src/ui/overlays/Image3DOverlay.cpp index 72ae246859..d59e552779 100644 --- a/interface/src/ui/overlays/Image3DOverlay.cpp +++ b/interface/src/ui/overlays/Image3DOverlay.cpp @@ -93,9 +93,7 @@ void Image3DOverlay::render(RenderArgs* args) { batch->setModelTransform(transform); batch->setResourceTexture(0, _texture->getGPUTexture()); - auto geometryCache = DependencyManager::get(); - geometryCache->bindSimpleProgram(*batch, true, false); - geometryCache->renderQuad( + DependencyManager::get()->renderQuad( *batch, topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, glm::vec4(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha) ); @@ -104,7 +102,7 @@ void Image3DOverlay::render(RenderArgs* args) { } const render::ShapeKey Image3DOverlay::getShapeKey() { - auto builder = render::ShapeKey::Builder().withOwnPipeline(); + auto builder = render::ShapeKey::Builder().withoutCullFace().withDepthBias(); if (_emissive) { builder.withUnlit(); } diff --git a/interface/src/ui/overlays/Sphere3DOverlay.cpp b/interface/src/ui/overlays/Sphere3DOverlay.cpp index 1dd61611f2..85530d1376 100644 --- a/interface/src/ui/overlays/Sphere3DOverlay.cpp +++ b/interface/src/ui/overlays/Sphere3DOverlay.cpp @@ -62,6 +62,9 @@ const render::ShapeKey Sphere3DOverlay::getShapeKey() { if (getAlpha() != 1.0f) { builder.withTranslucent(); } + if (!getIsSolid()) { + builder.withUnlit().withDepthBias(); + } return builder.build(); }