Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-13 05:19:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handcraft the JSON filter-object rather than parse a string

Browse source
This commit is contained in:
Simon Walton 2019-02-27 17:27:25 -08:00
parent db8bd661ce
commit 041a561dbc
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -958,21 +958,17 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
}
void AvatarMixer::setupEntityQuery() {
static char queryJsonString[] = R"({"avatarPriority": true, "type": "Zone"})";
_entityViewer.init();
DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
_slaveSharedData.entityTree = _entityViewer.getTree();
QJsonParseError jsonParseError;
const QJsonDocument priorityZoneQuery(QJsonDocument::fromJson(queryJsonString, &jsonParseError));
if (jsonParseError.error != QJsonParseError::NoError) {
qCDebug(avatars) << "Error parsing:" << queryJsonString << " - " << jsonParseError.errorString();
return;
}
_entityViewer.getOctreeQuery().setJSONParameters(priorityZoneQuery.object());
// ES query: {"avatarPriority": true, "type": "Zone"}
QJsonObject priorityZoneQuery;
priorityZoneQuery["avatarPriority"] = true;
priorityZoneQuery["type"] = "Zone";
_entityViewer.getOctreeQuery().setJSONParameters(priorityZoneQuery);
}
void AvatarMixer::handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {