History

Optimized getEntityProperties

ksuprynowicz committed 3 years ago

Commit fdd8cb21 parent c18fd9017 files · +133 −96Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 17 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+70−41
@@ -797,10 +797,38 @@ QUuid EntityScriptingInterface::cloneEntity(const QUuid& entityIDToClone) { · 796 unmodified lines
797797
798798 EntityItemProperties EntityScriptingInterface::getEntityProperties(const QUuid& entityID) {
799799 const EntityPropertyFlags noSpecificProperties;
800− return getEntityProperties(entityID, noSpecificProperties);
800+ return getEntityPropertiesInternal(entityID, noSpecificProperties);
801801 }
802802
803−EntityItemProperties EntityScriptingInterface::getEntityProperties(const QUuid& entityID, EntityPropertyFlags desiredProperties) {
803+ScriptValue EntityScriptingInterface::getEntityProperties(const QUuid& entityID, const ScriptValue& extendedDesiredProperties) {
804+ EntityPropertyFlags desiredProperties;
805+ EntityItemProperties::entityPropertyFlagsFromScriptValue(extendedDesiredProperties, desiredProperties);
806+ EntityPseudoPropertyFlags desiredPseudoPropertyFlags;
807+
808+ if (extendedDesiredProperties.isString()) {
809+ readExtendedPropertyStringValue(extendedDesiredProperties, desiredPseudoPropertyFlags);
810+ desiredPseudoPropertyFlags.set(EntityPseudoPropertyFlag::FlagsActive);
811+ } else if (extendedDesiredProperties.isArray()) {
812+ const quint32 length = extendedDesiredProperties.property("length").toInt32();
813+ for (quint32 i = 0; i < length; i++) {
814+ readExtendedPropertyStringValue(extendedDesiredProperties.property(i), desiredPseudoPropertyFlags);
815+ }
816+ desiredPseudoPropertyFlags.set(EntityPseudoPropertyFlag::FlagsActive);
817+ }
818+
819+ if (_entityTree) {
820+ if (desiredPseudoPropertyFlags.none() && desiredProperties.isEmpty()) {
821+ desiredPseudoPropertyFlags.set();
822+ }
823+ }
824+
825+ EntityItemProperties properties = getEntityPropertiesInternal(entityID, desiredProperties);
826+
827+ return properties.copyToScriptValue(extendedDesiredProperties.engine().get(), false, false, false, desiredPseudoPropertyFlags);
828+}
829+
830+EntityItemProperties EntityScriptingInterface::getEntityPropertiesInternal(const QUuid& entityID, EntityPropertyFlags desiredProperties) {
831+
804832 PROFILE_RANGE(script_entities, __FUNCTION__);
805833
806834 bool scalesWithParent { false };
@@ -864,50 +892,51 @@ ScriptValue EntityScriptingInterface::getMultipleEntityProperties(ScriptContext* · 57 unmodified lines
864892 return entityScriptingInterface->getMultipleEntityPropertiesInternal(engine, entityIDs, context->argument(ARGUMENT_EXTENDED_DESIRED_PROPERTIES));
865893 }
866894
895+void EntityScriptingInterface::readExtendedPropertyStringValue(const ScriptValue& extendedProperty, EntityPseudoPropertyFlags& pseudoPropertyFlags) {
896+ const auto extendedPropertyString = extendedProperty.toString();
897+ if (extendedPropertyString == "id") {
898+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::ID);
899+ } else if (extendedPropertyString == "type") {
900+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::Type);
901+ } else if (extendedPropertyString == "age") {
902+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::Age);
903+ } else if (extendedPropertyString == "ageAsText") {
904+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::AgeAsText);
905+ } else if (extendedPropertyString == "lastEdited") {
906+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::LastEdited);
907+ } else if (extendedPropertyString == "boundingBox") {
908+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::BoundingBox);
909+ } else if (extendedPropertyString == "originalTextures") {
910+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::OriginalTextures);
911+ } else if (extendedPropertyString == "renderInfo") {
912+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::RenderInfo);
913+ } else if (extendedPropertyString == "clientOnly") {
914+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::ClientOnly);
915+ } else if (extendedPropertyString == "avatarEntity") {
916+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::AvatarEntity);
917+ } else if (extendedPropertyString == "localEntity") {
918+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::LocalEntity);
919+ } else if (extendedPropertyString == "faceCamera") {
920+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::FaceCamera);
921+ } else if (extendedPropertyString == "isFacingAvatar") {
922+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::IsFacingAvatar);
923+ }
924+}
925+
867926 ScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(ScriptEngine* engine, QVector<QUuid> entityIDs, const ScriptValue& extendedDesiredProperties) {
868927 PROFILE_RANGE(script_entities, __FUNCTION__);
869928
870− EntityPsuedoPropertyFlags psuedoPropertyFlags;
871− const auto readExtendedPropertyStringValue = [&](ScriptValue extendedProperty) {
872− const auto extendedPropertyString = extendedProperty.toString();
873− if (extendedPropertyString == "id") {
874− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ID);
875− } else if (extendedPropertyString == "type") {
876− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Type);
877− } else if (extendedPropertyString == "age") {
878− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::Age);
879− } else if (extendedPropertyString == "ageAsText") {
880− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::AgeAsText);
881− } else if (extendedPropertyString == "lastEdited") {
882− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::LastEdited);
883− } else if (extendedPropertyString == "boundingBox") {
884− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::BoundingBox);
885− } else if (extendedPropertyString == "originalTextures") {
886− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::OriginalTextures);
887− } else if (extendedPropertyString == "renderInfo") {
888− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::RenderInfo);
889− } else if (extendedPropertyString == "clientOnly") {
890− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ClientOnly);
891− } else if (extendedPropertyString == "avatarEntity") {
892− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::AvatarEntity);
893− } else if (extendedPropertyString == "localEntity") {
894− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::LocalEntity);
895− } else if (extendedPropertyString == "faceCamera") {
896− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::FaceCamera);
897− } else if (extendedPropertyString == "isFacingAvatar") {
898− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::IsFacingAvatar);
899− }
900− };
929+ EntityPseudoPropertyFlags pseudoPropertyFlags;
901930
902931 if (extendedDesiredProperties.isString()) {
903− readExtendedPropertyStringValue(extendedDesiredProperties);
904− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::FlagsActive);
932+ readExtendedPropertyStringValue(extendedDesiredProperties, pseudoPropertyFlags);
933+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::FlagsActive);
905934 } else if (extendedDesiredProperties.isArray()) {
906935 const quint32 length = extendedDesiredProperties.property("length").toInt32();
907936 for (quint32 i = 0; i < length; i++) {
908− readExtendedPropertyStringValue(extendedDesiredProperties.property(i));
937+ readExtendedPropertyStringValue(extendedDesiredProperties.property(i), pseudoPropertyFlags);
909938 }
910− psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::FlagsActive);
939+ pseudoPropertyFlags.set(EntityPseudoPropertyFlag::FlagsActive);
911940 }
912941
913942 EntityPropertyFlags desiredProperties = scriptvalue_cast<EntityPropertyFlags>(extendedDesiredProperties);
@@ -935,7 +964,7 @@ ScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(Script · 21 unmodified lines
935964 const auto& entityID = entityIDs.at(i);
936965 const EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));
937966 if (entity) {
938− if (psuedoPropertyFlags.none() && desiredProperties.isEmpty()) {
967+ if (pseudoPropertyFlags.none() && desiredProperties.isEmpty()) {
939968 // these are left out of EntityItem::getEntityProperties so that localPosition and localRotation
940969 // don't end up in json saves, etc. We still want them here, though.
941970 EncodeBitstreamParams params; // unknown
@@ -945,7 +974,7 @@ ScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(Script · 3 unmodified lines
945974 desiredProperties.setHasProperty(PROP_LOCAL_VELOCITY);
946975 desiredProperties.setHasProperty(PROP_LOCAL_ANGULAR_VELOCITY);
947976 desiredProperties.setHasProperty(PROP_LOCAL_DIMENSIONS);
948− psuedoPropertyFlags.set();
977+ pseudoPropertyFlags.set();
949978 needsScriptSemantics = true;
950979 }
951980
@@ -963,12 +992,12 @@ ScriptValue EntityScriptingInterface::getMultipleEntityPropertiesInternal(Script · 11 unmodified lines
963992 PROFILE_RANGE(script_entities, "EntityScriptingInterface::getMultipleEntityProperties>Script Semantics");
964993 foreach(const auto& result, resultProperties) {
965994 finalResult.setProperty(i++, convertPropertiesToScriptSemantics(result.properties, result.scalesWithParent)
966− .copyToScriptValue(engine, false, false, false, psuedoPropertyFlags));
995+ .copyToScriptValue(engine, false, false, false, pseudoPropertyFlags));
967996 }
968997 } else {
969998 PROFILE_RANGE(script_entities, "EntityScriptingInterface::getMultipleEntityProperties>Skip Script Semantics");
970999 foreach(const auto& result, resultProperties) {
971− finalResult.setProperty(i++, result.properties.copyToScriptValue(engine, false, false, false, psuedoPropertyFlags));
1000+ finalResult.setProperty(i++, result.properties.copyToScriptValue(engine, false, false, false, pseudoPropertyFlags));
9721001 }
9731002 }
9741003 return finalResult;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t