History

add the basic structure for inclusion of ancestors/descendants in ESS queries

Stephen Birarda committed 9 years ago

Commit a3883a71 parent 0da81ef12 files · +228 −28Browse files

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

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+6−7
@@ -16,6 +16,7 @@ · 15 unmodified lines
16#include <AudioConstants.h>16#include <AudioConstants.h>
17#include <AudioInjectorManager.h>17#include <AudioInjectorManager.h>
18#include <ClientServerUtils.h>18#include <ClientServerUtils.h>
19#include <EntityNodeData.h>
19#include <EntityScriptingInterface.h>20#include <EntityScriptingInterface.h>
20#include <LogHandler.h>21#include <LogHandler.h>
21#include <MessagesClient.h>22#include <MessagesClient.h>
@@ -264,16 +265,14 @@ void EntityScriptServer::run() { · 242 unmodified lines
264 265
265 // setup the JSON filter that asks for entities with a non-default serverScripts property266 // setup the JSON filter that asks for entities with a non-default serverScripts property
266 QJsonObject queryJSONParameters;267 QJsonObject queryJSONParameters;
267 static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts";268 queryJSONParameters[EntityJSONQueryProperties::SERVER_SCRIPTS_PROPERTY] = EntityQueryFilterSymbol::NonDefault;
268 queryJSONParameters[SERVER_SCRIPTS_PROPERTY] = EntityQueryFilterSymbol::NonDefault;
269 269
270 QJsonObject queryFlags;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 271
276 queryJSONParameters["flags"] = queryFlags;272 queryFlags[EntityJSONQueryProperties::INCLUDE_ANCESTORS_PROPERTY] = true;
273 queryFlags[EntityJSONQueryProperties::INCLUDE_DESCENDANTS_PROPERTY] = true;
274
275 queryJSONParameters[EntityJSONQueryProperties::FLAGS_PROPERTY] = queryFlags;
277 276
278 // setup the JSON parameters so that OctreeQuery does not use a frustum and uses our JSON filter277 // setup the JSON parameters so that OctreeQuery does not use a frustum and uses our JSON filter
279 _entityViewer.getOctreeQuery().setUsesFrustum(false);278 _entityViewer.getOctreeQuery().setUsesFrustum(false);