Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 17:59:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

leverage OctreeQuery enhancements in EntityScriptServer/OHV

Browse source
This commit is contained in:
Stephen Birarda 2017-01-17 14:28:59 -08:00
parent ed68d5a7a2
commit 6e6f2c50b8
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/scripts/EntityScriptServer.cpp
View file

@ -89,6 +89,14 @@ void EntityScriptServer::run() {
_entityViewer.init(); _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()); entityScriptingInterface->setEntityTree(_entityViewer.getTree());
DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree()); DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());

4
libraries/octree/src/OctreeHeadlessViewer.h
View file

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

2
libraries/octree/src/OctreeQuery.cpp
View file

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

2
libraries/octree/src/OctreeQuery.h
View file

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