leverage OctreeQuery enhancements in EntityScriptServer/OHV

assignment-client/src/scripts/EntityScriptServer.cpp

@@ -88,6 +88,14 @@ void EntityScriptServer::run() {
     _entityViewer.setJurisdictionListener(entityScriptingInterface->getJurisdictionListener());
 
     _entityViewer.init();
+    
+    // setup the JSON filter that asks for entities with a non-default serverScripts property
+    QJsonObject queryJSONParameters;
+    queryJSONParameters["serverScripts"] = OctreeQuery::NON_DEFAULT_FILTER;
+    
+    // setup the JSON parameters so that OctreeQuery does not use a frustum and uses our JSON filter
+    _entityViewer.setQueryUsesFrustum(false);
+    _entityViewer.setQueryJSONParameters(queryJSONParameters);
 
     entityScriptingInterface->setEntityTree(_entityViewer.getTree());
 

libraries/octree/src/OctreeHeadlessViewer.h

@@ -64,6 +64,10 @@ public slots:
     int getMaxPacketsPerSecond() const { return _maxPacketsPerSecond; }
 
     unsigned getOctreeElementsCount() const { return _tree->getOctreeElementsCount(); }
+    
+    // octree query adjustments
+    void setQueryUsesFrustum(bool queryUsesFrustum) { _octreeQuery.setUsesFrustum(queryUsesFrustum); }
+    void setQueryJSONParameters(QJsonObject queryJSONParameters) { _octreeQuery.setJSONParameters(queryJSONParameters); }
 
 private:
     JurisdictionListener* _jurisdictionListener = nullptr;

libraries/octree/src/OctreeQuery.cpp

@@ -17,6 +17,8 @@
 #include "OctreeConstants.h"
 #include "OctreeQuery.h"
 
+const QString OctreeQuery::NON_DEFAULT_FILTER = "+";
+
 
 OctreeQuery::OctreeQuery() {
     _maxQueryPPS = DEFAULT_MAX_OCTREE_PPS;

libraries/octree/src/OctreeQuery.h

@@ -42,6 +42,8 @@ class OctreeQuery : public NodeData {
 public:
     OctreeQuery();
     virtual ~OctreeQuery() {}
+    
+    static const QString NON_DEFAULT_FILTER;
 
     int getBroadcastData(unsigned char* destinationBuffer);
     int parseData(ReceivedMessage& message) override;