From f9f958aef1ab9756afcc2145a40cc8f477ad9675 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 17 Jan 2017 14:31:15 -0800 Subject: [PATCH] provide direct access to OctreeQuery from OHV --- assignment-client/src/scripts/EntityScriptServer.cpp | 4 ++-- libraries/octree/src/OctreeHeadlessViewer.h | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp index f17785d2ed..e542d5e8bf 100644 --- a/assignment-client/src/scripts/EntityScriptServer.cpp +++ b/assignment-client/src/scripts/EntityScriptServer.cpp @@ -94,8 +94,8 @@ void EntityScriptServer::run() { 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); + _entityViewer.getOctreeQuery().setUsesFrustum(false); + _entityViewer.getOctreeQuery().setJSONParameters(queryJSONParameters); entityScriptingInterface->setEntityTree(_entityViewer.getTree()); diff --git a/libraries/octree/src/OctreeHeadlessViewer.h b/libraries/octree/src/OctreeHeadlessViewer.h index 9e5b458048..a502844fa5 100644 --- a/libraries/octree/src/OctreeHeadlessViewer.h +++ b/libraries/octree/src/OctreeHeadlessViewer.h @@ -36,6 +36,8 @@ public: virtual void render(RenderArgs* renderArgs) override { /* swallow these */ } void setJurisdictionListener(JurisdictionListener* jurisdictionListener) { _jurisdictionListener = jurisdictionListener; } + + OctreeQuery& getOctreeQuery() { return _octreeQuery; } static int parseOctreeStats(QSharedPointer message, SharedNodePointer sourceNode); static void trackIncomingOctreePacket(const QByteArray& packet, const SharedNodePointer& sendingNode, bool wasStatsPacket); @@ -64,10 +66,6 @@ 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;