History

Add includeDescendants and includeParents to ESS entity query

Ryan Huffman committed 9 years ago

Commit 0da81ef1 parent 24591ee1 file · +8 −0Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 1 file). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+8−0
@@ -266,6 +266,14 @@ void EntityScriptServer::run() { · 265 unmodified lines
266266 QJsonObject queryJSONParameters;
267267 static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts";
268268 queryJSONParameters[SERVER_SCRIPTS_PROPERTY] = EntityQueryFilterSymbol::NonDefault;
269+
270+ QJsonObject queryFlags;
271+ static const QString INCLUDE_DESCENDANTS_PROPERTY = "includeDescendants";
272+ static const QString INCLUDE_PARENTS_PROPERTY = "includeParents";
273+ queryFlags[INCLUDE_DESCENDANTS_PROPERTY] = true;
274+ queryFlags[INCLUDE_PARENTS_PROPERTY] = true;
275+
276+ queryJSONParameters["flags"] = queryFlags;
269277
270278 // setup the JSON parameters so that OctreeQuery does not use a frustum and uses our JSON filter
271279 _entityViewer.getOctreeQuery().setUsesFrustum(false);