Agent bots can manipulate AvatarEntities again

assignment-client/src/avatars/ScriptableAvatar.cpp

@@ -21,6 +21,8 @@
 #include <GLMHelpers.h>
 #include <ResourceRequestObserver.h>
 #include <AvatarLogging.h>
+#include <EntityItem.h>
+#include <EntityItemProperties.h>
 
 
 ScriptableAvatar::ScriptableAvatar() {
@@ -249,3 +251,52 @@ void ScriptableAvatar::setHasProceduralEyeFaceMovement(bool hasProceduralEyeFace
 void ScriptableAvatar::setHasAudioEnabledFaceMovement(bool hasAudioEnabledFaceMovement) {
     _headData->setHasAudioEnabledFaceMovement(hasAudioEnabledFaceMovement);
 }
+
+void ScriptableAvatar::updateAvatarEntity(const QUuid& id, const QScriptValue& data) {
+    if (data.isNull()) {
+        // interpret this as a DELETE
+        std::map<QUuid, EntityItemPointer>::iterator itr = _entities.find(id);
+        if (itr != _entities.end()) {
+            _entities.erase(itr);
+            clearAvatarEntity(id);
+        }
+    } else {
+        EntityItemPointer entity;
+        EntityItemProperties properties;
+        bool honorReadOnly = true;
+        properties.copyFromScriptValue(data, honorReadOnly);
+
+        std::map<QUuid, EntityItemPointer>::iterator itr = _entities.find(id);
+        if (itr == _entities.end()) {
+            // this is an ADD
+            entity = EntityTypes::constructEntityItem(id, properties);
+            if (entity) {
+                OctreePacketData packetData(false, AvatarTraits::MAXIMUM_TRAIT_SIZE);
+                EncodeBitstreamParams params;
+                EntityTreeElementExtraEncodeDataPointer extra { nullptr };
+                OctreeElement::AppendState appendState = entity->appendEntityData(&packetData, params, extra);
+
+                if (appendState == OctreeElement::COMPLETED) {
+                    _entities[id] = entity;
+                    QByteArray tempArray((const char*)packetData.getUncompressedData(), packetData.getUncompressedSize());
+                    storeAvatarEntityDataPayload(id, tempArray);
+                }
+            }
+        } else {
+            // this is an UPDATE
+            entity = itr->second;
+            bool somethingChanged = entity->setProperties(properties);
+            if (somethingChanged) {
+                OctreePacketData packetData(false, AvatarTraits::MAXIMUM_TRAIT_SIZE);
+                EncodeBitstreamParams params;
+                EntityTreeElementExtraEncodeDataPointer extra { nullptr };
+                OctreeElement::AppendState appendState = entity->appendEntityData(&packetData, params, extra);
+
+                if (appendState == OctreeElement::COMPLETED) {
+                    QByteArray tempArray((const char*)packetData.getUncompressedData(), packetData.getUncompressedSize());
+                    storeAvatarEntityDataPayload(id, tempArray);
+                }
+            }
+        }
+    }
+}

assignment-client/src/avatars/ScriptableAvatar.h

@@ -16,6 +16,7 @@
 #include <AnimSkeleton.h>
 #include <AvatarData.h>
 #include <ScriptEngine.h>
+#include <EntityItem.h>
 
 /**jsdoc
  * The <code>Avatar</code> API is used to manipulate scriptable avatars on the domain. This API is a subset of the 
@@ -184,6 +185,7 @@ public:
     bool getHasProceduralEyeFaceMovement() const override { return _headData->getHasProceduralEyeFaceMovement(); }
     void setHasAudioEnabledFaceMovement(bool hasAudioEnabledFaceMovement);
     bool getHasAudioEnabledFaceMovement() const override { return _headData->getHasAudioEnabledFaceMovement(); }
+    void updateAvatarEntity(const QUuid& id, const QScriptValue& data) override;
 
 public slots:
     void update(float deltatime);
@@ -202,6 +204,7 @@ private:
     QHash<QString, int> _fstJointIndices; ///< 1-based, since zero is returned for missing keys
     QStringList _fstJointNames; ///< in order of depth-first traversal
     QUrl _skeletonFBXURL;
+    std::map<QUuid, EntityItemPointer> _entities;
 
     /// Loads the joint indices, names from the FST file (if any)
     void updateJointMappings();

interface/src/avatar/MyAvatar.cpp

@@ -2061,6 +2061,10 @@ void MyAvatar::clearJointsData() {
     _skeletonModel->getRig().clearJointStates();
 }
 
+void MyAvatar::updateAvatarEntity(const QUuid& id, const QScriptValue& data) {
+    // TODO: implement this
+}
+
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     _skeletonModelChangeCount++;
     int skeletonModelChangeCount = _skeletonModelChangeCount;

interface/src/avatar/MyAvatar.h

@@ -851,6 +851,8 @@ public:
     virtual void clearJointData(const QString& name) override;
     virtual void clearJointsData() override;
 
+    void updateAvatarEntity(const QUuid& id, const QScriptValue& data) override;
+
     /**jsdoc
      * @function MyAvatar.pinJoint
      * @param {number} index

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

@@ -235,13 +235,13 @@ public:
     void updateDisplayNameAlpha(bool showDisplayName);
     virtual void setSessionDisplayName(const QString& sessionDisplayName) override { }; // no-op
 
+    virtual void updateAvatarEntity(const QUuid& entityID, const QScriptValue& entityData) override { }; // no-op
+
     virtual int parseDataFromBuffer(const QByteArray& buffer) override;
 
     static void renderJointConnectingCone(gpu::Batch& batch, glm::vec3 position1, glm::vec3 position2,
                                                float radius1, float radius2, const glm::vec4& color);
 
-    virtual void applyCollision(const glm::vec3& contactPoint, const glm::vec3& penetration) { }
-
     /**jsdoc
      * Set the offset applied to the current avatar. The offset adjusts the position that the avatar is rendered. For example, 
      * with an offset of <code>{ x: 0, y: 0.1, z: 0 }</code>, your avatar will appear to be raised off the ground slightly.

libraries/avatars/src/AvatarData.cpp

@@ -2776,8 +2776,8 @@ void AvatarData::storeAvatarEntityDataPayload(const QUuid& entityID, const QByte
     }
 }
 
-void AvatarData::updateAvatarEntity(const QUuid& entityID, const QString& entityPropertiesString) {
+void AvatarData::updateAvatarEntity(const QUuid& id, const QScriptValue& data) {
-    // TODO: implement this to expose AvatarEntity to JS
+    // no op
 }
 
 void AvatarData::clearAvatarEntity(const QUuid& entityID, bool requiresRemovalFromTree) {

libraries/avatars/src/AvatarData.h

@@ -957,9 +957,9 @@ public:
     /**jsdoc
      * @function MyAvatar.updateAvatarEntity
      * @param {Uuid} entityID
-     * @param {string} entityData
+     * @param {object} entityData
      */
-    Q_INVOKABLE virtual void updateAvatarEntity(const QUuid& entityID, const QString& entityPropertiesString);
+    Q_INVOKABLE virtual void updateAvatarEntity(const QUuid& id, const QScriptValue& data);
 
     /**jsdoc
      * @function MyAvatar.clearAvatarEntity
@@ -1140,10 +1140,11 @@ public:
     Q_INVOKABLE AvatarEntityMap getAvatarEntityData() const;
 
     /**jsdoc
+     * Temporarily disabled.  Use updateAvatarEntity(id, properties) in the meantime.
      * @function MyAvatar.setAvatarEntityData
      * @param {object} avatarEntityData
      */
-    Q_INVOKABLE void setAvatarEntityData(const AvatarEntityMap& avatarEntityData);
+    void setAvatarEntityData(const AvatarEntityMap& avatarEntityData);
 
     virtual void setAvatarEntityDataChanged(bool value) { _avatarEntityDataChanged = value; }
     void insertDetachedEntityID(const QUuid entityID);

libraries/entities/src/EntityTypes.cpp

@@ -151,3 +151,7 @@ EntityItemPointer EntityTypes::constructEntityItem(const unsigned char* data, in
     }
     return nullptr;
 }
+
+EntityItemPointer EntityTypes::constructEntityItem(const QUuid& id, const EntityItemProperties& properties) {
+    return constructEntityItem(properties.getType(), id, properties);
+}

libraries/entities/src/EntityTypes.h

@@ -116,6 +116,7 @@ public:
     static void extractEntityTypeAndID(const unsigned char* data, int dataLength, EntityTypes::EntityType& typeOut, QUuid& idOut);
     static EntityItemPointer constructEntityItem(EntityType entityType, const EntityItemID& entityID, const EntityItemProperties& properties);
     static EntityItemPointer constructEntityItem(const unsigned char* data, int bytesToRead);
+    static EntityItemPointer constructEntityItem(const QUuid& id, const EntityItemProperties& properties);
 
 private:
     static QMap<EntityType, QString> _typeToNameMap;