From 9020607ccfa75fd5ded41d1a08079c299966b20f Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 25 Jul 2017 17:54:46 -0700
Subject: [PATCH 01/12] First pass

---
 interface/src/Application.cpp                 |   6 +
 .../src/ui/overlays/ContextOverlayInterface.h |   6 +-
 .../src/RenderableModelEntityItem.cpp         |  12 +
 libraries/render/src/render/Args.h            |   6 +
 scripts/system/marketplaces/marketplaces.js   | 206 +++++++++---------
 5 files changed, 133 insertions(+), 103 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 699ddfcb2d..978f20d743 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5393,6 +5393,12 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
             }
             renderArgs->_debugFlags = renderDebugFlags;
             //ViveControllerManager::getInstance().updateRendering(renderArgs, _main3DScene, transaction);
+
+            RenderArgs::OutlineFlags renderOutlineFlags = RenderArgs::RENDER_OUTLINE_NONE;
+            if (DependencyManager::get<ContextOverlayInterface>()->getIsInMarketplaceInspectionMode()) {
+                renderOutlineFlags = static_cast<RenderArgs::OutlineFlags>(renderOutlineFlags |
+                    static_cast<int>(RenderArgs::RENDER_OUTLINE_WIREFRAMES));
+            }
         }
     }
 
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index 623eb85401..7c768dbfa0 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -37,7 +37,8 @@ class ContextOverlayInterface : public QObject, public Dependency  {
     Q_OBJECT
 
     Q_PROPERTY(QUuid entityWithContextOverlay READ getCurrentEntityWithContextOverlay WRITE setCurrentEntityWithContextOverlay)
-    Q_PROPERTY(bool enabled READ getEnabled WRITE setEnabled);
+    Q_PROPERTY(bool enabled READ getEnabled WRITE setEnabled)
+    Q_PROPERTY(bool isInMarketplaceInspectionMode READ getIsInMarketplaceInspectionMode WRITE setIsInMarketplaceInspectionMode)
     QSharedPointer<EntityScriptingInterface> _entityScriptingInterface;
     EntityPropertyFlags _entityPropertyFlags;
     QSharedPointer<HMDScriptingInterface> _hmdScriptingInterface;
@@ -53,6 +54,8 @@ public:
     void setCurrentEntityWithContextOverlay(const QUuid& entityID) { _currentEntityWithContextOverlay = entityID; }
     void setEnabled(bool enabled) { _enabled = enabled; }
     bool getEnabled() { return _enabled; }
+    bool getIsInMarketplaceInspectionMode() { return _isInMarketplaceInspectionMode; }
+    void setIsInMarketplaceInspectionMode(bool mode) { _isInMarketplaceInspectionMode = mode; }
 
 public slots:
     bool createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
@@ -70,6 +73,7 @@ private:
     bool _contextOverlayJustClicked { false };
 
     void openMarketplace();
+    bool _isInMarketplaceInspectionMode { false };
 
     bool contextOverlayFilterPassed(const EntityItemID& entityItemID);
     glm::vec3 drawOutlineOverlay(const EntityItemID& entityItemID);
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 9884debcce..52308499d7 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -372,6 +372,18 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
         _model->updateRenderItems();
     }
 
+    bool showingEntityHighlight = (bool)(args->_outlineFlags & (int)RenderArgs::RENDER_OUTLINE_WIREFRAMES);
+    if (getMarketplaceID().length() != 0 && showingEntityHighlight) {
+        static glm::vec4 yellowColor(1.0f, 1.0f, 0.0f, 1.0f);
+        gpu::Batch& batch = *args->_batch;
+        bool success;
+        auto shapeTransform = getTransformToCenter(success);
+        if (success) {
+            batch.setModelTransform(shapeTransform); // we want to include the scale as well
+            DependencyManager::get<GeometryCache>()->renderWireCubeInstance(args, batch, yellowColor);
+        }
+    }
+
     if (!hasModel() || (_model && _model->didVisualGeometryRequestFail())) {
         static glm::vec4 greenColor(0.0f, 1.0f, 0.0f, 1.0f);
         gpu::Batch& batch = *args->_batch;
diff --git a/libraries/render/src/render/Args.h b/libraries/render/src/render/Args.h
index 449a3ac22b..f53454cf75 100644
--- a/libraries/render/src/render/Args.h
+++ b/libraries/render/src/render/Args.h
@@ -63,6 +63,11 @@ namespace render {
     public:
         enum RenderMode { DEFAULT_RENDER_MODE, SHADOW_RENDER_MODE, DIFFUSE_RENDER_MODE, NORMAL_RENDER_MODE, MIRROR_RENDER_MODE, SECONDARY_CAMERA_RENDER_MODE };
         enum DisplayMode { MONO, STEREO_MONITOR, STEREO_HMD };
+        enum OutlineFlags {
+            RENDER_OUTLINE_NONE = 0,
+            RENDER_OUTLINE_WIREFRAMES = 1,
+            RENDER_OUTLINE_SHADER = 2
+        };
         enum DebugFlags {
             RENDER_DEBUG_NONE = 0,
             RENDER_DEBUG_HULLS = 1
@@ -112,6 +117,7 @@ namespace render {
         int _boundaryLevelAdjust { 0 };
         RenderMode _renderMode { DEFAULT_RENDER_MODE };
         DisplayMode _displayMode { MONO };
+        OutlineFlags _outlineFlags{ RENDER_OUTLINE_NONE };
         DebugFlags _debugFlags { RENDER_DEBUG_NONE };
         gpu::Batch* _batch = nullptr;
 
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 3be8143830..462beac538 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -11,135 +11,137 @@
 /* global Tablet, Script, HMD, UserActivityLogger, Entities */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
-(function() { // BEGIN LOCAL_SCOPE
+(function () { // BEGIN LOCAL_SCOPE
 
-Script.include("../libraries/WebTablet.js");
+    Script.include("../libraries/WebTablet.js");
 
-var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace";
-var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?";  // Append "?" to signal injected script that it's the initial page.
-var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html");
-var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
+    var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace";
+    var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?";  // Append "?" to signal injected script that it's the initial page.
+    var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html");
+    var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
 
-var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
-// var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
+    var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
+    // var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
 
-// Event bridge messages.
-var CLARA_IO_DOWNLOAD = "CLARA.IO DOWNLOAD";
-var CLARA_IO_STATUS = "CLARA.IO STATUS";
-var CLARA_IO_CANCEL_DOWNLOAD = "CLARA.IO CANCEL DOWNLOAD";
-var CLARA_IO_CANCELLED_DOWNLOAD = "CLARA.IO CANCELLED DOWNLOAD";
-var GOTO_DIRECTORY = "GOTO_DIRECTORY";
-var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS";
-var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS";
-var WARN_USER_NO_PERMISSIONS = "WARN_USER_NO_PERMISSIONS";
+    // Event bridge messages.
+    var CLARA_IO_DOWNLOAD = "CLARA.IO DOWNLOAD";
+    var CLARA_IO_STATUS = "CLARA.IO STATUS";
+    var CLARA_IO_CANCEL_DOWNLOAD = "CLARA.IO CANCEL DOWNLOAD";
+    var CLARA_IO_CANCELLED_DOWNLOAD = "CLARA.IO CANCELLED DOWNLOAD";
+    var GOTO_DIRECTORY = "GOTO_DIRECTORY";
+    var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS";
+    var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS";
+    var WARN_USER_NO_PERMISSIONS = "WARN_USER_NO_PERMISSIONS";
 
-var CLARA_DOWNLOAD_TITLE = "Preparing Download";
-var messageBox = null;
-var isDownloadBeingCancelled = false;
+    var CLARA_DOWNLOAD_TITLE = "Preparing Download";
+    var messageBox = null;
+    var isDownloadBeingCancelled = false;
 
-var CANCEL_BUTTON = 4194304;  // QMessageBox::Cancel
-var NO_BUTTON = 0;  // QMessageBox::NoButton
+    var CANCEL_BUTTON = 4194304;  // QMessageBox::Cancel
+    var NO_BUTTON = 0;  // QMessageBox::NoButton
 
-var NO_PERMISSIONS_ERROR_MESSAGE = "Cannot download model because you can't write to \nthe domain's Asset Server.";
+    var NO_PERMISSIONS_ERROR_MESSAGE = "Cannot download model because you can't write to \nthe domain's Asset Server.";
 
-function onMessageBoxClosed(id, button) {
-    if (id === messageBox && button === CANCEL_BUTTON) {
-        isDownloadBeingCancelled = true;
-        messageBox = null;
-        tablet.emitScriptEvent(CLARA_IO_CANCEL_DOWNLOAD);
+    function onMessageBoxClosed(id, button) {
+        if (id === messageBox && button === CANCEL_BUTTON) {
+            isDownloadBeingCancelled = true;
+            messageBox = null;
+            tablet.emitScriptEvent(CLARA_IO_CANCEL_DOWNLOAD);
+        }
     }
-}
 
-Window.messageBoxClosed.connect(onMessageBoxClosed);
+    Window.messageBoxClosed.connect(onMessageBoxClosed);
 
-var onMarketplaceScreen = false;
+    var onMarketplaceScreen = false;
 
-function showMarketplace() {
-    UserActivityLogger.openedMarketplace();
-    tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
-    tablet.webEventReceived.connect(function (message) {
+    function showMarketplace() {
+        UserActivityLogger.openedMarketplace();
+        tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
+        tablet.webEventReceived.connect(function (message) {
 
-        if (message === GOTO_DIRECTORY) {
-            tablet.gotoWebScreen(MARKETPLACES_URL, MARKETPLACES_INJECT_SCRIPT_URL);
-        }
+            if (message === GOTO_DIRECTORY) {
+                tablet.gotoWebScreen(MARKETPLACES_URL, MARKETPLACES_INJECT_SCRIPT_URL);
+            }
 
-        if (message === QUERY_CAN_WRITE_ASSETS) {
-            tablet.emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets());
-        }
+            if (message === QUERY_CAN_WRITE_ASSETS) {
+                tablet.emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets());
+            }
 
-        if (message === WARN_USER_NO_PERMISSIONS) {
-            Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
-        }
+            if (message === WARN_USER_NO_PERMISSIONS) {
+                Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
+            }
 
-        if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) {
-            if (isDownloadBeingCancelled) {
+            if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) {
+                if (isDownloadBeingCancelled) {
+                    return;
+                }
+
+                var text = message.slice(CLARA_IO_STATUS.length);
+                if (messageBox === null) {
+                    messageBox = Window.openMessageBox(CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
+                } else {
+                    Window.updateMessageBox(messageBox, CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
+                }
                 return;
             }
 
-            var text = message.slice(CLARA_IO_STATUS.length);
-            if (messageBox === null) {
-                messageBox = Window.openMessageBox(CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
-            } else {
-                Window.updateMessageBox(messageBox, CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
+            if (message.slice(0, CLARA_IO_DOWNLOAD.length) === CLARA_IO_DOWNLOAD) {
+                if (messageBox !== null) {
+                    Window.closeMessageBox(messageBox);
+                    messageBox = null;
+                }
+                return;
             }
-            return;
-        }
 
-        if (message.slice(0, CLARA_IO_DOWNLOAD.length) === CLARA_IO_DOWNLOAD) {
-            if (messageBox !== null) {
-                Window.closeMessageBox(messageBox);
-                messageBox = null;
+            if (message === CLARA_IO_CANCELLED_DOWNLOAD) {
+                isDownloadBeingCancelled = false;
             }
-            return;
-        }
+        });
+    }
 
-        if (message === CLARA_IO_CANCELLED_DOWNLOAD) {
-            isDownloadBeingCancelled = false;
-        }
+    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    var marketplaceButton = tablet.addButton({
+        icon: "icons/tablet-icons/market-i.svg",
+        activeIcon: "icons/tablet-icons/market-a.svg",
+        text: "MARKET",
+        sortOrder: 9
     });
-}
 
-var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-var marketplaceButton = tablet.addButton({
-    icon: "icons/tablet-icons/market-i.svg",
-    activeIcon: "icons/tablet-icons/market-a.svg",
-    text: "MARKET",
-    sortOrder: 9
-});
-
-function onCanWriteAssetsChanged() {
-    var message = CAN_WRITE_ASSETS + " " + Entities.canWriteAssets();
-    tablet.emitScriptEvent(message);
-}
-
-function onClick() {
-    if (onMarketplaceScreen) {
-        // for toolbar-mode: go back to home screen, this will close the window.
-        tablet.gotoHomeScreen();
-    } else {
-        var entity = HMD.tabletID;
-        Entities.editEntity(entity, {textures: JSON.stringify({"tex.close": HOME_BUTTON_TEXTURE})});
-        showMarketplace();
+    function onCanWriteAssetsChanged() {
+        var message = CAN_WRITE_ASSETS + " " + Entities.canWriteAssets();
+        tablet.emitScriptEvent(message);
     }
-}
 
-function onScreenChanged(type, url) {
-    onMarketplaceScreen = type === "Web" && url === MARKETPLACE_URL_INITIAL 
-    // for toolbar mode: change button to active when window is first openend, false otherwise.
-    marketplaceButton.editProperties({isActive: onMarketplaceScreen});
-}
-
-marketplaceButton.clicked.connect(onClick);
-tablet.screenChanged.connect(onScreenChanged);
-Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
-
-Script.scriptEnding.connect(function () {
-    if (onMarketplaceScreen) {
-        tablet.gotoHomeScreen();
+    function onClick() {
+        if (onMarketplaceScreen) {
+            // for toolbar-mode: go back to home screen, this will close the window.
+            tablet.gotoHomeScreen();
+            ContextOverlay.isInMarketplaceInspectionMode = false;
+        } else {
+            var entity = HMD.tabletID;
+            Entities.editEntity(entity, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
+            showMarketplace();
+            ContextOverlay.isInMarketplaceInspectionMode = true;
+        }
     }
-    tablet.removeButton(marketplaceButton);
-    tablet.screenChanged.disconnect(onScreenChanged);
-    Entities.canWriteAssetsChanged.disconnect(onCanWriteAssetsChanged);
-});
+
+    function onScreenChanged(type, url) {
+        onMarketplaceScreen = type === "Web" && url === MARKETPLACE_URL_INITIAL
+        // for toolbar mode: change button to active when window is first openend, false otherwise.
+        marketplaceButton.editProperties({ isActive: onMarketplaceScreen });
+    }
+
+    marketplaceButton.clicked.connect(onClick);
+    tablet.screenChanged.connect(onScreenChanged);
+    Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
+
+    Script.scriptEnding.connect(function () {
+        if (onMarketplaceScreen) {
+            tablet.gotoHomeScreen();
+        }
+        tablet.removeButton(marketplaceButton);
+        tablet.screenChanged.disconnect(onScreenChanged);
+        Entities.canWriteAssetsChanged.disconnect(onCanWriteAssetsChanged);
+    });
 
 }()); // END LOCAL_SCOPE

From 9147bc21d0a3dadebf61fcf4220899fe45511c49 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 11:41:27 -0700
Subject: [PATCH 02/12] Getting there.

---
 .../ui/overlays/ContextOverlayInterface.cpp   | 76 ++++++++-----------
 .../src/ui/overlays/ContextOverlayInterface.h |  6 +-
 .../src/RenderableModelEntityItem.cpp         |  4 +-
 libraries/entities/src/EntityItem.cpp         | 20 +++++
 libraries/entities/src/EntityItem.h           |  4 +
 .../entities/src/EntityItemProperties.cpp     |  6 ++
 libraries/entities/src/EntityItemProperties.h |  1 +
 .../src/EntityItemPropertiesDefaults.h        |  1 +
 libraries/entities/src/EntityPropertyFlags.h  |  1 +
 .../networking/src/udt/PacketHeaders.cpp      |  2 +-
 libraries/networking/src/udt/PacketHeaders.h  |  1 +
 scripts/system/marketplaces/marketplaces.js   |  7 +-
 12 files changed, 76 insertions(+), 53 deletions(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 18cb41fda5..2562d7aa76 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -36,6 +36,8 @@ ContextOverlayInterface::ContextOverlayInterface() {
 
     auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>().data();
     connect(entityTreeRenderer, SIGNAL(mousePressOnEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(createOrDestroyContextOverlay(const EntityItemID&, const PointerEvent&)));
+    connect(entityTreeRenderer, SIGNAL(hoverEnterEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(highlightEntity(const EntityItemID&, const PointerEvent&)));
+    connect(entityTreeRenderer, SIGNAL(hoverLeaveEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(unHighlightEntity(const EntityItemID&, const PointerEvent&)));
     connect(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"), &TabletProxy::tabletShownChanged, this, [&]() {
         if (_contextOverlayJustClicked && _hmdScriptingInterface->isMounted()) {
             QUuid tabletFrameID = _hmdScriptingInterface->getCurrentTabletFrameID();
@@ -76,13 +78,18 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
             glm::vec3 cameraPosition = qApp->getCamera().getPosition();
             float distanceFromCameraToEntity = glm::distance(entityProperties.getPosition(), cameraPosition);
             glm::vec3 entityDimensions = entityProperties.getDimensions();
-            glm::vec3 contextOverlayPosition;
+            glm::vec3 entityPosition = entityProperties.getPosition();
+            glm::vec3 contextOverlayPosition = entityProperties.getPosition();
             glm::vec2 contextOverlayDimensions;
 
-            // Draw the outline overlay
-            // This also gives us the centerpoint of the entity even if
-            // the the entity doesn't use the default registration point.
-            glm::vec3 entityCenterPoint = drawOutlineOverlay(entityItemID);
+            // Update the position of the overlay if the registration point of the entity
+            // isn't default
+            if (entityProperties.getRegistrationPoint() != glm::vec3(0.5f)) {
+                glm::vec3 adjustPos = entityProperties.getRegistrationPoint() - glm::vec3(0.5f);
+                entityPosition = entityPosition - (entityProperties.getRotation() * (adjustPos * entityProperties.getDimensions()));
+            }
+
+            AABox boundingBox = AABox(entityPosition - (entityDimensions / 2.0f), entityDimensions * 2.0f);
 
             // Update the cached Entity Marketplace ID
             _entityMarketplaceID = entityProperties.getMarketplaceID();
@@ -91,7 +98,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
             setCurrentEntityWithContextOverlay(entityItemID);
 
             // Here, we determine the position and dimensions of the Context Overlay.
-            if (AABox(entityCenterPoint - (entityDimensions / 2.0f), entityDimensions * 2.0f).contains(cameraPosition)) {
+            if (boundingBox.contains(cameraPosition)) {
                 // If the camera is inside the box...
                 // ...position the Context Overlay 1 meter in front of the camera.
                 contextOverlayPosition = cameraPosition + CONTEXT_OVERLAY_INSIDE_DISTANCE * (qApp->getCamera().getOrientation() * Vectors::FRONT);
@@ -104,17 +111,17 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
                 if (event.getID() == LEFT_HAND_HW_ID) {
                     offsetAngle *= -1;
                 }
-                contextOverlayPosition = (glm::quat(glm::radians(glm::vec3(0.0f, offsetAngle, 0.0f))) * (entityProperties.getPosition() - cameraPosition)) + cameraPosition;
+                contextOverlayPosition = (glm::quat(glm::radians(glm::vec3(0.0f, offsetAngle, 0.0f))) * (entityPosition - cameraPosition)) + cameraPosition;
                 contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_CLOSE_SIZE, CONTEXT_OVERLAY_CLOSE_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
             } else {
                 // Else, place the Context Overlay some offset away from the entity's bounding
                 // box in the direction of the camera.
-                auto direction = glm::normalize(entityProperties.getPosition() - cameraPosition);
-                PickRay pickRay(cameraPosition, direction);
-                _bbOverlay->setIgnoreRayIntersection(false);
-                auto result = qApp->getOverlays().findRayIntersection(pickRay);
-                _bbOverlay->setIgnoreRayIntersection(true);
-                contextOverlayPosition = result.intersection - direction * CONTEXT_OVERLAY_FAR_OFFSET;
+                glm::vec3 direction = glm::normalize(entityPosition - cameraPosition);
+                float distance;
+                BoxFace face;
+                glm::vec3 normal;
+                bool intersectionExists = boundingBox.findRayIntersection(cameraPosition, direction, distance, face, normal);
+                contextOverlayPosition = (cameraPosition + direction * distance) - direction * CONTEXT_OVERLAY_FAR_OFFSET;
                 contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_FAR_SIZE, CONTEXT_OVERLAY_FAR_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
             }
 
@@ -149,33 +156,6 @@ bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& ent
     return (entityProperties.getMarketplaceID().length() != 0);
 }
 
-glm::vec3 ContextOverlayInterface::drawOutlineOverlay(const EntityItemID& entityItemID) {
-    EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
-    glm::vec3 bbPosition = entityProperties.getPosition();
-    if (entityProperties.getRegistrationPoint() != glm::vec3(0.5f)) {
-        glm::vec3 adjustPos = entityProperties.getRegistrationPoint() - glm::vec3(0.5f);
-        bbPosition = bbPosition - (entityProperties.getRotation() * (adjustPos * entityProperties.getDimensions()));
-    }
-
-    // Setup and draw the bounding box around the entity
-    if (_bbOverlayID == UNKNOWN_OVERLAY_ID || !qApp->getOverlays().isAddedOverlay(_bbOverlayID)) {
-        _bbOverlay = std::make_shared<Cube3DOverlay>();
-        _bbOverlay->setIsSolid(false);
-        _bbOverlay->setColor(BB_OVERLAY_COLOR);
-        _bbOverlay->setDrawInFront(true);
-        _bbOverlay->setIgnoreRayIntersection(true);
-        _bbOverlayID = qApp->getOverlays().addOverlay(_bbOverlay);
-    }
-    _bbOverlay->setParentID(entityItemID);
-    _bbOverlay->setDimensions(entityProperties.getDimensions());
-    _bbOverlay->setRotation(entityProperties.getRotation());
-    _bbOverlay->setPosition(bbPosition);
-    _bbOverlay->setVisible(true);
-    // This returned position should always be the center of the entity
-    // even if the registration point isn't the default.
-    return bbPosition;
-}
-
 bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
         qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
@@ -185,10 +165,6 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
         qApp->getOverlays().deleteOverlay(_contextOverlayID);
         _contextOverlay = NULL;
         _contextOverlayID = UNKNOWN_OVERLAY_ID;
-        // Destroy the outline overlay
-        qApp->getOverlays().deleteOverlay(_bbOverlayID);
-        _bbOverlay = NULL;
-        _bbOverlayID = UNKNOWN_OVERLAY_ID;
         return true;
     }
     return false;
@@ -227,6 +203,18 @@ void ContextOverlayInterface::hoverLeaveContextOverlay(const OverlayID& overlayI
     }
 }
 
+void ContextOverlayInterface::highlightEntity(const EntityItemID& entityID, const PointerEvent& event) {
+    //if (contextOverlayFilterPassed(entityID)) {
+        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityID;
+        qApp->getEntities()->getTree()->findEntityByEntityItemID(entityID)->setShouldHighlight(true);
+    //}
+}
+
+void ContextOverlayInterface::unHighlightEntity(const EntityItemID& entityID, const PointerEvent& event) {
+    qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityID;
+    qApp->getEntities()->getTree()->findEntityByEntityItemID(entityID)->setShouldHighlight(false);
+}
+
 static const QString MARKETPLACE_BASE_URL = "http://metaverse.highfidelity.com/marketplace/items/";
 
 void ContextOverlayInterface::openMarketplace() {
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index 7c768dbfa0..c15e4854bd 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -23,7 +23,6 @@
 
 #include "EntityScriptingInterface.h"
 #include "ui/overlays/Image3DOverlay.h"
-#include "ui/overlays/Cube3DOverlay.h"
 #include "ui/overlays/Overlays.h"
 #include "scripting/HMDScriptingInterface.h"
 
@@ -44,9 +43,7 @@ class ContextOverlayInterface : public QObject, public Dependency  {
     QSharedPointer<HMDScriptingInterface> _hmdScriptingInterface;
     QSharedPointer<TabletScriptingInterface> _tabletScriptingInterface;
     OverlayID _contextOverlayID { UNKNOWN_OVERLAY_ID };
-    OverlayID _bbOverlayID { UNKNOWN_OVERLAY_ID };
     std::shared_ptr<Image3DOverlay> _contextOverlay { nullptr };
-    std::shared_ptr<Cube3DOverlay> _bbOverlay { nullptr };
 public:
     ContextOverlayInterface();
 
@@ -64,6 +61,8 @@ public slots:
     void clickContextOverlay(const OverlayID& overlayID, const PointerEvent& event);
     void hoverEnterContextOverlay(const OverlayID& overlayID, const PointerEvent& event);
     void hoverLeaveContextOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void highlightEntity(const EntityItemID& entityID, const PointerEvent& event);
+    void unHighlightEntity(const EntityItemID& entityID, const PointerEvent& event);
 
 private:
     bool _verboseLogging { true };
@@ -76,7 +75,6 @@ private:
     bool _isInMarketplaceInspectionMode { false };
 
     bool contextOverlayFilterPassed(const EntityItemID& entityItemID);
-    glm::vec3 drawOutlineOverlay(const EntityItemID& entityItemID);
 };
 
 #endif // hifi_ContextOverlayInterface_h
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index 52308499d7..a03360a0e5 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -372,8 +372,8 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
         _model->updateRenderItems();
     }
 
-    bool showingEntityHighlight = (bool)(args->_outlineFlags & (int)RenderArgs::RENDER_OUTLINE_WIREFRAMES);
-    if (getMarketplaceID().length() != 0 && showingEntityHighlight) {
+    bool showingEntityHighlight = ((bool)(args->_outlineFlags & (int)RenderArgs::RENDER_OUTLINE_WIREFRAMES) && getMarketplaceID().length() != 0) || getShouldHighlight();
+    if (showingEntityHighlight) {
         static glm::vec4 yellowColor(1.0f, 1.0f, 0.0f, 1.0f);
         gpu::Batch& batch = *args->_batch;
         bool success;
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 5996327e87..82ddb9c90d 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -133,6 +133,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_LOCKED;
     requestedProperties += PROP_USER_DATA;
     requestedProperties += PROP_MARKETPLACE_ID;
+    requestedProperties += PROP_SHOULD_HIGHLIGHT;
     requestedProperties += PROP_NAME;
     requestedProperties += PROP_HREF;
     requestedProperties += PROP_DESCRIPTION;
@@ -277,6 +278,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         APPEND_ENTITY_PROPERTY(PROP_LOCKED, getLocked());
         APPEND_ENTITY_PROPERTY(PROP_USER_DATA, getUserData());
         APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, getMarketplaceID());
+        APPEND_ENTITY_PROPERTY(PROP_SHOULD_HIGHLIGHT, getShouldHighlight());
         APPEND_ENTITY_PROPERTY(PROP_NAME, getName());
         APPEND_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, getCollisionSoundURL());
         APPEND_ENTITY_PROPERTY(PROP_HREF, getHref());
@@ -828,6 +830,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         READ_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
     }
 
+    if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_SHOULD_HIGHLIGHT) {
+        READ_ENTITY_PROPERTY(PROP_SHOULD_HIGHLIGHT, bool, setShouldHighlight);
+    }
+
     READ_ENTITY_PROPERTY(PROP_NAME, QString, setName);
     READ_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, QString, setCollisionSoundURL);
     READ_ENTITY_PROPERTY(PROP_HREF, QString, setHref);
@@ -2807,6 +2813,20 @@ void EntityItem::setMarketplaceID(const QString& value) {
     });
 }
 
+bool EntityItem::getShouldHighlight() const {
+    bool result;
+    withReadLock([&] {
+        result = _shouldHighlight;
+    });
+    return result;
+}
+
+void EntityItem::setShouldHighlight(const bool value) {
+    withWriteLock([&] {
+        _shouldHighlight = value;
+    });
+}
+
 uint32_t EntityItem::getDirtyFlags() const { 
     uint32_t result;
     withReadLock([&] {
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 92c83651aa..36ac6ba1cc 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -316,6 +316,9 @@ public:
     QString getMarketplaceID() const;
     void setMarketplaceID(const QString& value);
 
+    bool getShouldHighlight() const;
+    void setShouldHighlight(const bool value);
+
     // TODO: get rid of users of getRadius()...
     float getRadius() const;
 
@@ -532,6 +535,7 @@ protected:
     QString _userData;
     SimulationOwner _simulationOwner;
     QString _marketplaceID;
+    bool _shouldHighlight { false };
     QString _name;
     QString _href; //Hyperlink href
     QString _description; //Hyperlink description
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index a207902789..aa7075f5e0 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -289,6 +289,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_START, radiusStart);
     CHECK_PROPERTY_CHANGE(PROP_RADIUS_FINISH, radiusFinish);
     CHECK_PROPERTY_CHANGE(PROP_MARKETPLACE_ID, marketplaceID);
+    CHECK_PROPERTY_CHANGE(PROP_SHOULD_HIGHLIGHT, shouldHighlight);
     CHECK_PROPERTY_CHANGE(PROP_NAME, name);
     CHECK_PROPERTY_CHANGE(PROP_BACKGROUND_MODE, backgroundMode);
     CHECK_PROPERTY_CHANGE(PROP_SOURCE_URL, sourceUrl);
@@ -406,6 +407,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_LOCKED, locked);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_USER_DATA, userData);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_MARKETPLACE_ID, marketplaceID);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_SHOULD_HIGHLIGHT, shouldHighlight);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_NAME, name);
     COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_COLLISION_SOUND_URL, collisionSoundURL);
 
@@ -982,6 +984,7 @@ void EntityItemProperties::entityPropertyFlagsFromScriptValue(const QScriptValue
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_START, RadiusStart, radiusStart, float);
         ADD_PROPERTY_TO_MAP(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float);
         ADD_PROPERTY_TO_MAP(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString);
+        ADD_PROPERTY_TO_MAP(PROP_SHOULD_HIGHLIGHT, ShouldHighlight, shouldHighlight, bool);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_COLOR, KeyLightColor, keyLightColor, xColor);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_INTENSITY, KeyLightIntensity, keyLightIntensity, float);
         ADD_PROPERTY_TO_MAP(PROP_KEYLIGHT_AMBIENT_INTENSITY, KeyLightAmbientIntensity, keyLightAmbientIntensity, float);
@@ -1334,6 +1337,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
                 APPEND_ENTITY_PROPERTY(PROP_SHAPE, properties.getShape());
             }
             APPEND_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, properties.getMarketplaceID());
+            APPEND_ENTITY_PROPERTY(PROP_SHOULD_HIGHLIGHT, properties.getShouldHighlight());
             APPEND_ENTITY_PROPERTY(PROP_NAME, properties.getName());
             APPEND_ENTITY_PROPERTY(PROP_COLLISION_SOUND_URL, properties.getCollisionSoundURL());
             APPEND_ENTITY_PROPERTY(PROP_ACTION_DATA, properties.getActionData());
@@ -1632,6 +1636,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     }
 
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
+    READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SHOULD_HIGHLIGHT, bool, setShouldHighlight);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_NAME, QString, setName);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_COLLISION_SOUND_URL, QString, setCollisionSoundURL);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_ACTION_DATA, QByteArray, setActionData);
@@ -1746,6 +1751,7 @@ void EntityItemProperties::markAllChanged() {
     //_alphaFinishChanged = true;
 
     _marketplaceIDChanged = true;
+    _shouldHighlightChanged = true;
 
     _keyLight.markAllChanged();
 
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index b526ac663c..916532b47c 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -170,6 +170,7 @@ public:
     DEFINE_PROPERTY(PROP_RADIUS_FINISH, RadiusFinish, radiusFinish, float, ParticleEffectEntityItem::DEFAULT_RADIUS_FINISH);
     DEFINE_PROPERTY(PROP_EMITTER_SHOULD_TRAIL, EmitterShouldTrail, emitterShouldTrail, bool, ParticleEffectEntityItem::DEFAULT_EMITTER_SHOULD_TRAIL);
     DEFINE_PROPERTY_REF(PROP_MARKETPLACE_ID, MarketplaceID, marketplaceID, QString, ENTITY_ITEM_DEFAULT_MARKETPLACE_ID);
+    DEFINE_PROPERTY_REF(PROP_SHOULD_HIGHLIGHT, ShouldHighlight, shouldHighlight, bool, ENTITY_ITEM_DEFAULT_SHOULD_HIGHLIGHT);
     DEFINE_PROPERTY_GROUP(KeyLight, keyLight, KeyLightPropertyGroup);
     DEFINE_PROPERTY_REF(PROP_VOXEL_VOLUME_SIZE, VoxelVolumeSize, voxelVolumeSize, glm::vec3, PolyVoxEntityItem::DEFAULT_VOXEL_VOLUME_SIZE);
     DEFINE_PROPERTY_REF(PROP_VOXEL_DATA, VoxelData, voxelData, QByteArray, PolyVoxEntityItem::DEFAULT_VOXEL_DATA);
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index d52c5d9aab..43d0e33ba6 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -27,6 +27,7 @@ const glm::vec3 ENTITY_ITEM_HALF_VEC3 = glm::vec3(0.5f);
 const bool ENTITY_ITEM_DEFAULT_LOCKED = false;
 const QString ENTITY_ITEM_DEFAULT_USER_DATA = QString("");
 const QString ENTITY_ITEM_DEFAULT_MARKETPLACE_ID = QString("");
+const bool ENTITY_ITEM_DEFAULT_SHOULD_HIGHLIGHT = false;
 const QUuid ENTITY_ITEM_DEFAULT_SIMULATOR_ID = QUuid();
 
 const float ENTITY_ITEM_DEFAULT_ALPHA = 1.0f;
diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index b3cfc143c2..9600d0d4fe 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -78,6 +78,7 @@ enum EntityPropertyList {
 
     PROP_COMPOUND_SHAPE_URL, // used by Model + zones entities
     PROP_MARKETPLACE_ID, // all entities
+    PROP_SHOULD_HIGHLIGHT, // all entities
     PROP_ACCELERATION, // all entities
     PROP_SIMULATION_OWNER, // formerly known as PROP_SIMULATOR_ID
     PROP_NAME, // all entities
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 240697d890..d2500196d9 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -62,7 +62,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityEdit:
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
-            return VERSION_ENTITIES_BULLET_DYNAMICS;
+            return VERSION_ENTITIES_HAS_SHOULD_HIGHLIGHT;
         case PacketType::EntityQuery:
             return static_cast<PacketVersion>(EntityQueryPacketVersion::JSONFilterWithFamilyTree);
         case PacketType::AvatarIdentity:
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 848bfd97cf..cb3db791b4 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -218,6 +218,7 @@ const PacketVersion VERSION_ENTITIES_PHYSICS_PACKET = 67;
 const PacketVersion VERSION_ENTITIES_ZONE_FILTERS = 68;
 const PacketVersion VERSION_ENTITIES_HINGE_CONSTRAINT = 69;
 const PacketVersion VERSION_ENTITIES_BULLET_DYNAMICS = 70;
+const PacketVersion VERSION_ENTITIES_HAS_SHOULD_HIGHLIGHT = 71;
 
 enum class EntityQueryPacketVersion: PacketVersion {
     JSONFilter = 18,
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 462beac538..418cf61834 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -116,12 +116,10 @@
         if (onMarketplaceScreen) {
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
-            ContextOverlay.isInMarketplaceInspectionMode = false;
         } else {
             var entity = HMD.tabletID;
             Entities.editEntity(entity, { textures: JSON.stringify({ "tex.close": HOME_BUTTON_TEXTURE }) });
             showMarketplace();
-            ContextOverlay.isInMarketplaceInspectionMode = true;
         }
     }
 
@@ -129,6 +127,11 @@
         onMarketplaceScreen = type === "Web" && url === MARKETPLACE_URL_INITIAL
         // for toolbar mode: change button to active when window is first openend, false otherwise.
         marketplaceButton.editProperties({ isActive: onMarketplaceScreen });
+        if (onMarketplaceScreen) {
+            ContextOverlay.isInMarketplaceInspectionMode = true;
+        } else {
+            ContextOverlay.isInMarketplaceInspectionMode = false;
+        }
     }
 
     marketplaceButton.clicked.connect(onClick);

From 24ddbb4b22353606fb48be2bcae53a9aeed93fe9 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 12:08:55 -0700
Subject: [PATCH 03/12] Silly bug preventing the whole thing from working

---
 interface/src/Application.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 978f20d743..27848a1193 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5396,9 +5396,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
 
             RenderArgs::OutlineFlags renderOutlineFlags = RenderArgs::RENDER_OUTLINE_NONE;
             if (DependencyManager::get<ContextOverlayInterface>()->getIsInMarketplaceInspectionMode()) {
-                renderOutlineFlags = static_cast<RenderArgs::OutlineFlags>(renderOutlineFlags |
-                    static_cast<int>(RenderArgs::RENDER_OUTLINE_WIREFRAMES));
+                renderOutlineFlags = RenderArgs::RENDER_OUTLINE_WIREFRAMES;
             }
+            renderArgs->_outlineFlags = renderOutlineFlags;
         }
     }
 

From 62f6c10b2b04306744b0bb87697997d4e8f77258 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 12:45:10 -0700
Subject: [PATCH 04/12] Renaming things; bugfixes; improvements

---
 interface/src/Application.cpp                 |  6 ++--
 .../ui/overlays/ContextOverlayInterface.cpp   | 30 ++++++++++++-------
 .../src/ui/overlays/ContextOverlayInterface.h | 10 +++----
 .../src/EntityTreeRenderer.cpp                |  2 +-
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 27848a1193..d9b014d48d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1350,17 +1350,17 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(overlays,
         SIGNAL(mousePressOnOverlay(const OverlayID&, const PointerEvent&)),
         DependencyManager::get<ContextOverlayInterface>().data(),
-        SLOT(clickContextOverlay(const OverlayID&, const PointerEvent&)));
+        SLOT(contextOverlays_mousePressOnOverlay(const OverlayID&, const PointerEvent&)));
 
     connect(overlays,
         SIGNAL(hoverEnterOverlay(const OverlayID&, const PointerEvent&)),
         DependencyManager::get<ContextOverlayInterface>().data(),
-        SLOT(hoverEnterContextOverlay(const OverlayID&, const PointerEvent&)));
+        SLOT(contextOverlays_hoverEnterOverlay(const OverlayID&, const PointerEvent&)));
 
     connect(overlays,
         SIGNAL(hoverLeaveOverlay(const OverlayID&, const PointerEvent&)),
         DependencyManager::get<ContextOverlayInterface>().data(),
-        SLOT(hoverLeaveContextOverlay(const OverlayID&, const PointerEvent&)));
+        SLOT(contextOverlays_hoverLeaveOverlay(const OverlayID&, const PointerEvent&)));
 
     // Add periodic checks to send user activity data
     static int CHECK_NEARBY_AVATARS_INTERVAL_MS = 10000;
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 2562d7aa76..3fdd005672 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -36,8 +36,8 @@ ContextOverlayInterface::ContextOverlayInterface() {
 
     auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>().data();
     connect(entityTreeRenderer, SIGNAL(mousePressOnEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(createOrDestroyContextOverlay(const EntityItemID&, const PointerEvent&)));
-    connect(entityTreeRenderer, SIGNAL(hoverEnterEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(highlightEntity(const EntityItemID&, const PointerEvent&)));
-    connect(entityTreeRenderer, SIGNAL(hoverLeaveEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(unHighlightEntity(const EntityItemID&, const PointerEvent&)));
+    connect(entityTreeRenderer, SIGNAL(hoverEnterEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(contextOverlays_hoverEnterEntity(const EntityItemID&, const PointerEvent&)));
+    connect(entityTreeRenderer, SIGNAL(hoverLeaveEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(contextOverlays_hoverLeaveEntity(const EntityItemID&, const PointerEvent&)));
     connect(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"), &TabletProxy::tabletShownChanged, this, [&]() {
         if (_contextOverlayJustClicked && _hmdScriptingInterface->isMounted()) {
             QUuid tabletFrameID = _hmdScriptingInterface->getCurrentTabletFrameID();
@@ -89,6 +89,9 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
                 entityPosition = entityPosition - (entityProperties.getRotation() * (adjustPos * entityProperties.getDimensions()));
             }
 
+            qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID;
+            qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(true);
+
             AABox boundingBox = AABox(entityPosition - (entityDimensions / 2.0f), entityDimensions * 2.0f);
 
             // Update the cached Entity Marketplace ID
@@ -159,6 +162,8 @@ bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& ent
 bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
         qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
+        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << _currentEntityWithContextOverlay;
+        qApp->getEntities()->getTree()->findEntityByEntityItemID(_currentEntityWithContextOverlay)->setShouldHighlight(false);
         setCurrentEntityWithContextOverlay(QUuid());
         _entityMarketplaceID.clear();
         // Destroy the Context Overlay
@@ -174,7 +179,7 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
     return ContextOverlayInterface::destroyContextOverlay(entityItemID, PointerEvent());
 }
 
-void ContextOverlayInterface::clickContextOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
     if (overlayID == _contextOverlayID  && event.getButton() == PointerEvent::PrimaryButton) {
         qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
         openMarketplace();
@@ -183,7 +188,7 @@ void ContextOverlayInterface::clickContextOverlay(const OverlayID& overlayID, co
     }
 }
 
-void ContextOverlayInterface::hoverEnterContextOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+void ContextOverlayInterface::contextOverlays_hoverEnterOverlay(const OverlayID& overlayID, const PointerEvent& event) {
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID && _contextOverlay) {
         qCDebug(context_overlay) << "Started hovering over Context Overlay. Overlay ID:" << overlayID;
         _contextOverlay->setColor(CONTEXT_OVERLAY_COLOR);
@@ -193,7 +198,7 @@ void ContextOverlayInterface::hoverEnterContextOverlay(const OverlayID& overlayI
     }
 }
 
-void ContextOverlayInterface::hoverLeaveContextOverlay(const OverlayID& overlayID, const PointerEvent& event) {
+void ContextOverlayInterface::contextOverlays_hoverLeaveOverlay(const OverlayID& overlayID, const PointerEvent& event) {
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID && _contextOverlay) {
         qCDebug(context_overlay) << "Stopped hovering over Context Overlay. Overlay ID:" << overlayID;
         _contextOverlay->setColor(CONTEXT_OVERLAY_COLOR);
@@ -203,16 +208,18 @@ void ContextOverlayInterface::hoverLeaveContextOverlay(const OverlayID& overlayI
     }
 }
 
-void ContextOverlayInterface::highlightEntity(const EntityItemID& entityID, const PointerEvent& event) {
-    //if (contextOverlayFilterPassed(entityID)) {
+void ContextOverlayInterface::contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event) {
+    if (contextOverlayFilterPassed(entityID)) {
         qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityID;
         qApp->getEntities()->getTree()->findEntityByEntityItemID(entityID)->setShouldHighlight(true);
-    //}
+    }
 }
 
-void ContextOverlayInterface::unHighlightEntity(const EntityItemID& entityID, const PointerEvent& event) {
-    qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityID;
-    qApp->getEntities()->getTree()->findEntityByEntityItemID(entityID)->setShouldHighlight(false);
+void ContextOverlayInterface::contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event) {
+    if (_currentEntityWithContextOverlay != entityID) {
+        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityID;
+        qApp->getEntities()->getTree()->findEntityByEntityItemID(entityID)->setShouldHighlight(false);
+    }
 }
 
 static const QString MARKETPLACE_BASE_URL = "http://metaverse.highfidelity.com/marketplace/items/";
@@ -227,5 +234,6 @@ void ContextOverlayInterface::openMarketplace() {
         QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID;
         tablet->gotoWebScreen(url);
         _hmdScriptingInterface->openTablet();
+        _isInMarketplaceInspectionMode = true;
     }
 }
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index c15e4854bd..fc539661c4 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -58,11 +58,11 @@ public slots:
     bool createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
     bool destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event);
     bool destroyContextOverlay(const EntityItemID& entityItemID);
-    void clickContextOverlay(const OverlayID& overlayID, const PointerEvent& event);
-    void hoverEnterContextOverlay(const OverlayID& overlayID, const PointerEvent& event);
-    void hoverLeaveContextOverlay(const OverlayID& overlayID, const PointerEvent& event);
-    void highlightEntity(const EntityItemID& entityID, const PointerEvent& event);
-    void unHighlightEntity(const EntityItemID& entityID, const PointerEvent& event);
+    void contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void contextOverlays_hoverEnterOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void contextOverlays_hoverLeaveOverlay(const OverlayID& overlayID, const PointerEvent& event);
+    void contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event);
+    void contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event);
 
 private:
     bool _verboseLogging { true };
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index a8eca41077..d55352d31e 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -675,7 +675,7 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
 
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
 
-    bool precisionPicking = false; // for mouse moves we do not do precision picking
+    bool precisionPicking = true; // for mouse moves we do precision picking
     RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::TryLock, precisionPicking);
     if (rayPickResult.intersects) {
 

From 65c28ca82123234ab22057668925b45e9b581236 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 13:17:51 -0700
Subject: [PATCH 05/12] Bugfixes

---
 .../src/ui/overlays/ContextOverlayInterface.cpp    | 14 +++++++++++---
 scripts/system/marketplaces/marketplaces.js        |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 3fdd005672..4ecf919cfe 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -97,6 +97,12 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
             // Update the cached Entity Marketplace ID
             _entityMarketplaceID = entityProperties.getMarketplaceID();
 
+
+            if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) {
+                qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << _currentEntityWithContextOverlay;
+                qApp->getEntities()->getTree()->findEntityByEntityItemID(_currentEntityWithContextOverlay)->setShouldHighlight(false);
+            }
+
             // Update the cached "Current Entity with Context Overlay" variable
             setCurrentEntityWithContextOverlay(entityItemID);
 
@@ -162,8 +168,10 @@ bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& ent
 bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
         qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
-        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << _currentEntityWithContextOverlay;
-        qApp->getEntities()->getTree()->findEntityByEntityItemID(_currentEntityWithContextOverlay)->setShouldHighlight(false);
+        if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) {
+            qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << _currentEntityWithContextOverlay;
+            qApp->getEntities()->getTree()->findEntityByEntityItemID(_currentEntityWithContextOverlay)->setShouldHighlight(false);
+        }
         setCurrentEntityWithContextOverlay(QUuid());
         _entityMarketplaceID.clear();
         // Destroy the Context Overlay
@@ -222,7 +230,7 @@ void ContextOverlayInterface::contextOverlays_hoverLeaveEntity(const EntityItemI
     }
 }
 
-static const QString MARKETPLACE_BASE_URL = "http://metaverse.highfidelity.com/marketplace/items/";
+static const QString MARKETPLACE_BASE_URL = "https://metaverse.highfidelity.com/marketplace/items/";
 
 void ContextOverlayInterface::openMarketplace() {
     // lets open the tablet and go to the current item in
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 418cf61834..7b25589e92 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -127,7 +127,7 @@
         onMarketplaceScreen = type === "Web" && url === MARKETPLACE_URL_INITIAL
         // for toolbar mode: change button to active when window is first openend, false otherwise.
         marketplaceButton.editProperties({ isActive: onMarketplaceScreen });
-        if (onMarketplaceScreen) {
+        if (type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1) {
             ContextOverlay.isInMarketplaceInspectionMode = true;
         } else {
             ContextOverlay.isInMarketplaceInspectionMode = false;

From 3a05219c59ae3de69f7fe81e5883d2073f63ff97 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 14:10:41 -0700
Subject: [PATCH 06/12] Closer still

---
 .../ui/overlays/ContextOverlayInterface.cpp   | 25 ++++---
 .../src/ui/overlays/ContextOverlayInterface.h |  4 +-
 .../system/controllers/handControllerGrab.js  | 73 +++++++++++++------
 3 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 4ecf919cfe..aa162e6101 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -89,8 +89,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
                 entityPosition = entityPosition - (entityProperties.getRotation() * (adjustPos * entityProperties.getDimensions()));
             }
 
-            qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID;
-            qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(true);
+            enableEntityHighlight(entityItemID);
 
             AABox boundingBox = AABox(entityPosition - (entityDimensions / 2.0f), entityDimensions * 2.0f);
 
@@ -99,8 +98,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
 
 
             if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) {
-                qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << _currentEntityWithContextOverlay;
-                qApp->getEntities()->getTree()->findEntityByEntityItemID(_currentEntityWithContextOverlay)->setShouldHighlight(false);
+                disableEntityHighlight(_currentEntityWithContextOverlay);
             }
 
             // Update the cached "Current Entity with Context Overlay" variable
@@ -169,8 +167,7 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
         qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
         if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) {
-            qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << _currentEntityWithContextOverlay;
-            qApp->getEntities()->getTree()->findEntityByEntityItemID(_currentEntityWithContextOverlay)->setShouldHighlight(false);
+            disableEntityHighlight(_currentEntityWithContextOverlay);
         }
         setCurrentEntityWithContextOverlay(QUuid());
         _entityMarketplaceID.clear();
@@ -218,15 +215,13 @@ void ContextOverlayInterface::contextOverlays_hoverLeaveOverlay(const OverlayID&
 
 void ContextOverlayInterface::contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event) {
     if (contextOverlayFilterPassed(entityID)) {
-        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityID;
-        qApp->getEntities()->getTree()->findEntityByEntityItemID(entityID)->setShouldHighlight(true);
+        enableEntityHighlight(entityID);
     }
 }
 
 void ContextOverlayInterface::contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event) {
     if (_currentEntityWithContextOverlay != entityID) {
-        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityID;
-        qApp->getEntities()->getTree()->findEntityByEntityItemID(entityID)->setShouldHighlight(false);
+        disableEntityHighlight(entityID);
     }
 }
 
@@ -245,3 +240,13 @@ void ContextOverlayInterface::openMarketplace() {
         _isInMarketplaceInspectionMode = true;
     }
 }
+
+void ContextOverlayInterface::enableEntityHighlight(const EntityItemID& entityItemID) {
+    qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID;
+    qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(true);
+}
+
+void ContextOverlayInterface::disableEntityHighlight(const EntityItemID& entityItemID) {
+    qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityItemID;
+    qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(false);
+}
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index fc539661c4..4b9c67c5d1 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -63,6 +63,7 @@ public slots:
     void contextOverlays_hoverLeaveOverlay(const OverlayID& overlayID, const PointerEvent& event);
     void contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event);
     void contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event);
+    bool contextOverlayFilterPassed(const EntityItemID& entityItemID);
 
 private:
     bool _verboseLogging { true };
@@ -74,7 +75,8 @@ private:
     void openMarketplace();
     bool _isInMarketplaceInspectionMode { false };
 
-    bool contextOverlayFilterPassed(const EntityItemID& entityItemID);
+    void enableEntityHighlight(const EntityItemID& entityItemID);
+    void disableEntityHighlight(const EntityItemID& entityItemID);
 };
 
 #endif // hifi_ContextOverlayInterface_h
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 3268031f8b..247246b11d 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -187,7 +187,8 @@ var DEFAULT_GRABBABLE_DATA = {
 var USE_BLACKLIST = true;
 var blacklist = [];
 
-var potentialEntityWithContextOverlay = false;
+var hoveredEntityID = false;
+var contextOverlayTimer = false;
 var entityWithContextOverlay = false;
 var contextualHand = -1;
 
@@ -2231,28 +2232,54 @@ function MyController(hand) {
             entityPropertiesCache.addEntity(rayPickInfo.entityID);
         }
 
-        if (rayPickInfo.entityID && !entityWithContextOverlay) {
-            Script.setTimeout(function () {
-                if (rayPickInfo.entityID === potentialEntityWithContextOverlay &&
-                    !entityWithContextOverlay
-                    && contextualHand !== -1) {
-                    var pointerEvent = {
-                        type: "Move",
-                        id: contextualHand + 1, // 0 is reserved for hardware mouse
-                        pos2D: projectOntoEntityXYPlane(rayPickInfo.entityID, rayPickInfo.intersection),
-                        pos3D: rayPickInfo.intersection,
-                        normal: rayPickInfo.normal,
-                        direction: rayPickInfo.searchRay.direction,
-                        button: "Secondary"
-                    };
-                    if (ContextOverlay.createOrDestroyContextOverlay(rayPickInfo.entityID, pointerEvent)) {
-                        entityWithContextOverlay = rayPickInfo.entityID;
-                        potentialEntityWithContextOverlay = false;
-                    }
+        if (rayPickInfo.entityID) {
+            if (hoveredEntityID !== rayPickInfo.entityID) {
+                pointerEvent = {
+                    type: "Move",
+                    id: this.hand + 1, // 0 is reserved for hardware mouse
+                    pos2D: projectOntoEntityXYPlane(entity, rayPickInfo.intersection),
+                    pos3D: rayPickInfo.intersection,
+                    normal: rayPickInfo.normal,
+                    direction: rayPickInfo.searchRay.direction,
+                    button: "None"
+                };
+
+                if (hoveredEntityID) {
+                    Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
                 }
-            }, 500);
-            contextualHand = this.hand;
-            potentialEntityWithContextOverlay = rayPickInfo.entityID;
+                hoveredEntityID = rayPickInfo.entityID;
+                Entities.sendHoverEnterEntity(hoveredEntityID, pointerEvent);
+            }
+
+            if (contextOverlayTimer && rayPickInfo.entityID != hoveredEntityID) {
+                Script.clearTimeout(contextOverlayTimer);
+            }
+
+            // If we already have a context overlay, we don't want to move it to
+            // another entity while we're searching.
+            if (!entityWithContextOverlay) {
+                contextOverlayTimer = Script.setTimeout(function () {
+                    if (rayPickInfo.entityID === hoveredEntityID &&
+                        !entityWithContextOverlay
+                        && contextualHand !== -1) {
+                        var pointerEvent = {
+                            type: "Move",
+                            id: contextualHand + 1, // 0 is reserved for hardware mouse
+                            pos2D: projectOntoEntityXYPlane(rayPickInfo.entityID, rayPickInfo.intersection),
+                            pos3D: rayPickInfo.intersection,
+                            normal: rayPickInfo.normal,
+                            direction: rayPickInfo.searchRay.direction,
+                            button: "Secondary"
+                        };
+                        if (ContextOverlay.createOrDestroyContextOverlay(rayPickInfo.entityID, pointerEvent)) {
+                            entityWithContextOverlay = rayPickInfo.entityID;
+                            hoveredEntityID = false;
+                        }
+                    }
+                    contextOverlayTimer = false;
+                }, 500);
+                contextualHand = this.hand;
+            }
         }
 
         var candidateHotSpotEntities = Entities.findEntities(handPosition, MAX_EQUIP_HOTSPOT_RADIUS);
@@ -3503,7 +3530,7 @@ function MyController(hand) {
         if (entityWithContextOverlay) {
             ContextOverlay.destroyContextOverlay(entityWithContextOverlay);
             entityWithContextOverlay = false;
-            potentialEntityWithContextOverlay = false;
+            hoveredEntityID = false;
         }
 
         if (isInEditMode()) {

From 17c7e38fcecaf6b6c463d4a4da59724c007d1927 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 15:02:52 -0700
Subject: [PATCH 07/12] Bugfixes?

---
 .../system/controllers/handControllerGrab.js  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 247246b11d..37712ff90c 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2201,6 +2201,10 @@ function MyController(hand) {
 
     this.searchExit = function () {
         contextualHand = -1;
+        if (hoveredEntityID) {
+            Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
+        }
+        hoveredEntityID = false;
     };
 
     this.search = function(deltaTime, timestamp) {
@@ -2486,8 +2490,10 @@ function MyController(hand) {
                     button: "None"
                 };
 
+            if (this.hoverEntity !== entity) {
+                Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
                 this.hoverEntity = entity;
-                Entities.sendHoverEnterEntity(entity, pointerEvent);
+                Entities.sendHoverEnterEntity(this.hoverEntity, pointerEvent);
             }
 
             // send mouse events for button highlights and tooltips.
@@ -2551,8 +2557,11 @@ function MyController(hand) {
                 button: "None"
             };
 
-            this.hoverOverlay = overlay;
-            Overlays.sendHoverEnterOverlay(overlay, pointerEvent);
+            if (this.hoverOverlay !== overlay) {
+                Overlays.sendHoverLeaveOverlay(this.hoverOverlay, pointerEvent);
+                this.hoverOverlay = overlay;
+                Overlays.sendHoverEnterOverlay(this.hoverOverlay, pointerEvent);
+            }
 
             // Send mouse events for button highlights and tooltips.
             if (this.hand == mostRecentSearchingHand ||
@@ -3527,10 +3536,13 @@ function MyController(hand) {
         var existingSearchDistance = this.searchSphereDistance;
         this.release();
 
+        if (hoveredEntityID) {
+            Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
+            hoveredEntityID = false;
+        }
         if (entityWithContextOverlay) {
             ContextOverlay.destroyContextOverlay(entityWithContextOverlay);
             entityWithContextOverlay = false;
-            hoveredEntityID = false;
         }
 
         if (isInEditMode()) {

From 1336a59b6c35aaf9cbe21f259460b4e6d123e007 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 15:14:58 -0700
Subject: [PATCH 08/12] Stupid bracket

---
 scripts/system/controllers/handControllerGrab.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 37712ff90c..a3bf6d4bd8 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2490,10 +2490,11 @@ function MyController(hand) {
                     button: "None"
                 };
 
-            if (this.hoverEntity !== entity) {
-                Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
-                this.hoverEntity = entity;
-                Entities.sendHoverEnterEntity(this.hoverEntity, pointerEvent);
+                if (this.hoverEntity !== entity) {
+                    Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
+                    this.hoverEntity = entity;
+                    Entities.sendHoverEnterEntity(this.hoverEntity, pointerEvent);
+                }
             }
 
             // send mouse events for button highlights and tooltips.

From 39cb0bc357e881f2cb7cdb6fff998205dd28a791 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 16:12:54 -0700
Subject: [PATCH 09/12] WHYYYY DOESN'T THIS WORK

---
 .../ui/overlays/ContextOverlayInterface.cpp   | 12 +++--
 .../system/controllers/handControllerGrab.js  | 44 ++++++++++++-------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index aa162e6101..e6d1af0af5 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -242,11 +242,15 @@ void ContextOverlayInterface::openMarketplace() {
 }
 
 void ContextOverlayInterface::enableEntityHighlight(const EntityItemID& entityItemID) {
-    qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID;
-    qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(true);
+    if (!qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->getShouldHighlight()) {
+        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID;
+        qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(true);
+    }
 }
 
 void ContextOverlayInterface::disableEntityHighlight(const EntityItemID& entityItemID) {
-    qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityItemID;
-    qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(false);
+    if (qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->getShouldHighlight()) {
+        qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityItemID;
+        qApp->getEntities()->getTree()->findEntityByEntityItemID(entityItemID)->setShouldHighlight(false);
+    }
 }
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index a3bf6d4bd8..82691003e2 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2236,18 +2236,22 @@ function MyController(hand) {
             entityPropertiesCache.addEntity(rayPickInfo.entityID);
         }
 
+        pointerEvent = {
+            type: "Move",
+            id: this.hand + 1, // 0 is reserved for hardware mouse
+            pos2D: projectOntoEntityXYPlane(rayPickInfo.entityID, rayPickInfo.intersection),
+            pos3D: rayPickInfo.intersection,
+            normal: rayPickInfo.normal,
+            direction: rayPickInfo.searchRay.direction,
+            button: "None"
+        };
         if (rayPickInfo.entityID) {
+            print("ZRF: " + hoveredEntityID);
             if (hoveredEntityID !== rayPickInfo.entityID) {
-                pointerEvent = {
-                    type: "Move",
-                    id: this.hand + 1, // 0 is reserved for hardware mouse
-                    pos2D: projectOntoEntityXYPlane(entity, rayPickInfo.intersection),
-                    pos3D: rayPickInfo.intersection,
-                    normal: rayPickInfo.normal,
-                    direction: rayPickInfo.searchRay.direction,
-                    button: "None"
-                };
-
+                if (contextOverlayTimer) {
+                    Script.clearTimeout(contextOverlayTimer);
+                    contextOverlayTimer = false;
+                }
                 if (hoveredEntityID) {
                     Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
                 }
@@ -2255,17 +2259,14 @@ function MyController(hand) {
                 Entities.sendHoverEnterEntity(hoveredEntityID, pointerEvent);
             }
 
-            if (contextOverlayTimer && rayPickInfo.entityID != hoveredEntityID) {
-                Script.clearTimeout(contextOverlayTimer);
-            }
-
             // If we already have a context overlay, we don't want to move it to
             // another entity while we're searching.
-            if (!entityWithContextOverlay) {
+            if (!entityWithContextOverlay && !contextOverlayTimer) {
                 contextOverlayTimer = Script.setTimeout(function () {
                     if (rayPickInfo.entityID === hoveredEntityID &&
-                        !entityWithContextOverlay
-                        && contextualHand !== -1) {
+                        !entityWithContextOverlay &&
+                        contextualHand !== -1 &&
+                        contextOverlayTimer) {
                         var pointerEvent = {
                             type: "Move",
                             id: contextualHand + 1, // 0 is reserved for hardware mouse
@@ -2284,6 +2285,15 @@ function MyController(hand) {
                 }, 500);
                 contextualHand = this.hand;
             }
+        } else {
+            if (hoveredEntityID) {
+                Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
+                hoveredEntityID = false;
+            }
+            if (contextOverlayTimer) {
+                Script.clearTimeout(contextOverlayTimer);
+                contextOverlayTimer = false;
+            }
         }
 
         var candidateHotSpotEntities = Entities.findEntities(handPosition, MAX_EQUIP_HOTSPOT_RADIUS);

From 8a7561d61ba30391147691349c3ecab9416cf46a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Jul 2017 16:35:55 -0700
Subject: [PATCH 10/12] IT'S WORKING SOB SOB SOB

---
 interface/src/ui/overlays/ContextOverlayInterface.cpp | 9 +++++----
 scripts/system/controllers/handControllerGrab.js      | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index e6d1af0af5..668766abbf 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -153,7 +153,10 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
             return true;
         }
     } else {
-        return destroyContextOverlay(entityItemID, event);
+        if (!_currentEntityWithContextOverlay.isNull()) {
+            return destroyContextOverlay(_currentEntityWithContextOverlay, event);
+        }
+        return false;
     }
     return false;
 }
@@ -166,9 +169,7 @@ bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& ent
 bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
     if (_contextOverlayID != UNKNOWN_OVERLAY_ID) {
         qCDebug(context_overlay) << "Destroying Context Overlay on top of entity with ID: " << entityItemID;
-        if (!_currentEntityWithContextOverlay.isNull() && _currentEntityWithContextOverlay != entityItemID) {
-            disableEntityHighlight(_currentEntityWithContextOverlay);
-        }
+        disableEntityHighlight(entityItemID);
         setCurrentEntityWithContextOverlay(QUuid());
         _entityMarketplaceID.clear();
         // Destroy the Context Overlay
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 82691003e2..bd8ab26506 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2246,7 +2246,6 @@ function MyController(hand) {
             button: "None"
         };
         if (rayPickInfo.entityID) {
-            print("ZRF: " + hoveredEntityID);
             if (hoveredEntityID !== rayPickInfo.entityID) {
                 if (contextOverlayTimer) {
                     Script.clearTimeout(contextOverlayTimer);

From 762b4098143b4fa68cf10e16e232ca5229fe6a7f Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 1 Aug 2017 16:20:33 -0700
Subject: [PATCH 11/12] unused variable

---
 interface/src/ui/overlays/ContextOverlayInterface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index cbe184f31e..b0fc826f0a 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -142,7 +142,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
                 float distance;
                 BoxFace face;
                 glm::vec3 normal;
-                bool intersectionExists = boundingBox.findRayIntersection(cameraPosition, direction, distance, face, normal);
+                boundingBox.findRayIntersection(cameraPosition, direction, distance, face, normal);
                 contextOverlayPosition = (cameraPosition + direction * distance) - direction * CONTEXT_OVERLAY_FAR_OFFSET;
                 contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_FAR_SIZE, CONTEXT_OVERLAY_FAR_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
             }

From 588afaaa85861ea2f0ca70446cbc0d510d70c6a6 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 1 Aug 2017 16:59:42 -0700
Subject: [PATCH 12/12] unused variable...

---
 interface/src/ui/overlays/ContextOverlayInterface.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index b0fc826f0a..e406d139d0 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -57,7 +57,6 @@ ContextOverlayInterface::ContextOverlayInterface() {
     });
 }
 
-static const xColor BB_OVERLAY_COLOR = {255, 255, 0};
 static const uint32_t LEFT_HAND_HW_ID = 1;
 static const xColor CONTEXT_OVERLAY_COLOR = { 255, 255, 255 };
 static const float CONTEXT_OVERLAY_INSIDE_DISTANCE = 1.0f; // in meters