Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 6 files). Show all
Unified · Split
| @@ -167,8 +167,8 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, EntityItemProperties proper · 166 unmodified lines | ||
| 167 | 167 | if (hasTerseUpdateChanges) { |
| 168 | 168 | entity->getAllTerseUpdateProperties(properties); |
| 169 | 169 | } |
| 170 | − // TODO: if we knew that ONLY TerseUpdate properties have changed in properties AND the object | |
| 171 | − // is dynamic AND it is active in the physics simulation then we could chose to NOT queue an update | |
| 170 | + // TODO: if we knew that ONLY TerseUpdate properties have changed in properties AND the object | |
| 171 | + // is dynamic AND it is active in the physics simulation then we could chose to NOT queue an update | |
| 172 | 172 | // and instead let the physics simulation decide when to send a terse update. This would remove |
| 173 | 173 | // the "slide-no-rotate" glitch (and typical a double-update) that we see during the "poke rolling |
| 174 | 174 | // balls" test. However, even if we solve this problem we still need to provide a "slerp the visible |
| @@ -333,15 +333,6 @@ bool EntityScriptingInterface::getDrawZoneBoundaries() const { · 158 unmodified lines | ||
| 333 | 333 | return ZoneEntityItem::getDrawZoneBoundaries(); |
| 334 | 334 | } |
| 335 | 335 | |
| 336 | −void EntityScriptingInterface::setSendPhysicsUpdates(bool value) { | |
| 337 | − EntityItem::setSendPhysicsUpdates(value); | |
| 338 | −} | |
| 339 | − | |
| 340 | −bool EntityScriptingInterface::getSendPhysicsUpdates() const { | |
| 341 | − return EntityItem::getSendPhysicsUpdates(); | |
| 342 | −} | |
| 343 | − | |
| 344 | − | |
| 345 | 336 | RayToEntityIntersectionResult::RayToEntityIntersectionResult() : |
| 346 | 337 | intersects(false), |
| 347 | 338 | accurate(true), // assume it's accurate |
| @@ -548,16 +539,16 @@ bool EntityScriptingInterface::appendPoint(QUuid entityID, const glm::vec3& poin · 200 unmodified lines | ||
| 548 | 539 | if (!entity) { |
| 549 | 540 | qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID; |
| 550 | 541 | } |
| 551 | − | |
| 542 | + | |
| 552 | 543 | EntityTypes::EntityType entityType = entity->getType(); |
| 553 | − | |
| 544 | + | |
| 554 | 545 | if (entityType == EntityTypes::Line) { |
| 555 | 546 | return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool |
| 556 | 547 | { |
| 557 | 548 | return (LineEntityItem*)lineEntity.appendPoint(point); |
| 558 | 549 | }); |
| 559 | 550 | } |
| 560 | − | |
| 551 | + | |
| 561 | 552 | return false; |
| 562 | 553 | } |
| 563 | 554 | |