Merge branch 'master' of https://github.com/highfidelity/hifi into fadeInWhenOpeningNoiseGate

interface/src/Application.cpp

@@ -3180,7 +3180,23 @@ void Application::mousePressEvent(QMouseEvent* event) {
     }
 }
 
-void Application::mouseDoublePressEvent(QMouseEvent* event) const {
+void Application::mouseDoublePressEvent(QMouseEvent* event) {
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    auto eventPosition = getApplicationCompositor().getMouseEventPosition(event);
+    QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition, _glWidget);
+    QMouseEvent mappedEvent(event->type(),
+        transformedPos,
+        event->screenPos(), event->button(),
+        event->buttons(), event->modifiers());
+
+    if (!_aboutToQuit) {
+        getOverlays().mouseDoublePressEvent(&mappedEvent);
+        if (!_controllerScriptingInterface->areEntityClicksCaptured()) {
+            getEntities()->mouseDoublePressEvent(&mappedEvent);
+        }
+    }
+
+
     // if one of our scripts have asked to capture this event, then stop processing it
     if (_controllerScriptingInterface->isMouseCaptured()) {
         return;

interface/src/Application.h

@@ -494,7 +494,7 @@ private:
 
     void mouseMoveEvent(QMouseEvent* event);
     void mousePressEvent(QMouseEvent* event);
-    void mouseDoublePressEvent(QMouseEvent* event) const;
+    void mouseDoublePressEvent(QMouseEvent* event);
     void mouseReleaseEvent(QMouseEvent* event);
 
     void touchBeginEvent(QTouchEvent* event);

interface/src/ui/overlays/Overlays.cpp

@@ -769,6 +769,26 @@ bool Overlays::mousePressEvent(QMouseEvent* event) {
     return false;
 }
 
+bool Overlays::mouseDoublePressEvent(QMouseEvent* event) {
+    PerformanceTimer perfTimer("Overlays::mouseDoublePressEvent");
+
+    PickRay ray = qApp->computePickRay(event->x(), event->y());
+    RayToOverlayIntersectionResult rayPickResult = findRayIntersectionForMouseEvent(ray);
+    if (rayPickResult.intersects) {
+        _currentClickingOnOverlayID = rayPickResult.overlayID;
+
+        // Only Web overlays can have focus.
+        auto thisOverlay = std::dynamic_pointer_cast<Web3DOverlay>(getOverlay(_currentClickingOnOverlayID));
+        if (thisOverlay) {
+            auto pointerEvent = calculatePointerEvent(thisOverlay, ray, rayPickResult, event, PointerEvent::Press);
+            emit mouseDoublePressOnOverlay(_currentClickingOnOverlayID, pointerEvent);
+            return true;
+        }
+    }
+    emit mouseDoublePressOffOverlay();
+    return false;
+}
+
 bool Overlays::mouseReleaseEvent(QMouseEvent* event) {
     PerformanceTimer perfTimer("Overlays::mouseReleaseEvent");
 

interface/src/ui/overlays/Overlays.h

@@ -101,6 +101,7 @@ public:
     OverlayID addOverlay(Overlay::Pointer overlay);
 
     bool mousePressEvent(QMouseEvent* event);
+    bool mouseDoublePressEvent(QMouseEvent* event);
     bool mouseReleaseEvent(QMouseEvent* event);
     bool mouseMoveEvent(QMouseEvent* event);
 
@@ -300,9 +301,11 @@ signals:
     void panelDeleted(OverlayID id);
 
     void mousePressOnOverlay(OverlayID overlayID, const PointerEvent& event);
+    void mouseDoublePressOnOverlay(OverlayID overlayID, const PointerEvent& event);
     void mouseReleaseOnOverlay(OverlayID overlayID, const PointerEvent& event);
     void mouseMoveOnOverlay(OverlayID overlayID, const PointerEvent& event);
     void mousePressOffOverlay();
+    void mouseDoublePressOffOverlay();
 
     void hoverEnterOverlay(OverlayID overlayID, const PointerEvent& event);
     void hoverOverOverlay(OverlayID overlayID, const PointerEvent& event);

libraries/animation/src/Rig.cpp

@@ -1310,17 +1310,18 @@ void Rig::copyJointsFromJointData(const QVector<JointData>& jointDataVec) {
     if (!_animSkeleton) {
         return;
     }
-    if (jointDataVec.size() != (int)_internalPoseSet._relativePoses.size()) {
-        // animations haven't fully loaded yet.
-        _internalPoseSet._relativePoses = _animSkeleton->getRelativeDefaultPoses();
+    int numJoints = jointDataVec.size();
+    const AnimPoseVec& absoluteDefaultPoses = _animSkeleton->getAbsoluteDefaultPoses();
+    if (numJoints != (int)absoluteDefaultPoses.size()) {
+        // jointData is incompatible
+        return;
     }
 
     // make a vector of rotations in absolute-geometry-frame
-    const AnimPoseVec& absoluteDefaultPoses = _animSkeleton->getAbsoluteDefaultPoses();
     std::vector<glm::quat> rotations;
-    rotations.reserve(absoluteDefaultPoses.size());
+    rotations.reserve(numJoints);
     const glm::quat rigToGeometryRot(glmExtractRotation(_rigToGeometryTransform));
-    for (int i = 0; i < jointDataVec.size(); i++) {
+    for (int i = 0; i < numJoints; i++) {
         const JointData& data = jointDataVec.at(i);
         if (data.rotationSet) {
             // JointData rotations are in absolute rig-frame so we rotate them to absolute geometry-frame
@@ -1334,8 +1335,11 @@ void Rig::copyJointsFromJointData(const QVector<JointData>& jointDataVec) {
     _animSkeleton->convertAbsoluteRotationsToRelative(rotations);
 
     // store new relative poses
+    if (numJoints != (int)_internalPoseSet._relativePoses.size()) {
+        _internalPoseSet._relativePoses = _animSkeleton->getRelativeDefaultPoses();
+    }
     const AnimPoseVec& relativeDefaultPoses = _animSkeleton->getRelativeDefaultPoses();
-    for (int i = 0; i < jointDataVec.size(); i++) {
+    for (int i = 0; i < numJoints; i++) {
         const JointData& data = jointDataVec.at(i);
         _internalPoseSet._relativePoses[i].scale() = Vectors::ONE;
         _internalPoseSet._relativePoses[i].rot() = rotations[i];

libraries/entities-renderer/src/EntityTreeRenderer.cpp

@@ -735,6 +735,52 @@ void EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
     }
 }
 
+void EntityTreeRenderer::mouseDoublePressEvent(QMouseEvent* event) {
+    // If we don't have a tree, or we're in the process of shutting down, then don't
+    // process these events.
+    if (!_tree || _shuttingDown) {
+        return;
+    }
+    PerformanceTimer perfTimer("EntityTreeRenderer::mouseDoublePressEvent");
+    PickRay ray = _viewState->computePickRay(event->x(), event->y());
+
+    bool precisionPicking = !_dontDoPrecisionPicking;
+    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
+    if (rayPickResult.intersects) {
+        //qCDebug(entitiesrenderer) << "mouseDoublePressEvent over entity:" << rayPickResult.entityID;
+
+        QString urlString = rayPickResult.properties.getHref();
+        QUrl url = QUrl(urlString, QUrl::StrictMode);
+        if (url.isValid() && !url.isEmpty()){
+            DependencyManager::get<AddressManager>()->handleLookupString(urlString);
+        }
+
+        glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
+        PointerEvent pointerEvent(PointerEvent::Press, MOUSE_POINTER_ID,
+            pos2D, rayPickResult.intersection,
+            rayPickResult.surfaceNormal, ray.direction,
+            toPointerButton(*event), toPointerButtons(*event));
+
+        emit mouseDoublePressOnEntity(rayPickResult.entityID, pointerEvent);
+
+        if (_entitiesScriptEngine) {
+            _entitiesScriptEngine->callEntityScriptMethod(rayPickResult.entityID, "mouseDoublePressOnEntity", pointerEvent);
+        }
+
+        _currentClickingOnEntityID = rayPickResult.entityID;
+        emit clickDownOnEntity(_currentClickingOnEntityID, pointerEvent);
+        if (_entitiesScriptEngine) {
+            _entitiesScriptEngine->callEntityScriptMethod(_currentClickingOnEntityID, "doubleclickOnEntity", pointerEvent);
+        }
+
+        _lastPointerEvent = pointerEvent;
+        _lastPointerEventValid = true;
+
+    } else {
+        emit mouseDoublePressOffEntity();
+    }
+}
+
 void EntityTreeRenderer::mouseReleaseEvent(QMouseEvent* event) {
     // If we don't have a tree, or we're in the process of shutting down, then don't
     // process these events.

libraries/entities-renderer/src/EntityTreeRenderer.h

@@ -90,6 +90,7 @@ public:
     // event handles which may generate entity related events
     void mouseReleaseEvent(QMouseEvent* event);
     void mousePressEvent(QMouseEvent* event);
+    void mouseDoublePressEvent(QMouseEvent* event);
     void mouseMoveEvent(QMouseEvent* event);
 
     /// connect our signals to anEntityScriptingInterface for firing of events related clicking,
@@ -103,9 +104,11 @@ public:
 
 signals:
     void mousePressOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
+    void mouseDoublePressOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
     void mouseMoveOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
     void mouseReleaseOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
     void mousePressOffEntity();
+    void mouseDoublePressOffEntity();
 
     void clickDownOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);
     void holdingClickOnEntity(const EntityItemID& entityItemID, const PointerEvent& event);

libraries/shared/src/PointerEvent.cpp

@@ -47,6 +47,9 @@ QScriptValue PointerEvent::toScriptValue(QScriptEngine* engine, const PointerEve
     case Press:
         obj.setProperty("type", "Press");
         break;
+    case DoublePress:
+        obj.setProperty("type", "DoublePress");
+        break;
     case Release:
         obj.setProperty("type", "Release");
         break;
@@ -128,6 +131,8 @@ void PointerEvent::fromScriptValue(const QScriptValue& object, PointerEvent& eve
         QString typeStr = type.isString() ? type.toString() : "Move";
         if (typeStr == "Press") {
             event._type = Press;
+        } else if (typeStr == "DoublePress") {
+            event._type = DoublePress;
         } else if (typeStr == "Release") {
             event._type = Release;
         } else {

libraries/shared/src/PointerEvent.h

@@ -26,9 +26,10 @@ public:
     };
 
     enum EventType {
-        Press,     // A button has just been pressed
-        Release,   // A button has just been released
-        Move       // The pointer has just moved
+        Press,       // A button has just been pressed
+        DoublePress, // A button has just been double pressed
+        Release,     // A button has just been released
+        Move         // The pointer has just moved
     };
 
     PointerEvent();

script-archive/entityScripts/doubleClickExample.js

@@ -0,0 +1,19 @@
+(function() {
+    var _this;
+    function DoubleClickExample() {
+        _this = this;
+        return;
+    }
+
+    DoubleClickExample.prototype = {
+        clickDownOnEntity: function() {
+            print("clickDownOnEntity");
+        },
+
+        doubleclickOnEntity: function() {
+            print("doubleclickOnEntity");
+        }
+
+    };
+    return new DoubleClickExample();
+});