Showing the changes to interface/src/Application.cpp (1 of 14 files). Show all
Unified · Split
| @@ -3484,13 +3484,13 @@ void Application::displayStats() { · 3483 unmodified lines | ||
| 3484 | 3484 | |
| 3485 | 3485 | // iterate all the current voxel stats, and list their sending modes, and total voxel counts |
| 3486 | 3486 | std::stringstream sendingMode(""); |
| 3487 | − sendingMode << "Voxel Sending Mode: ["; | |
| 3487 | + sendingMode << "Octree Sending Mode: ["; | |
| 3488 | 3488 | int serverCount = 0; |
| 3489 | 3489 | int movingServerCount = 0; |
| 3490 | 3490 | unsigned long totalNodes = 0; |
| 3491 | 3491 | unsigned long totalInternal = 0; |
| 3492 | 3492 | unsigned long totalLeaves = 0; |
| 3493 | − for(NodeToVoxelSceneStatsIterator i = _voxelServerSceneStats.begin(); i != _voxelServerSceneStats.end(); i++) { | |
| 3493 | + for(NodeToVoxelSceneStatsIterator i = _octreeServerSceneStats.begin(); i != _octreeServerSceneStats.end(); i++) { | |
| 3494 | 3494 | //const QUuid& uuid = i->first; |
| 3495 | 3495 | VoxelSceneStats& stats = i->second; |
| 3496 | 3496 | serverCount++; |
| @@ -4138,7 +4138,7 @@ void Application::domainChanged(QString domain) { · 641 unmodified lines | ||
| 4138 | 4138 | |
| 4139 | 4139 | // reset our node to stats and node to jurisdiction maps... since these must be changing... |
| 4140 | 4140 | _voxelServerJurisdictions.clear(); |
| 4141 | − _voxelServerSceneStats.clear(); | |
| 4141 | + _octreeServerSceneStats.clear(); | |
| 4142 | 4142 | _particleServerJurisdictions.clear(); |
| 4143 | 4143 | } |
| 4144 | 4144 | |
| @@ -4173,8 +4173,8 @@ void Application::nodeKilled(Node* node) { · 28 unmodified lines | ||
| 4173 | 4173 | |
| 4174 | 4174 | // also clean up scene stats for that server |
| 4175 | 4175 | _voxelSceneStatsLock.lockForWrite(); |
| 4176 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4177 | − _voxelServerSceneStats.erase(nodeUUID); | |
| 4176 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4177 | + _octreeServerSceneStats.erase(nodeUUID); | |
| 4178 | 4178 | } |
| 4179 | 4179 | _voxelSceneStatsLock.unlock(); |
| 4180 | 4180 | |
| @@ -4204,8 +4204,8 @@ void Application::nodeKilled(Node* node) { · 23 unmodified lines | ||
| 4204 | 4204 | |
| 4205 | 4205 | // also clean up scene stats for that server |
| 4206 | 4206 | _voxelSceneStatsLock.lockForWrite(); |
| 4207 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4208 | − _voxelServerSceneStats.erase(nodeUUID); | |
| 4207 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4208 | + _octreeServerSceneStats.erase(nodeUUID); | |
| 4209 | 4209 | } |
| 4210 | 4210 | _voxelSceneStatsLock.unlock(); |
| 4211 | 4211 | |
| @@ -4232,8 +4232,8 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 20 unmodified lines | ||
| 4232 | 4232 | |
| 4233 | 4233 | // now that we know the node ID, let's add these stats to the stats for that node... |
| 4234 | 4234 | _voxelSceneStatsLock.lockForWrite(); |
| 4235 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4236 | − VoxelSceneStats& stats = _voxelServerSceneStats[nodeUUID]; | |
| 4235 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4236 | + VoxelSceneStats& stats = _octreeServerSceneStats[nodeUUID]; | |
| 4237 | 4237 | stats.trackIncomingOctreePacket(messageData, messageLength, wasStatsPacket); |
| 4238 | 4238 | } |
| 4239 | 4239 | _voxelSceneStatsLock.unlock(); |
| @@ -4256,10 +4256,10 @@ int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLen · 16 unmodified lines | ||
| 4256 | 4256 | |
| 4257 | 4257 | // now that we know the node ID, let's add these stats to the stats for that node... |
| 4258 | 4258 | _voxelSceneStatsLock.lockForWrite(); |
| 4259 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4260 | − _voxelServerSceneStats[nodeUUID].unpackFromMessage(messageData, messageLength); | |
| 4259 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4260 | + _octreeServerSceneStats[nodeUUID].unpackFromMessage(messageData, messageLength); | |
| 4261 | 4261 | } else { |
| 4262 | − _voxelServerSceneStats[nodeUUID] = temp; | |
| 4262 | + _octreeServerSceneStats[nodeUUID] = temp; | |
| 4263 | 4263 | } |
| 4264 | 4264 | _voxelSceneStatsLock.unlock(); |
| 4265 | 4265 | |