History

merge from upstream

Seth Alves committed 10 years ago

Commit 6eae98f2 parents f18fc84 e0ca1c038 files · +3092 −735Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+5−14
@@ -238,8 +238,8 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, EntityItemProperties script · 237 unmodified lines
238238 if (hasTerseUpdateChanges) {
239239 entity->getAllTerseUpdateProperties(properties);
240240 }
241− // TODO: if we knew that ONLY TerseUpdate properties have changed in properties AND the object
242− // is dynamic AND it is active in the physics simulation then we could chose to NOT queue an update
241+ // TODO: if we knew that ONLY TerseUpdate properties have changed in properties AND the object
242+ // is dynamic AND it is active in the physics simulation then we could chose to NOT queue an update
243243 // and instead let the physics simulation decide when to send a terse update. This would remove
244244 // the "slide-no-rotate" glitch (and typical a double-update) that we see during the "poke rolling
245245 // balls" test. However, even if we solve this problem we still need to provide a "slerp the visible
@@ -404,15 +404,6 @@ bool EntityScriptingInterface::getDrawZoneBoundaries() const { · 158 unmodified lines
404404 return ZoneEntityItem::getDrawZoneBoundaries();
405405 }
406406
407−void EntityScriptingInterface::setSendPhysicsUpdates(bool value) {
408− EntityItem::setSendPhysicsUpdates(value);
409−}
410−
411−bool EntityScriptingInterface::getSendPhysicsUpdates() const {
412− return EntityItem::getSendPhysicsUpdates();
413−}
414−
415−
416407 RayToEntityIntersectionResult::RayToEntityIntersectionResult() :
417408 intersects(false),
418409 accurate(true), // assume it's accurate
@@ -619,16 +610,16 @@ bool EntityScriptingInterface::appendPoint(QUuid entityID, const glm::vec3& poin · 200 unmodified lines
619610 if (!entity) {
620611 qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID;
621612 }
622−
613+
623614 EntityTypes::EntityType entityType = entity->getType();
624−
615+
625616 if (entityType == EntityTypes::Line) {
626617 return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool
627618 {
628619 return (LineEntityItem*)lineEntity.appendPoint(point);
629620 });
630621 }
631−
622+
632623 return false;
633624 }
634625