From 200ff2499ed0358db99d2b0d93c2e0d135821e34 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sun, 1 Dec 2019 21:24:40 +1300 Subject: [PATCH] Include localVelocity etc. to match Entity.getEntityProperties() --- assignment-client/src/avatars/ScriptableAvatar.cpp | 11 ++++++++++- interface/src/avatar/MyAvatar.cpp | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp index 75aa321c28..3e91cd05e8 100644 --- a/assignment-client/src/avatars/ScriptableAvatar.cpp +++ b/assignment-client/src/avatars/ScriptableAvatar.cpp @@ -299,7 +299,16 @@ AvatarEntityMap ScriptableAvatar::getAvatarEntityDataInternal(bool allProperties for (const auto& itr : _entities) { QUuid id = itr.first; EntityItemPointer entity = itr.second; - EntityItemProperties properties = entity->getProperties(); + + EncodeBitstreamParams params; + auto desiredProperties = entity->getEntityProperties(params); + desiredProperties += PROP_LOCAL_POSITION; + desiredProperties += PROP_LOCAL_ROTATION; + desiredProperties += PROP_LOCAL_VELOCITY; + desiredProperties += PROP_LOCAL_ANGULAR_VELOCITY; + desiredProperties += PROP_LOCAL_DIMENSIONS; + EntityItemProperties properties = entity->getProperties(desiredProperties); + QByteArray blob; EntityItemProperties::propertiesToBlob(_scriptEngine, sessionID, properties, blob, allProperties); data[id] = blob; diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index fe4980c873..f723471b64 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -2562,6 +2562,9 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() { auto desiredProperties = entity->getEntityProperties(params); desiredProperties += PROP_LOCAL_POSITION; desiredProperties += PROP_LOCAL_ROTATION; + desiredProperties += PROP_LOCAL_VELOCITY; + desiredProperties += PROP_LOCAL_ANGULAR_VELOCITY; + desiredProperties += PROP_LOCAL_DIMENSIONS; QVariantMap avatarEntityData; avatarEntityData["id"] = entityID; EntityItemProperties entityProperties = entity->getProperties(desiredProperties);