Merge branch 'master' into NOverlays3

Sam Gondelman committed 7 years ago

Commit 2291c7e2 parents d30dd4c da296cf27 files · +205 −98Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+27−12

 }
-QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties, bool clientOnly) {
+QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties, const QString& entityHostTypeString) {
     PROFILE_RANGE(script_entities, __FUNCTION__);
     _activityTracking.addedEntityCount++;
     const auto sessionID = nodeList->getSessionUUID();
     EntityItemProperties propertiesWithSimID = properties;
-    if (clientOnly) {
+    propertiesWithSimID.setEntityHostTypeFromString(entityHostTypeString);
-        propertiesWithSimID.setClientOnly(clientOnly);
+    if (propertiesWithSimID.getEntityHostType() == entity::HostType::AVATAR) {
         propertiesWithSimID.setOwningAvatarID(sessionID);
+    } else if (propertiesWithSimID.getEntityHostType() == entity::HostType::LOCAL) {
+        // For now, local entities are always collisionless
+        // TODO: create a separate, local physics simulation that just handles local entities (and MyAvatar?)
+        propertiesWithSimID.setCollisionless(true);
     }
     propertiesWithSimID.setLastEditedBy(sessionID);
     bool cloneAvatarEntity = properties.getCloneAvatarEntity();
     properties.convertToCloneProperties(entityIDToClone);
-    if (cloneAvatarEntity) {
+    if (properties.getEntityHostType() == entity::HostType::LOCAL) {
-        return addEntity(properties, true);
+        // Local entities are only cloned locally
+        return addEntity(properties, "local");
+    } else if (cloneAvatarEntity) {
+        return addEntity(properties, "avatar");
     } else {
         // setLastEdited timestamp to 0 to ensure this entity gets updated with the properties
         // from the server-created entity, don't change this unless you know what you are doing
             psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::ClientOnly);
         } else if (extendedPropertyString == "owningAvatarID") {
             psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::OwningAvatarID);
+        } else if (extendedPropertyString == "avatarEntity") {
+            psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::AvatarEntity);
+        } else if (extendedPropertyString == "localEntity") {
+            psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::LocalEntity);
         } else if (extendedPropertyString == "faceCamera") {
             psuedoPropertyFlags.set(EntityPsuedoPropertyFlag::FaceCamera);
         } else if (extendedPropertyString == "isFacingAvatar") {
             return;
         }
-        if (entity->getClientOnly() && entity->getOwningAvatarID() != sessionID) {
+        if (entity->isAvatarEntity() && entity->getOwningAvatarID() != sessionID) {
             // don't edit other avatar's avatarEntities
             properties = EntityItemProperties();
             return;
         }
         // set these to make EntityItemProperties::getScalesWithParent() work correctly
-        properties.setClientOnly(entity->getClientOnly());
+        entity::HostType entityHostType = entity->getEntityHostType();
+        properties.setEntityHostType(entityHostType);
+        if (entityHostType == entity::HostType::LOCAL) {
+            properties.setCollisionless(true);
+        }
         properties.setOwningAvatarID(entity->getOwningAvatarID());
         properties.setActionData(entity->getDynamicData());
                 auto nodeList = DependencyManager::get<NodeList>();
                 const QUuid myNodeID = nodeList->getSessionUUID();
-                if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
+                if (entity->isAvatarEntity() && entity->getOwningAvatarID() != myNodeID) {
                     // don't delete other avatar's avatarEntities
                     shouldSendDeleteToServer = false;
                     return;
                     shouldSendDeleteToServer = false;
                 } else {
                     // only delete local entities, server entities will round trip through the server filters
-                    if (entity->getClientOnly() || _entityTree->isServerlessMode()) {
+                    if (entity->isAvatarEntity() || _entityTree->isServerlessMode()) {
                         shouldSendDeleteToServer = false;
                         _entityTree->deleteEntity(entityID);
-                        if (entity->getClientOnly() && getEntityPacketSender()->getMyAvatar()) {
+                        if (entity->isAvatarEntity() && getEntityPacketSender()->getMyAvatar()) {
                             getEntityPacketSender()->getMyAvatar()->clearAvatarEntity(entityID, false);
                         }
                     }
             return;
         }
-        if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
+        if (entity->isAvatarEntity() && entity->getOwningAvatarID() != myNodeID) {
             return;
         }
         doTransmit = actor(simulation, entity);
         _entityTree->entityChanged(entity);
         if (doTransmit) {
-            properties.setClientOnly(entity->getClientOnly());
+            properties.setEntityHostType(entity->getEntityHostType());
             properties.setOwningAvatarID(entity->getOwningAvatarID());
         }
     });

Merge branch 'master' into NOverlays3

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code