entity scripting call to get the nestable-type of an object, by id

Seth Alves committed 9 years ago

Commit a7c684e1 parent 51cb5792 files · +29 −6Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+27−6

             });
         }
     });
-    if (entityFound) {
+    if (!entityFound) {
-        queueEntityMessage(PacketType::EntityEdit, entityID, properties);
-    } else {
         // attempt to get a name for the mystery ID
         QString name = "unknown";
         QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>();
             if (success) {
                 auto nestable = nestableWP.lock();
                 if (nestable) {
-                    name = nestable->getName();
+                    NestableType nestableType = nestable->getNestableType();
+                    if (nestableType == NestableType::Overlay || nestableType == NestableType::Avatar) {
+                        qCWarning(entities) << "attempted edit on non-entity: " << id << name;
+                        return QUuid(); // null UUID to indicate failure
+                    }
                 }
             }
         }
-        qCWarning(entities) << "attempted edit on unknown entity: " << id << name;
-        return QUuid(); // null UUID to indicate failure
     }
+    // we queue edit packets even if we don't know about the entity.  This is to allow AC agents
+    // to edit entities they know only by ID.
+    queueEntityMessage(PacketType::EntityEdit, entityID, properties);
     return id;
 }
     return isChild;
 }
+QString EntityScriptingInterface::getNestableType(QUuid id) {
+    QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>();
+    if (!parentFinder) {
+        return "unknown";
+    }
+    bool success;
+    SpatiallyNestableWeakPointer objectWP = parentFinder->find(id, success);
+    if (!success) {
+        return "unknown";
+    }
+    SpatiallyNestablePointer object = objectWP.lock();
+    if (!object) {
+        return "unknown";
+    }
+    NestableType nestableType = object->getNestableType();
+    return SpatiallyNestable::nestableTypeToString(nestableType);
+}
 QVector<QUuid> EntityScriptingInterface::getChildrenIDsOfJoint(const QUuid& parentID, int jointIndex) {
     QVector<QUuid> result;
     if (!_entityTree) {