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
238 if (hasTerseUpdateChanges) {238 if (hasTerseUpdateChanges) {
239 entity->getAllTerseUpdateProperties(properties);239 entity->getAllTerseUpdateProperties(properties);
240 }240 }
241 // TODO: if we knew that ONLY TerseUpdate properties have changed in properties AND the object 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 242 // is dynamic AND it is active in the physics simulation then we could chose to NOT queue an update
243 // and instead let the physics simulation decide when to send a terse update. This would remove243 // and instead let the physics simulation decide when to send a terse update. This would remove
244 // the "slide-no-rotate" glitch (and typical a double-update) that we see during the "poke rolling244 // the "slide-no-rotate" glitch (and typical a double-update) that we see during the "poke rolling
245 // balls" test. However, even if we solve this problem we still need to provide a "slerp the visible245 // 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
404 return ZoneEntityItem::getDrawZoneBoundaries();404 return ZoneEntityItem::getDrawZoneBoundaries();
405}405}
406 406
407void EntityScriptingInterface::setSendPhysicsUpdates(bool value) {
408 EntityItem::setSendPhysicsUpdates(value);
409}
410
411bool EntityScriptingInterface::getSendPhysicsUpdates() const {
412 return EntityItem::getSendPhysicsUpdates();
413}
414
415
416RayToEntityIntersectionResult::RayToEntityIntersectionResult() :407RayToEntityIntersectionResult::RayToEntityIntersectionResult() :
417 intersects(false),408 intersects(false),
418 accurate(true), // assume it's accurate409 accurate(true), // assume it's accurate
@@ -619,16 +610,16 @@ bool EntityScriptingInterface::appendPoint(QUuid entityID, const glm::vec3& poin · 200 unmodified lines
619 if (!entity) {610 if (!entity) {
620 qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID;611 qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID;
621 }612 }
622 613
623 EntityTypes::EntityType entityType = entity->getType();614 EntityTypes::EntityType entityType = entity->getType();
624 615
625 if (entityType == EntityTypes::Line) {616 if (entityType == EntityTypes::Line) {
626 return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool617 return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool
627 {618 {
628 return (LineEntityItem*)lineEntity.appendPoint(point);619 return (LineEntityItem*)lineEntity.appendPoint(point);
629 });620 });
630 }621 }
631 622
632 return false;623 return false;
633}624}
634 625