save AvatarEntities settings as strings

interface/src/avatar/MyAvatar.cpp

@@ -1263,11 +1263,11 @@ void MyAvatar::resizeAvatarEntitySettingHandles(unsigned int avatarEntityIndex)
     // Create Setting::Handles to mimic this.
 
     while (_avatarEntityIDSettings.size() <= avatarEntityIndex) {
-        Setting::Handle<QUuid> idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData"
+        Setting::Handle<QString> idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData"
-                                        << QString::number(avatarEntityIndex + 1) << "id", QUuid());
+                                        << QString::number(avatarEntityIndex + 1) << "id", QUuid().toString());
         _avatarEntityIDSettings.push_back(idHandle);
-        Setting::Handle<QByteArray> dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData"
+        Setting::Handle<QString> dataHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData"
-                                               << QString::number(avatarEntityIndex + 1) << "properties", QByteArray());
+                                               << QString::number(avatarEntityIndex + 1) << "properties", QString());
         _avatarEntityDataSettings.push_back(dataHandle);
     }
 }
@@ -1299,23 +1299,46 @@ void MyAvatar::saveData() {
 
     auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
     _avatarEntitiesLock.withReadLock([&] {
-        QList<QUuid> avatarEntityIDs = _avatarEntityData.keys();
+        uint32_t numEntities = _avatarEntityData.size();
-        unsigned int avatarEntityCount = avatarEntityIDs.size();
+        uint32_t prevNumEntities = _avatarEntityCountSetting.get(0);
-        unsigned int previousAvatarEntityCount = _avatarEntityCountSetting.get(0);
+        resizeAvatarEntitySettingHandles(std::max<uint32_t>(numEntities, prevNumEntities));
-        resizeAvatarEntitySettingHandles(std::max<unsigned int>(avatarEntityCount, previousAvatarEntityCount));
-        _avatarEntityCountSetting.set(avatarEntityCount);
 
-        unsigned int avatarEntityIndex = 0;
+        // Note: this roundabout path from AvatarEntityData to JSON string is NOT efficient
-        for (auto entityID : avatarEntityIDs) {
+        QScriptEngine engine;
-            _avatarEntityIDSettings[avatarEntityIndex].set(entityID);
+        QScriptValue toStringMethod = engine.evaluate("(function() { return JSON.stringify(this) })");
-            _avatarEntityDataSettings[avatarEntityIndex].set(_avatarEntityData.value(entityID));
+        AvatarEntityMap::const_iterator itr = _avatarEntityData.begin();
-            avatarEntityIndex++;
+        numEntities = 0;
+        while (itr != _avatarEntityData.end()) {
+            EntityItemProperties properties;
+            QByteArray buffer = itr.value();
+            if (properties.constructFromBuffer((uint8_t*)buffer.data(), buffer.size())) {
+                if (properties.getParentID() == getSessionUUID()) {
+                    properties.setParentID(AVATAR_SELF_ID);
+                }
+                QScriptValue scriptValue = EntityItemPropertiesToScriptValue(&engine, properties);
+                scriptValue.setProperty("toString", toStringMethod);
+                _avatarEntityDataSettings[numEntities].set(scriptValue.toString());
+                _avatarEntityIDSettings[numEntities].set(itr.key().toString());
+                ++numEntities;
+            } else {
+                // buffer is corrupt --> skip it
+            }
+            ++itr;
         }
+        _avatarEntityCountSetting.set(numEntities);
 
-        // clean up any left-over (due to the list shrinking) slots
+        if (numEntities < prevNumEntities) {
-        for (; avatarEntityIndex < previousAvatarEntityCount; avatarEntityIndex++) {
+            uint32_t numEntitiesToRemove = prevNumEntities - numEntities;
-            _avatarEntityIDSettings[avatarEntityIndex].remove();
+            for (uint32_t i = 0; i < numEntitiesToRemove; ++i) {
-            _avatarEntityDataSettings[avatarEntityIndex].remove();
+                if (_avatarEntityIDSettings.size() > numEntities) {
+                    _avatarEntityIDSettings.back().remove();
+                    _avatarEntityIDSettings.pop_back();
+                }
+                if (_avatarEntityDataSettings.size() > numEntities) {
+                    _avatarEntityDataSettings.back().remove();
+                    _avatarEntityDataSettings.pop_back();
+                }
+            }
         }
     });
 }
@@ -1426,13 +1449,14 @@ void MyAvatar::loadData() {
 
     useFullAvatarURL(_fullAvatarURLFromPreferences, _fullAvatarModelName);
 
-    int avatarEntityCount = _avatarEntityCountSetting.get(0);
+    int numEntities = _avatarEntityCountSetting.get(0);
-    for (int i = 0; i < avatarEntityCount; i++) {
+
+    for (int i = 0; i < numEntities; i++) {
         resizeAvatarEntitySettingHandles(i);
-        // QUuid entityID = QUuid::createUuid(); // generate a new ID
+        QUuid entityID = QUuid::createUuid(); // generate a new ID
-        QUuid entityID = _avatarEntityIDSettings[i].get(QUuid());
+        QString propertiesString = _avatarEntityDataSettings[i].get();
-        QByteArray properties = _avatarEntityDataSettings[i].get();
+        // TODO: convert propertiesString to EntityItemProperties
-        updateAvatarEntity(entityID, properties);
+        //updateAvatarEntity(entityID, properties);
     }
 
     // Flying preferences must be loaded before calling setFlyingEnabled()

interface/src/avatar/MyAvatar.h

@@ -1936,8 +1936,8 @@ private:
     Setting::Handle<bool> _flyingHMDSetting;
     Setting::Handle<int> _avatarEntityCountSetting;
     Setting::Handle<bool> _allowTeleportingSetting { "allowTeleporting", true };
-    std::vector<Setting::Handle<QUuid>> _avatarEntityIDSettings;
+    std::vector<Setting::Handle<QString>> _avatarEntityIDSettings;
-    std::vector<Setting::Handle<QByteArray>> _avatarEntityDataSettings;
+    std::vector<Setting::Handle<QString>> _avatarEntityDataSettings;
 };
 
 QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);

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

@@ -383,15 +383,7 @@ void Avatar::updateAvatarEntities() {
                 // create a temporary EntityItem to unpack the data
                 int32_t bytesLeftToRead = data.size();
                 unsigned char* dataAt = (unsigned char*)(data.data());
-                ReadBitstreamToTreeParams args;
+                properties.constructFromBuffer(dataAt, bytesLeftToRead);
-                EntityItemPointer tempEntity = EntityTypes::constructEntityItem(dataAt, bytesLeftToRead, args);
-                if (!tempEntity) {
-                    continue;
-                }
-                tempEntity->readEntityDataFromBuffer(dataAt, bytesLeftToRead, args);
-
-                // extract the properties from tempEntity
-                properties = tempEntity->getProperties();
             }
 
             properties.setEntityHostType(entity::HostType::AVATAR);

libraries/entities/src/EntityItemProperties.cpp

@@ -90,6 +90,16 @@ void EntityItemProperties::setLastEdited(quint64 usecTime) {
     _lastEdited = usecTime > _created ? usecTime : _created;
 }
 
+bool EntityItemProperties::constructFromBuffer(const unsigned char* data, int dataLength) {
+    ReadBitstreamToTreeParams args;
+    EntityItemPointer tempEntity = EntityTypes::constructEntityItem(data, dataLength, args);
+    if (!tempEntity) {
+        return false;
+    }
+    tempEntity->readEntityDataFromBuffer(data, dataLength, args);
+    (*this) = tempEntity->getProperties();
+    return true;
+}
 
 QHash<QString, ShapeType> stringToShapeTypeLookup;
 

libraries/entities/src/EntityItemProperties.h

@@ -135,6 +135,8 @@ public:
     EntityPropertyFlags getDesiredProperties() { return _desiredProperties; }
     void setDesiredProperties(EntityPropertyFlags properties) {  _desiredProperties = properties; }
 
+    bool constructFromBuffer(const unsigned char* data, int dataLength);
+
     // Note:  DEFINE_PROPERTY(PROP_FOO, Foo, foo, type, value) creates the following methods and variables:
     // type getFoo() const;
     // void setFoo(type);