merge from upstream

Seth Alves committed 10 years ago

Commit 942e7712 parents afc1757 047389166 files · +1076 −386Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+33−7

     scriptSideProperties.setLocalPosition(entitySideProperties.getPosition());
     scriptSideProperties.setLocalRotation(entitySideProperties.getRotation());
+    bool success;
     glm::vec3 worldPosition = SpatiallyNestable::localToWorld(entitySideProperties.getPosition(),
                                                               entitySideProperties.getParentID(),
-                                                              entitySideProperties.getParentJointIndex());
+                                                              entitySideProperties.getParentJointIndex(),
+                                                              success);
     glm::quat worldRotation = SpatiallyNestable::localToWorld(entitySideProperties.getRotation(),
                                                               entitySideProperties.getParentID(),
-                                                              entitySideProperties.getParentJointIndex());
+                                                              entitySideProperties.getParentJointIndex(),
+                                                              success);
     scriptSideProperties.setPosition(worldPosition);
     scriptSideProperties.setRotation(worldRotation);
     // convert position and rotation properties from world-space to local, unless localPosition and localRotation
     // are set.  If they are set, they overwrite position and rotation.
     EntityItemProperties entitySideProperties = scriptSideProperties;
+    bool success;
     if (scriptSideProperties.localPositionChanged()) {
         entitySideProperties.setPosition(scriptSideProperties.getLocalPosition());
     } else if (scriptSideProperties.positionChanged()) {
         glm::vec3 localPosition = SpatiallyNestable::worldToLocal(entitySideProperties.getPosition(),
                                                                   entitySideProperties.getParentID(),
-                                                                  entitySideProperties.getParentJointIndex());
+                                                                  entitySideProperties.getParentJointIndex(),
+                                                                  success);
         entitySideProperties.setPosition(localPosition);
     }
     } else if (scriptSideProperties.rotationChanged()) {
         glm::quat localRotation = SpatiallyNestable::worldToLocal(entitySideProperties.getRotation(),
                                                                   entitySideProperties.getParentID(),
-                                                                  entitySideProperties.getParentJointIndex());
+                                                                  entitySideProperties.getParentJointIndex(),
+                                                                  success);
         entitySideProperties.setRotation(localRotation);
     }
                 auto nodeList = DependencyManager::get<NodeList>();
                 const QUuid myNodeID = nodeList->getSessionUUID();
                 propertiesWithSimID.setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATION_PRIORITY);
+                if (propertiesWithSimID.parentRelatedPropertyChanged()) {
+                    // due to parenting, the server may not know where something is in world-space, so include the bounding cube.
+                    propertiesWithSimID.setQueryAACube(entity->getQueryAACube());
+                }
                 // and make note of it now, so we can act on it right away.
                 entity->setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATION_PRIORITY);
 QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& scriptSideProperties) {
     EntityItemProperties properties = scriptSideProperties;
     EntityItemID entityID(id);
-    // If we have a local entity tree set, then also update it.
     if (!_entityTree) {
         queueEntityMessage(PacketType::EntityEdit, entityID, properties);
         return id;
     }
+    // If we have a local entity tree set, then also update it.
     bool updatedEntity = false;
     _entityTree->withWriteLock([&] {
-        if (scriptSideProperties.parentDependentPropertyChanged() ||
+        if (scriptSideProperties.parentRelatedPropertyChanged()) {
-            scriptSideProperties.parentIDChanged() || scriptSideProperties.parentJointIndexChanged()) {
             // All of parentID, parentJointIndex, position, rotation are needed to make sense of any of them.
             // If any of these changed, pull any missing properties from the entity.
             EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
                     entity->flagForOwnership();
                 }
             }
+            if (properties.parentRelatedPropertyChanged() && entity->computePuffedQueryAACube()) {
+                properties.setQueryAACube(entity->getQueryAACube());
+            }
             entity->setLastBroadcast(usecTimestampNow());
+            // if we've moved an entity with children, check/update the queryAACube of all descendents and tell the server
+            // if they've changed.
+            entity->forEachDescendant([&](SpatiallyNestablePointer descendant) {
+                if (descendant->getNestableType() == NestableType::Entity) {
+                    if (descendant->computePuffedQueryAACube()) {
+                        EntityItemPointer entityDescendant = std::static_pointer_cast<EntityItem>(descendant);
+                        EntityItemProperties newQueryCubeProperties;
+                        newQueryCubeProperties.setQueryAACube(descendant->getQueryAACube());
+                        queueEntityMessage(PacketType::EntityEdit, descendant->getID(), newQueryCubeProperties);
+                        entityDescendant->setLastBroadcast(usecTimestampNow());
+                    }
+                }
+            });
         }
     });
     queueEntityMessage(PacketType::EntityEdit, entityID, properties);