From 1860e61a3014be9cee540b2765e099485abf2dd9 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 3 Apr 2019 07:42:56 -0700
Subject: [PATCH] more correct collision group during grabs

---
 libraries/entities/src/EntityItem.cpp       | 29 +++++----------------
 libraries/entities/src/EntityItem.h         |  2 +-
 libraries/physics/src/EntityMotionState.cpp |  5 ++--
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index bd4c6e5c71..8a50c39da9 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -1698,10 +1698,7 @@ AACube EntityItem::getQueryAACube(bool& success) const {
 }
 
 bool EntityItem::shouldPuffQueryAACube() const {
-    bool hasGrabs = _grabsLock.resultWithReadLock<bool>([&] {
-        return _grabs.count() > 0;
-    });
-    return hasActions() || isChildOfMyAvatar() || isMovingRelativeToParent() || hasGrabs;
+    return hasActions() || isChildOfMyAvatar() || isMovingRelativeToParent();
 }
 
 // TODO: get rid of all users of this function...
@@ -1896,7 +1893,8 @@ void EntityItem::setScaledDimensions(const glm::vec3& value) {
 
 void EntityItem::setUnscaledDimensions(const glm::vec3& value) {
     glm::vec3 newDimensions = glm::max(value, glm::vec3(ENTITY_ITEM_MIN_DIMENSION));
-    if (getUnscaledDimensions() != newDimensions) {
+    const float MIN_SCALE_CHANGE_SQUARED = 1.0e-6f;
+    if (glm::length2(getUnscaledDimensions() - newDimensions) > MIN_SCALE_CHANGE_SQUARED) {
         withWriteLock([&] {
             _unscaledDimensions = newDimensions;
         });
@@ -2086,7 +2084,7 @@ void EntityItem::computeCollisionGroupAndFinalMask(int32_t& group, int32_t& mask
     } else {
         if (getDynamic()) {
             group = BULLET_COLLISION_GROUP_DYNAMIC;
-        } else if (isMovingRelativeToParent() || hasActions()) {
+        } else if (hasActions() || isMovingRelativeToParent()) {
             group = BULLET_COLLISION_GROUP_KINEMATIC;
         } else {
             group = BULLET_COLLISION_GROUP_STATIC;
@@ -3057,30 +3055,18 @@ bool EntityItem::getCollisionless() const {
 }
 
 uint16_t EntityItem::getCollisionMask() const {
-    uint16_t result;
-    withReadLock([&] {
-        result = _collisionMask;
-    });
-    return result;
+    return _collisionMask;
 }
 
 bool EntityItem::getDynamic() const {
     if (SHAPE_TYPE_STATIC_MESH == getShapeType()) {
         return false;
     }
-    bool result;
-    withReadLock([&] {
-        result = _dynamic;
-    });
-    return result;
+    return _dynamic;
 }
 
 bool EntityItem::getLocked() const {
-    bool result;
-    withReadLock([&] {
-        result = _locked;
-    });
-    return result;
+    return _locked;
 }
 
 void EntityItem::setLocked(bool value) {
@@ -3152,7 +3138,6 @@ uint32_t EntityItem::getDirtyFlags() const {
     return result;
 }
 
-
 void EntityItem::markDirtyFlags(uint32_t mask) {
     withWriteLock([&] {
         mask &= Simulation::DIRTY_FLAGS;
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 01ed949a0c..c57fd16a2e 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -448,7 +448,7 @@ public:
     bool clearActions(EntitySimulationPointer simulation);
     void setDynamicData(QByteArray dynamicData);
     const QByteArray getDynamicData() const;
-    bool hasActions() const { return !_objectActions.empty(); }
+    bool hasActions() const { return !_objectActions.empty() || !_grabActions.empty(); }
     QList<QUuid> getActionIDs() const { return _objectActions.keys(); }
     QVariantMap getActionArguments(const QUuid& actionID) const;
     void deserializeActions();
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 4d210c96c5..6abe5c3899 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -217,9 +217,8 @@ PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
         }
         return MOTION_TYPE_DYNAMIC;
     }
-    if (_entity->isMovingRelativeToParent() ||
-        _entity->hasActions() ||
-        _entity->hasGrabs() ||
+    if (_entity->hasActions() ||
+        _entity->isMovingRelativeToParent() ||
         _entity->hasAncestorOfType(NestableType::Avatar)) {
         return MOTION_TYPE_KINEMATIC;
     }