Merge branch master into protocol_changes

HifiExperiments committed 2 years ago

Commit ee705d21 parent f9e729b370 files · +11827 −6045Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+13−5

     connect(nodeList.data(), &NodeList::canWriteAssetsChanged, this, &EntityScriptingInterface::canWriteAssetsChanged);
     connect(nodeList.data(), &NodeList::canGetAndSetPrivateUserDataChanged, this, &EntityScriptingInterface::canGetAndSetPrivateUserDataChanged);
     connect(nodeList.data(), &NodeList::canRezAvatarEntitiesChanged, this, &EntityScriptingInterface::canRezAvatarEntitiesChanged);
+    connect(nodeList.data(), &NodeList::canViewAssetURLsChanged, this, &EntityScriptingInterface::canViewAssetURLsChanged);
     auto& packetReceiver = nodeList->getPacketReceiver();
     packetReceiver.registerListener(PacketType::EntityScriptCallMethod,
     return nodeList->getThisNodeCanRezAvatarEntities();
 }
+bool EntityScriptingInterface::canViewAssetURLs() {
+    auto nodeList = DependencyManager::get<NodeList>();
+    return nodeList->getThisNodeCanViewAssetURLs();
+}
 void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
     if (_entityTree) {
         disconnect(_entityTree.get(), &EntityTree::addingEntityPointer, this, &EntityScriptingInterface::onAddingEntity);
 EntityItemProperties EntityScriptingInterface::getEntityProperties(const QUuid& entityID) {
     const EntityPropertyFlags noSpecificProperties;
-    return getEntityPropertiesInternal(entityID, noSpecificProperties);
+    return getEntityPropertiesInternal(entityID, noSpecificProperties, false);
 }
 ScriptValue EntityScriptingInterface::getEntityProperties(const QUuid& entityID, const ScriptValue& extendedDesiredProperties) {
         }
     }
-    EntityItemProperties properties = getEntityPropertiesInternal(entityID, desiredProperties);
+    EntityItemProperties properties = getEntityPropertiesInternal(entityID, desiredProperties, !desiredPseudoPropertyFlags.none());
     return properties.copyToScriptValue(extendedDesiredProperties.engine().get(), false, false, false, desiredPseudoPropertyFlags);
 }
-EntityItemProperties EntityScriptingInterface::getEntityPropertiesInternal(const QUuid& entityID, EntityPropertyFlags desiredProperties) {
+EntityItemProperties EntityScriptingInterface::getEntityPropertiesInternal(const QUuid& entityID,
+                                                                           EntityPropertyFlags desiredProperties,
+                                                                           bool returnNothingOnEmptyPropertyFlags) {
     PROFILE_RANGE(script_entities, __FUNCTION__);
                     desiredProperties.setHasProperty(PROP_PARENT_JOINT_INDEX);
                 }
-                if (desiredProperties.isEmpty()) {
+                if (desiredProperties.isEmpty() && !returnNothingOnEmptyPropertyFlags) {
                     // these are left out of EntityItem::getEntityProperties so that localPosition and localRotation
                     // don't end up in json saves, etc.  We still want them here, though.
                     EncodeBitstreamParams params; // unknown
                     desiredProperties.setHasProperty(PROP_LOCAL_DIMENSIONS);
                 }
-                results = entity->getProperties(desiredProperties);
+                results = entity->getProperties(desiredProperties, true);
             }
         });
     }