sort out script interface changes

Seth Alves committed 11 years ago

Commit f5223341 parent a769cfd7 files · +37 −43Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+18−17

-EntityItemID EntityScriptingInterface::addEntity(const EntityItemProperties& properties) {
+QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties) {
     EntityItemProperties propertiesWithSimID = properties;
-    EntityItemID id = EntityItemID(QUuid::createUuid());
+    EntityItemID id = EntityItemID(UNKNOWN_ENTITY_ID);
     // If we have a local entity tree set, then also update it.
     bool success = true;
         queueEntityMessage(PacketTypeEntityAddOrEdit, id, propertiesWithSimID);
     }
-    return id;
+    return id.id;
 }
-EntityItemProperties EntityScriptingInterface::getEntityProperties(EntityItemID identity) {
+EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identity) {
     EntityItemProperties results;
     if (_entityTree) {
         _entityTree->lockForRead();
     return results;
 }
-EntityItemID EntityScriptingInterface::editEntity(EntityItemID id, const EntityItemProperties& properties) {
+QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& properties) {
     EntityItemID entityID(id);
     // If we have a local entity tree set, then also update it.
     if (_entityTree) {
     return id;
 }
-void EntityScriptingInterface::deleteEntity(EntityItemID id) {
+void EntityScriptingInterface::deleteEntity(QUuid id) {
     EntityItemID entityID(id);
     bool shouldDelete = true;
     }
 }
-EntityItemID EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float radius) const {
+QUuid EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float radius) const {
-    QUuid result;
+    EntityItemID result;
     if (_entityTree) {
         _entityTree->lockForRead();
         const EntityItem* closestEntity = _entityTree->findClosestEntity(center, radius);
         _entityTree->unlock();
         if (closestEntity) {
-            result = closestEntity->getEntityItemID().id;
+            result = closestEntity->getEntityItemID();
         }
     }
-    return result;
+    return result.id;
 }
     }
 }
-QVector<EntityItemID> EntityScriptingInterface::findEntities(const glm::vec3& center, float radius) const {
+QVector<QUuid> EntityScriptingInterface::findEntities(const glm::vec3& center, float radius) const {
-    QVector<EntityItemID> result;
+    QVector<QUuid> result;
     if (_entityTree) {
         _entityTree->lockForRead();
         QVector<const EntityItem*> entities;
         _entityTree->unlock();
         foreach (const EntityItem* entity, entities) {
-            result << entity->getEntityItemID();
+            result << entity->getEntityItemID().id;
         }
     }
     return result;
 }
-QVector<EntityItemID> EntityScriptingInterface::findEntitiesInBox(const glm::vec3& corner, const glm::vec3& dimensions) const {
+QVector<QUuid> EntityScriptingInterface::findEntitiesInBox(const glm::vec3& corner, const glm::vec3& dimensions) const {
-    QVector<EntityItemID> result;
+    QVector<QUuid> result;
     if (_entityTree) {
         _entityTree->lockForRead();
         AABox box(corner, dimensions);
         _entityTree->unlock();
         foreach (const EntityItem* entity, entities) {
-            result << entity->getEntityItemID();
+            result << entity->getEntityItemID().id;
         }
     }
     return result;
     value.intersects = object.property("intersects").toVariant().toBool();
     value.accurate = object.property("accurate").toVariant().toBool();
     QScriptValue entityIDValue = object.property("entityID");
-    EntityItemIDfromScriptValue(entityIDValue, value.entityID);
+    // EntityItemIDfromScriptValue(entityIDValue, value.entityID);
+    quuidFromScriptValue(entityIDValue, value.entityID);
     QScriptValue entityPropertiesValue = object.property("properties");
     if (entityPropertiesValue.isValid()) {
         EntityItemPropertiesFromScriptValue(entityPropertiesValue, value.properties);

sort out script interface changes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code