if script sets parent or jointIndex, don't pop entity off to someplace

Seth Alves committed 10 years ago

Commit d518a451 parent 1f0150f1 file · +13 −1Browse files

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

Unified · Split

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

     bool updatedEntity = false;
     _entityTree->withWriteLock([&] {
         if (scriptSideProperties.parentDependentPropertyChanged()) {
-            // if the script sets a location property but didn't include parent information, grab the needed
+            // if the script set a location property but didn't include parent information, grab the needed
             // properties from the entity.
             if (!scriptSideProperties.parentIDChanged() || !scriptSideProperties.parentJointIndexChanged()) {
                 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
                 }
             }
         }
+        if (scriptSideProperties.parentIDChanged() || scriptSideProperties.parentJointIndexChanged()) {
+            // if the script set parentID or parentJointIndex but didn't include position and rotation, grab
+            // the missing properties from the entity
+            if (!scriptSideProperties.localPositionChanged() && !scriptSideProperties.positionChanged()) {
+                EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
+                properties.setPosition(entity->getPosition());
+            }
+            if (!scriptSideProperties.localRotationChanged() && !scriptSideProperties.rotationChanged()) {
+                EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
+                properties.setRotation(entity->getOrientation());
+            }
+        }
         properties = convertLocationFromScriptSemantics(properties);
         updatedEntity = _entityTree->updateEntity(entityID, properties);
     });