Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json

Seth Alves committed 11 years ago

Commit c90ca4b2 parents fe658c0 e18d9fd11 files · +456 −130Browse files

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

Unified · Split

         const EntityItem* closestEntity = _entityTree->findClosestEntity(center, radius);
         _entityTree->unlock();
         if (closestEntity) {
-            result.id = closestEntity->getID();
+            result = closestEntity->getEntityItemID();
-            result.isKnownID = true;
         }
     }
     return result;
         QVector<const EntityItem*> entities;
         _entityTree->findEntities(center, radius, entities);
         _entityTree->unlock();
+        foreach (const EntityItem* entity, entities) {
+            result << entity->getEntityItemID();
+        }
+    }
+    return result;
+}
+QVector<EntityItemID> EntityScriptingInterface::findEntitiesInBox(const glm::vec3& corner, const glm::vec3& dimensions) const {
+    QVector<EntityItemID> result;
+    if (_entityTree) {
+        _entityTree->lockForRead();
+        AABox box(corner, dimensions);
+        QVector<EntityItem*> entities;
+        _entityTree->findEntities(box, entities);
+        _entityTree->unlock();
         foreach (const EntityItem* entity, entities) {
-            EntityItemID thisEntityItemID(entity->getID(), UNKNOWN_ENTITY_TOKEN, true);
+            result << entity->getEntityItemID();
-            result << thisEntityItemID;
         }
     }
     return result;