History

first cut at adding desiredProperties to getProperties

Brad Hefta-Gaub committed 11 years ago

Commit e1cb0411 parent 4711c1828 files · +47 −41Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+7−2
@@ -100,12 +100,17 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 99 unmodified lines
100}100}
101 101
102EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identity) {102EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identity) {
103 EntityItemProperties results;103 QScriptValue allProperties;
104 return getEntityProperties(identity, allProperties);
105}
106
107EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identity, QScriptValue desiredProperties) {
108 EntityItemProperties results;
104 if (_entityTree) {109 if (_entityTree) {
105 _entityTree->withReadLock([&] {110 _entityTree->withReadLock([&] {
106 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(identity));111 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(identity));
107 if (entity) {112 if (entity) {
108 results = entity->getProperties();113 results = entity->getProperties(desiredProperties);
109 114
110 // TODO: improve sitting points and naturalDimensions in the future,115 // TODO: improve sitting points and naturalDimensions in the future,
111 // for now we've included the old sitting points model behavior for entity types that are models116 // for now we've included the old sitting points model behavior for entity types that are models