deactivate grab action when grab is released

interface/src/avatar/MyAvatar.cpp

@@ -5306,7 +5306,10 @@ void MyAvatar::releaseGrab(const QUuid& grabID) {
         if (itr != _avatarGrabs.end()) {
             GrabPointer grab = itr->second;
             if (grab) {
-                grab->setDeleted(true);
+                grab->setReleased(true);
+                bool success;
+                SpatiallyNestablePointer target = SpatiallyNestable::findByID(grab->getTargetID(), success);
+                target->disableGrab(grab);
             }
         }
 

libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp

@@ -412,7 +412,7 @@ void Avatar::accumulateGrabPositions(std::map<QUuid, GrabLocationAccumulator>& g
             if (!grab || !grab->getActionID().isNull()) {
                 continue; // the accumulated value isn't used, in this case.
             }
-            if (grab->getDeleted()) {
+            if (grab->getReleased()) {
                 continue;
             }
 

libraries/entities/src/EntityDynamicInterface.h

@@ -59,6 +59,7 @@ public:
     virtual bool isReadyForAdd() const { return true; }
 
     bool isActive() { return _active; }
+    void deactivate() { _active = false; }
 
     virtual void removeFromSimulation(EntitySimulationPointer simulation) const = 0;
     virtual EntityItemWeakPointer getOwnerEntity() const = 0;

libraries/entities/src/EntityItem.cpp

@@ -3506,3 +3506,13 @@ void EntityItem::removeGrab(GrabPointer grab) {
     }
     disableNoBootstrap();
 }
+
+void EntityItem::disableGrab(GrabPointer grab) {
+    QUuid actionID = grab->getActionID();
+    if (!actionID.isNull()) {
+        EntityDynamicPointer action = _grabActions.value(actionID);
+        if (action) {
+            action->deactivate();
+        }
+    }
+}

libraries/entities/src/EntityItem.h

@@ -561,6 +561,7 @@ public:
 
     virtual void addGrab(GrabPointer grab) override;
     virtual void removeGrab(GrabPointer grab) override;
+    virtual void disableGrab(GrabPointer grab) override;
 
 signals:
     void requestRenderUpdate();

libraries/shared/src/Grab.h

@@ -49,7 +49,7 @@ public:
         _hand(newHand),
         _positionalOffset(newPositionalOffset),
         _rotationalOffset(newRotationalOffset),
-        _deleted(false) {}
+        _released(false) {}
 
     QByteArray toByteArray();
     bool fromByteArray(const QByteArray& grabData);
@@ -62,7 +62,7 @@ public:
         _positionalOffset = other->_positionalOffset;
         _rotationalOffset = other->_rotationalOffset;
         _actionID = other->_actionID;
-        _deleted = other->_deleted;
+        _released = other->_released;
         return *this;
     }
 
@@ -87,8 +87,8 @@ public:
     glm::quat getRotationalOffset() const { return _rotationalOffset; }
     void setRotationalOffset(glm::quat rotationalOffset) { _rotationalOffset = rotationalOffset; }
 
-    bool getDeleted() const { return _deleted; }
-    void setDeleted(bool value) { _deleted = value; }
+    bool getReleased() const { return _released; }
+    void setReleased(bool value) { _released = value; }
 
 protected:
     QUuid _actionID; // if an action is created in bullet for this grab, this is the ID
@@ -98,7 +98,7 @@ protected:
     QString _hand; // "left" or "right"
     glm::vec3 _positionalOffset; // relative to joint
     glm::quat _rotationalOffset; // relative to joint
-    bool _deleted { false }; // scheduled for deletion
+    bool _released { false }; // released and scheduled for deletion
 };
 
 

libraries/shared/src/SpatiallyNestable.cpp

@@ -1391,7 +1391,7 @@ bool SpatiallyNestable::hasGrabs() {
     bool result { false };
     _grabsLock.withReadLock([&] {
         foreach (const GrabPointer &grab, _grabs) {
-            if (grab && !grab->getDeleted()) {
+            if (grab && !grab->getReleased()) {
                 result = true;
                 break;
             }

libraries/shared/src/SpatiallyNestable.h

@@ -218,6 +218,7 @@ public:
 
     virtual void addGrab(GrabPointer grab);
     virtual void removeGrab(GrabPointer grab);
+    virtual void disableGrab(GrabPointer grab) {};
     bool hasGrabs();
     virtual QUuid getEditSenderID();