Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 07:17:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update getEntityItemID() to check for id existence

Browse source
This commit is contained in:
Ryan Huffman 2014-11-19 15:31:41 -08:00
parent 0242e0efcf
commit a18a83d45c
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -45,7 +45,17 @@ EntityItemID EntityScriptingInterface::addEntity(const EntityItemProperties& pro
} }
EntityItemID EntityScriptingInterface::getEntityItemID(const QString& uuid) { EntityItemID EntityScriptingInterface::getEntityItemID(const QString& uuid) {
return EntityItemID(QUuid(uuid)); EntityItemID entityID = EntityItemID(QUuid(uuid), UNKNOWN_ENTITY_TOKEN, false);
_entityTree->lockForRead();
EntityItem* entity = const_cast<EntityItem*>(_entityTree->findEntityByEntityItemID(entityID));
_entityTree->unlock();
if (entity) {
return entity->getEntityItemID();
}
return entityID;
} }
EntityItemID EntityScriptingInterface::identifyEntity(EntityItemID entityID) { EntityItemID EntityScriptingInterface::identifyEntity(EntityItemID entityID) {