unravel spaghetti, prefer std over Qt containers

interface/src/avatar/MyAvatar.cpp

@@ -5310,7 +5310,7 @@ void MyAvatar::releaseGrab(const QUuid& grabID) {
 
     _avatarGrabsLock.withWriteLock([&] {
         if (_avatarGrabData.remove(grabID)) {
-            _deletedAvatarGrabs.insert(grabID);
+            _deletedAvatarGrabs.push_back(grabID);
             tellHandler = true;
         }
     });

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

@@ -331,19 +331,18 @@ bool Avatar::updateGrabs() {
     }
 
     bool grabAddedOrRemoved = false;
-    // update the Grabs according to any changes in _avatarGrabData
     _avatarGrabsLock.withWriteLock([&] {
         if (_avatarGrabDataChanged) {
+            // collect changes in _avatarGrabData
             foreach (auto grabID, _avatarGrabData.keys()) {
-                AvatarGrabMap::iterator grabItr = _avatarGrabs.find(grabID);
+                MapOfGrabs::iterator itr = _avatarGrabs.find(grabID);
-                if (grabItr == _avatarGrabs.end()) {
+                if (itr == _avatarGrabs.end()) {
                     GrabPointer grab = std::make_shared<Grab>();
                     grab->fromByteArray(_avatarGrabData.value(grabID));
                     _avatarGrabs[grabID] = grab;
                     _changedAvatarGrabs.insert(grabID);
                 } else {
-                    GrabPointer grab = grabItr.value();
+                    bool changed = itr->second->fromByteArray(_avatarGrabData.value(grabID));
-                    bool changed = grab->fromByteArray(_avatarGrabData.value(grabID));
                     if (changed) {
                         _changedAvatarGrabs.insert(grabID);
                     }
@@ -352,40 +351,38 @@ bool Avatar::updateGrabs() {
             _avatarGrabDataChanged = false;
         }
 
-        QMutableSetIterator<QUuid> delItr(_deletedAvatarGrabs);
+        // delete _avatarGrabs
-        while (delItr.hasNext()) {
+        VectorOfIDs undeleted;
-            QUuid grabID = delItr.next();
+        for (const auto& id : _deletedAvatarGrabs) {
-            GrabPointer grab = _avatarGrabs[grabID];
+            MapOfGrabs::iterator itr = _avatarGrabs.find(id);
-            if (!grab) {
+            if (itr == _avatarGrabs.end()) {
-                delItr.remove();
                 continue;
             }
 
             bool success;
+            const GrabPointer& grab = itr->second;
             SpatiallyNestablePointer target = SpatiallyNestable::findByID(grab->getTargetID(), success);
-
-            // only clear this entry from the _deletedAvatarGrabs if we found the entity.
             if (success && target) {
                 target->removeGrab(grab);
-                delItr.remove();
+                _avatarGrabs.erase(itr);
                 grabAddedOrRemoved = true;
+            } else {
+                undeleted.push_back(id);
             }
-            _avatarGrabs.remove(grabID);
-            _changedAvatarGrabs.remove(grabID);
         }
+        _deletedAvatarGrabs = std::move(undeleted);
 
-        QMutableSetIterator<QUuid> changeItr(_changedAvatarGrabs);
+        // change _avatarGrabs and add Actions to target
-        while (changeItr.hasNext()) {
+        SetOfIDs unchanged;
-            QUuid grabID = changeItr.next();
+        for (const auto& id : _changedAvatarGrabs) {
-            GrabPointer& grab = _avatarGrabs[grabID];
+            MapOfGrabs::iterator itr = _avatarGrabs.find(id);
-            if (!grab) {
+            if (itr == _avatarGrabs.end()) {
-                changeItr.remove();
                 continue;
             }
 
             bool success;
+            const GrabPointer& grab = itr->second;
             SpatiallyNestablePointer target = SpatiallyNestable::findByID(grab->getTargetID(), success);
-
             if (success && target) {
                 target->addGrab(grab);
                 if (isMyAvatar()) {
@@ -394,11 +391,12 @@ bool Avatar::updateGrabs() {
                         entity->upgradeScriptSimulationPriority(PERSONAL_SIMULATION_PRIORITY);
                     }
                 }
-                // only clear this entry from the _changedAvatarGrabs if we found the entity.
-                changeItr.remove();
                 grabAddedOrRemoved = true;
+            } else {
+                unchanged.insert(id);
             }
         }
+        _changedAvatarGrabs = std::move(unchanged);
     });
     return grabAddedOrRemoved;
 }
@@ -406,8 +404,8 @@ bool Avatar::updateGrabs() {
 void Avatar::accumulateGrabPositions(std::map<QUuid, GrabLocationAccumulator>& grabAccumulators) {
     // relay avatar's joint position to grabbed target in a way that allows for averaging
     _avatarGrabsLock.withReadLock([&] {
-        foreach (auto grabID, _avatarGrabs.keys()) {
+        for (const auto& entry : _avatarGrabs) {
-            const GrabPointer& grab = _avatarGrabs.value(grabID);
+            const GrabPointer& grab = entry.second;
 
             if (!grab || !grab->getActionID().isNull()) {
                 continue; // the accumulated value isn't used, in this case.
@@ -1922,3 +1920,12 @@ scriptable::ScriptableModelBase Avatar::getScriptableModel() {
     }
     return result;
 }
+
+void Avatar::clearAvatarGrabData(const QUuid& id) {
+    AvatarData::clearAvatarGrabData(id);
+    _avatarGrabsLock.withWriteLock([&] {
+        if (_avatarGrabs.find(id) == _avatarGrabs.end()) {
+            _deletedAvatarGrabs.push_back(id);
+        }
+    });
+}

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

@@ -14,6 +14,9 @@
 #include <functional>
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
+#include <map>
+#include <set>
+#include <vector>
 
 #include <QtCore/QUuid>
 
@@ -23,10 +26,12 @@
 #include <graphics-scripting/Forward.h>
 #include <GLMHelpers.h>
 
+#include <Grab.h>
+#include <ThreadSafeValueCache.h>
+
 #include "Head.h"
 #include "SkeletonModel.h"
 #include "Rig.h"
-#include <ThreadSafeValueCache.h>
 
 #include "MetaModelPayload.h"
 
@@ -625,8 +630,15 @@ protected:
 
     static void metaBlendshapeOperator(render::ItemID renderItemID, int blendshapeNumber, const QVector<BlendshapeOffset>& blendshapeOffsets,
                                        const QVector<int>& blendedMeshSizes, const render::ItemIDs& subItemIDs);
+    void clearAvatarGrabData(const QUuid& grabID) override;
 
-    AvatarGrabMap _avatarGrabs;
+    using SetOfIDs = std::set<QUuid>;
+    using VectorOfIDs = std::vector<QUuid>;
+    using MapOfGrabs = std::map<QUuid, GrabPointer>;
+
+    MapOfGrabs _avatarGrabs;
+    SetOfIDs _changedAvatarGrabs; // updated grab IDs -- changes needed to entities or physics
+    VectorOfIDs _deletedAvatarGrabs; // deleted grab IDs -- changes needed to entities or physics
 };
 
 #endif // hifi_Avatar_h

libraries/avatars/src/AvatarData.cpp

@@ -2997,7 +2997,6 @@ void AvatarData::clearAvatarGrabData(const QUuid& grabID) {
     _avatarGrabsLock.withWriteLock([&] {
         if (_avatarGrabData.remove(grabID)) {
             _avatarGrabDataChanged = true;
-            _deletedAvatarGrabs.insert(grabID);
         }
     });
 }

libraries/avatars/src/AvatarData.h

@@ -54,7 +54,6 @@
 #include "AvatarTraits.h"
 #include "HeadData.h"
 #include "PathUtils.h"
-#include "Grab.h"
 
 #include <graphics/Material.h>
 
@@ -67,8 +66,6 @@ using PackedAvatarEntityMap = QMap<QUuid, QByteArray>; // similar to AvatarEntit
 using AvatarEntityIDs = QSet<QUuid>;
 
 using AvatarGrabDataMap = QMap<QUuid, QByteArray>;
-using AvatarGrabIDs = QSet<QUuid>;
-using AvatarGrabMap = QMap<QUuid, GrabPointer>;
 
 using AvatarDataSequenceNumber = uint16_t;
 
@@ -1473,8 +1470,6 @@ protected:
     mutable ReadWriteLockable _avatarGrabsLock;
     AvatarGrabDataMap _avatarGrabData;
     bool _avatarGrabDataChanged { false }; // by network
-    AvatarGrabIDs _changedAvatarGrabs; // updated grab IDs -- changes needed to entities or physics
-    AvatarGrabIDs _deletedAvatarGrabs; // deleted grab IDs -- changes needed to entities or physics
 
     // used to transform any sensor into world space, including the _hmdSensorMat, or hand controllers.
     ThreadSafeValueCache<glm::mat4> _sensorToWorldMatrixCache { glm::mat4() };
@@ -1537,7 +1532,7 @@ protected:
     }
 
     bool updateAvatarGrabData(const QUuid& grabID, const QByteArray& grabData);
-    void clearAvatarGrabData(const QUuid& grabID);
+    virtual void clearAvatarGrabData(const QUuid& grabID);
 
 private:
     friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar);