Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Include localVelocity etc. to match Entity.getEntityProperties()

Browse source
This commit is contained in:
David Rowe 2019-12-01 21:24:40 +13:00
parent 9d3e9f6a78
commit 200ff2499e
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
assignment-client/src/avatars/ScriptableAvatar.cpp
View file

@ -299,7 +299,16 @@ AvatarEntityMap ScriptableAvatar::getAvatarEntityDataInternal(bool allProperties
for (const auto& itr : _entities) { for (const auto& itr : _entities) {
QUuid id = itr.first; QUuid id = itr.first;
EntityItemPointer entity = itr.second; 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; QByteArray blob;
EntityItemProperties::propertiesToBlob(_scriptEngine, sessionID, properties, blob, allProperties); EntityItemProperties::propertiesToBlob(_scriptEngine, sessionID, properties, blob, allProperties);
data[id] = blob; data[id] = blob;

3
interface/src/avatar/MyAvatar.cpp
View file

@ -2562,6 +2562,9 @@ QVariantList MyAvatar::getAvatarEntitiesVariant() {
auto desiredProperties = entity->getEntityProperties(params); auto desiredProperties = entity->getEntityProperties(params);
desiredProperties += PROP_LOCAL_POSITION; desiredProperties += PROP_LOCAL_POSITION;
desiredProperties += PROP_LOCAL_ROTATION; desiredProperties += PROP_LOCAL_ROTATION;
desiredProperties += PROP_LOCAL_VELOCITY;
desiredProperties += PROP_LOCAL_ANGULAR_VELOCITY;
desiredProperties += PROP_LOCAL_DIMENSIONS;
QVariantMap avatarEntityData; QVariantMap avatarEntityData;
avatarEntityData["id"] = entityID; avatarEntityData["id"] = entityID;
EntityItemProperties entityProperties = entity->getProperties(desiredProperties); EntityItemProperties entityProperties = entity->getProperties(desiredProperties);