diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index ae6f116537..3435f49b71 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -410,99 +410,5 @@ "advanced": true } ] - }, - - - { - "name": "voxel_server_settings", - "label": "Voxel Server Settings", - "assignment-types": [3], - "settings": [ - { - "name": "persistFilename", - "label": "Persistant Filename", - "help": "the filename for your voxels", - "placeholder": "resources/voxels.svo", - "default": "resources/voxels.svo", - "advanced": true - }, - { - "name": "persistInterval", - "label": "Persist Interval", - "help": "Interval between persist checks in msecs.", - "placeholder": "30000", - "default": "30000", - "advanced": true - }, - { - "name": "NoPersist", - "type": "checkbox", - "help": "Don't persist your voxels to a file.", - "default": false, - "advanced": true - }, - { - "name": "backupExtensionFormat", - "label": "Backup File Extension Format:", - "help": "Format used to create the extension for the backup of your persisted voxels.", - "placeholder": ".backup.%Y-%m-%d.%H:%M:%S.%z", - "default": ".backup.%Y-%m-%d.%H:%M:%S.%z", - "advanced": true - }, - { - "name": "backupInterval", - "label": "Backup Interval", - "help": "Interval between backup checks in msecs.", - "placeholder": "1800000", - "default": "1800000", - "advanced": true - }, - { - "name": "NoBackup", - "type": "checkbox", - "help": "Don't regularly backup your persisted voxels to a backup file.", - "default": false, - "advanced": true - }, - { - "name": "statusHost", - "label": "Status Hostname", - "help": "host name or IP address of the server for accessing the status page", - "placeholder": "", - "default": "", - "advanced": true - }, - { - "name": "statusPort", - "label": "Status Port", - "help": "port of the server for accessing the status page", - "placeholder": "", - "default": "", - "advanced": true - }, - { - "name": "clockSkew", - "label": "Clock Skew", - "help": "Number of msecs to skew the server clock by to test clock skew", - "placeholder": "0", - "default": "0", - "advanced": true - }, - { - "name": "sendEnvironments", - "type": "checkbox", - "help": "send environmental data", - "default": false, - "advanced": true - }, - { - "name": "minimalEnvironment", - "type": "checkbox", - "help": "send minimal environmental data if sending environmental data", - "default": false, - "advanced": true - } - ] - } - + } ] \ No newline at end of file diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 2c04771cb6..3da06a9c0e 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -550,7 +550,8 @@ void DomainServer::populateDefaultStaticAssignmentsExcludingTypes(const QSet(static_cast(defaultedType) + 1)) { if (!excludedTypes.contains(defaultedType) - && defaultedType != Assignment::UNUSED + && defaultedType != Assignment::UNUSED_0 + && defaultedType != Assignment::UNUSED_1 && defaultedType != Assignment::AgentType) { // type has not been set from a command line or config file config, use the default // by clearing whatever exists and writing a single default assignment with no payload diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp index dc8e45a1a7..43565fcca8 100644 --- a/interface/src/ui/Stats.cpp +++ b/interface/src/ui/Stats.cpp @@ -313,7 +313,7 @@ void Stats::display( horizontalOffset = _lastHorizontalOffset + _generalStatsWidth +1; if (Menu::getInstance()->isOptionChecked(MenuOption::TestPing)) { - int pingAudio = -1, pingAvatar = -1, pingVoxel = -1, pingVoxelMax = -1; + int pingAudio = -1, pingAvatar = -1, pingVoxel = -1, pingOctreeMax = -1; NodeList* nodeList = NodeList::getInstance(); SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NodeType::AudioMixer); @@ -323,22 +323,22 @@ void Stats::display( pingAvatar = avatarMixerNode ? avatarMixerNode->getPingMs() : -1; // Now handle voxel servers, since there could be more than one, we average their ping times - unsigned long totalPingVoxel = 0; - int voxelServerCount = 0; + unsigned long totalPingOctree = 0; + int octreeServerCount = 0; - nodeList->eachNode([&totalPingVoxel, &pingVoxelMax, &voxelServerCount](const SharedNodePointer& node){ + nodeList->eachNode([&totalPingOctree, &pingOctreeMax, &octreeServerCount](const SharedNodePointer& node){ // TODO: this should also support entities - if (node->getType() == NodeType::VoxelServer) { - totalPingVoxel += node->getPingMs(); - voxelServerCount++; - if (pingVoxelMax < node->getPingMs()) { - pingVoxelMax = node->getPingMs(); + if (node->getType() == NodeType::EntityServer) { + totalPingOctree += node->getPingMs(); + octreeServerCount++; + if (pingOctreeMax < node->getPingMs()) { + pingOctreeMax = node->getPingMs(); } } }); - if (voxelServerCount) { - pingVoxel = totalPingVoxel/voxelServerCount; + if (octreeServerCount) { + pingVoxel = totalPingOctree / octreeServerCount; } lines = _expanded ? 4 : 3; @@ -366,9 +366,9 @@ void Stats::display( char voxelAvgPing[30]; if (pingVoxel >= 0) { - sprintf(voxelAvgPing, "Voxel avg ping: %d", pingVoxel); + sprintf(voxelAvgPing, "Entities avg ping: %d", pingVoxel); } else { - sprintf(voxelAvgPing, "Voxel avg ping: --"); + sprintf(voxelAvgPing, "Entities avg ping: --"); } verticalOffset += STATS_PELS_PER_LINE; @@ -381,7 +381,7 @@ void Stats::display( if (_expanded) { char voxelMaxPing[30]; if (pingVoxel >= 0) { // Average is only meaningful if pingVoxel is valid. - sprintf(voxelMaxPing, "Voxel max ping: %d", pingVoxelMax); + sprintf(voxelMaxPing, "Voxel max ping: %d", pingOctreeMax); } else { sprintf(voxelMaxPing, "Voxel max ping: --"); } diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp index 45dfe186e3..e01edcd003 100644 --- a/libraries/networking/src/Assignment.cpp +++ b/libraries/networking/src/Assignment.cpp @@ -25,8 +25,6 @@ Assignment::Type Assignment::typeForNodeType(NodeType_t nodeType) { return Assignment::AvatarMixerType; case NodeType::Agent: return Assignment::AgentType; - case NodeType::VoxelServer: - return Assignment::VoxelServerType; case NodeType::EntityServer: return Assignment::EntityServerType; case NodeType::MetavoxelServer: @@ -133,8 +131,8 @@ const char* Assignment::getTypeName() const { return "avatar-mixer"; case Assignment::AgentType: return "agent"; - case Assignment::VoxelServerType: - return "voxel-server"; + case Assignment::EntityServerType: + return "entity-server"; case Assignment::MetavoxelServerType: return "metavoxel-server"; default: diff --git a/libraries/networking/src/Assignment.h b/libraries/networking/src/Assignment.h index 1f6b5b9bd6..1e620ed32b 100644 --- a/libraries/networking/src/Assignment.h +++ b/libraries/networking/src/Assignment.h @@ -29,8 +29,8 @@ public: AudioMixerType, AvatarMixerType, AgentType, - VoxelServerType, - UNUSED, + UNUSED_0, + UNUSED_1, MetavoxelServerType, EntityServerType, AllTypes diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index 61f8ee05a1..2095acdf66 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -28,13 +28,11 @@ namespace NodeType { void NodeType::init() { TypeNameHash.insert(NodeType::DomainServer, "Domain Server"); - TypeNameHash.insert(NodeType::VoxelServer, "Voxel Server"); TypeNameHash.insert(NodeType::EntityServer, "Entity Server"); TypeNameHash.insert(NodeType::MetavoxelServer, "Metavoxel Server"); TypeNameHash.insert(NodeType::Agent, "Agent"); TypeNameHash.insert(NodeType::AudioMixer, "Audio Mixer"); TypeNameHash.insert(NodeType::AvatarMixer, "Avatar Mixer"); - TypeNameHash.insert(NodeType::AnimationServer, "Animation Server"); TypeNameHash.insert(NodeType::Unassigned, "Unassigned"); } diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h index acb6c6f453..6399c80edc 100644 --- a/libraries/networking/src/Node.h +++ b/libraries/networking/src/Node.h @@ -30,14 +30,12 @@ typedef quint8 NodeType_t; namespace NodeType { const NodeType_t DomainServer = 'D'; - const NodeType_t VoxelServer = 'V'; const NodeType_t EntityServer = 'o'; // was ModelServer const NodeType_t MetavoxelServer = 'm'; const NodeType_t EnvironmentServer = 'E'; const NodeType_t Agent = 'I'; const NodeType_t AudioMixer = 'M'; const NodeType_t AvatarMixer = 'W'; - const NodeType_t AnimationServer = 'a'; const NodeType_t Unassigned = 1; void init(); diff --git a/libraries/octree/src/JurisdictionListener.h b/libraries/octree/src/JurisdictionListener.h index 8b69cd0aeb..7fb4fb33c7 100644 --- a/libraries/octree/src/JurisdictionListener.h +++ b/libraries/octree/src/JurisdictionListener.h @@ -30,7 +30,7 @@ public: static const int DEFAULT_PACKETS_PER_SECOND = 1; static const int NO_SERVER_CHECK_RATE = 60; // if no servers yet detected, keep checking at 60fps - JurisdictionListener(NodeType_t type = NodeType::VoxelServer); + JurisdictionListener(NodeType_t type = NodeType::EntityServer); virtual bool process(); diff --git a/libraries/octree/src/JurisdictionMap.h b/libraries/octree/src/JurisdictionMap.h index 9820045321..ba75e3102b 100644 --- a/libraries/octree/src/JurisdictionMap.h +++ b/libraries/octree/src/JurisdictionMap.h @@ -31,7 +31,7 @@ public: }; // standard constructors - JurisdictionMap(NodeType_t type = NodeType::VoxelServer); // default constructor + JurisdictionMap(NodeType_t type = NodeType::EntityServer); // default constructor JurisdictionMap(const JurisdictionMap& other); // copy constructor // standard assignment diff --git a/libraries/octree/src/JurisdictionSender.h b/libraries/octree/src/JurisdictionSender.h index bfa370c6ca..a7d23d85c7 100644 --- a/libraries/octree/src/JurisdictionSender.h +++ b/libraries/octree/src/JurisdictionSender.h @@ -27,7 +27,7 @@ class JurisdictionSender : public ReceivedPacketProcessor { public: static const int DEFAULT_PACKETS_PER_SECOND = 1; - JurisdictionSender(JurisdictionMap* map, NodeType_t type = NodeType::VoxelServer); + JurisdictionSender(JurisdictionMap* map, NodeType_t type = NodeType::EntityServer); ~JurisdictionSender(); void setJurisdiction(JurisdictionMap* map) { _jurisdictionMap = map; }