Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 1 file). Show all
Unified · Split
| @@ -266,6 +266,14 @@ void EntityScriptServer::run() { · 265 unmodified lines | |||
| 266 | QJsonObject queryJSONParameters; | 266 | QJsonObject queryJSONParameters; |
| 267 | static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts"; | 267 | static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts"; |
| 268 | queryJSONParameters[SERVER_SCRIPTS_PROPERTY] = EntityQueryFilterSymbol::NonDefault; | 268 | 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; | ||
| 269 | 277 | ||
| 270 | // setup the JSON parameters so that OctreeQuery does not use a frustum and uses our JSON filter | 278 | // setup the JSON parameters so that OctreeQuery does not use a frustum and uses our JSON filter |
| 271 | _entityViewer.getOctreeQuery().setUsesFrustum(false); | 279 | _entityViewer.getOctreeQuery().setUsesFrustum(false); |