Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 21:50:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix getEntityProperties

Browse source
This commit is contained in:
SamGondelman 2019-01-30 17:17:39 -08:00
parent 10bb637753
commit 6e61c02d04
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/entities/src/EntityItem.cpp
View file

@ -88,13 +88,13 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
requestedProperties += PROP_REGISTRATION_POINT; requestedProperties += PROP_REGISTRATION_POINT;
requestedProperties += PROP_CREATED; requestedProperties += PROP_CREATED;
requestedProperties += PROP_LAST_EDITED_BY; requestedProperties += PROP_LAST_EDITED_BY;
//requestedProperties += PROP_ENTITY_HOST_TYPE; // not sent over the wire requestedProperties += PROP_ENTITY_HOST_TYPE;
//requestedProperties += PROP_OWNING_AVATAR_ID; // not sent over the wire requestedProperties += PROP_OWNING_AVATAR_ID;
requestedProperties += PROP_PARENT_ID; requestedProperties += PROP_PARENT_ID;
requestedProperties += PROP_PARENT_JOINT_INDEX; requestedProperties += PROP_PARENT_JOINT_INDEX;
requestedProperties += PROP_QUERY_AA_CUBE; requestedProperties += PROP_QUERY_AA_CUBE;
requestedProperties += PROP_CAN_CAST_SHADOW; requestedProperties += PROP_CAN_CAST_SHADOW;
// requestedProperties += PROP_VISIBLE_IN_SECONDARY_CAMERA; // not sent over the wire requestedProperties += PROP_VISIBLE_IN_SECONDARY_CAMERA;
requestedProperties += PROP_RENDER_LAYER; requestedProperties += PROP_RENDER_LAYER;
requestedProperties += PROP_PRIMITIVE_MODE; requestedProperties += PROP_PRIMITIVE_MODE;
requestedProperties += PROP_IGNORE_PICK_INTERSECTION; requestedProperties += PROP_IGNORE_PICK_INTERSECTION;
@ -180,6 +180,11 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
EntityPropertyFlags propertyFlags(PROP_LAST_ITEM); EntityPropertyFlags propertyFlags(PROP_LAST_ITEM);
EntityPropertyFlags requestedProperties = getEntityProperties(params); EntityPropertyFlags requestedProperties = getEntityProperties(params);
// these properties are not sent over the wire
requestedProperties -= PROP_ENTITY_HOST_TYPE;
requestedProperties -= PROP_OWNING_AVATAR_ID;
requestedProperties -= PROP_VISIBLE_IN_SECONDARY_CAMERA;
// If we are being called for a subsequent pass at appendEntityData() that failed to completely encode this item, // If we are being called for a subsequent pass at appendEntityData() that failed to completely encode this item,
// then our entityTreeElementExtraEncodeData should include data about which properties we need to append. // then our entityTreeElementExtraEncodeData should include data about which properties we need to append.
if (entityTreeElementExtraEncodeData && entityTreeElementExtraEncodeData->entities.contains(getEntityItemID())) { if (entityTreeElementExtraEncodeData && entityTreeElementExtraEncodeData->entities.contains(getEntityItemID())) {