Showing the changes to interface/src/Application.cpp (1 of 35 files). Show all
Unified · Split
| @@ -3479,13 +3479,13 @@ void Application::displayStats() { · 3478 unmodified lines | ||
| 3479 | 3479 | |
| 3480 | 3480 | // iterate all the current voxel stats, and list their sending modes, and total voxel counts |
| 3481 | 3481 | std::stringstream sendingMode(""); |
| 3482 | − sendingMode << "Voxel Sending Mode: ["; | |
| 3482 | + sendingMode << "Octree Sending Mode: ["; | |
| 3483 | 3483 | int serverCount = 0; |
| 3484 | 3484 | int movingServerCount = 0; |
| 3485 | 3485 | unsigned long totalNodes = 0; |
| 3486 | 3486 | unsigned long totalInternal = 0; |
| 3487 | 3487 | unsigned long totalLeaves = 0; |
| 3488 | − for(NodeToVoxelSceneStatsIterator i = _voxelServerSceneStats.begin(); i != _voxelServerSceneStats.end(); i++) { | |
| 3488 | + for(NodeToVoxelSceneStatsIterator i = _octreeServerSceneStats.begin(); i != _octreeServerSceneStats.end(); i++) { | |
| 3489 | 3489 | //const QUuid& uuid = i->first; |
| 3490 | 3490 | VoxelSceneStats& stats = i->second; |
| 3491 | 3491 | serverCount++; |
| @@ -4133,7 +4133,7 @@ void Application::domainChanged(QString domain) { · 641 unmodified lines | ||
| 4133 | 4133 | |
| 4134 | 4134 | // reset our node to stats and node to jurisdiction maps... since these must be changing... |
| 4135 | 4135 | _voxelServerJurisdictions.clear(); |
| 4136 | − _voxelServerSceneStats.clear(); | |
| 4136 | + _octreeServerSceneStats.clear(); | |
| 4137 | 4137 | _particleServerJurisdictions.clear(); |
| 4138 | 4138 | } |
| 4139 | 4139 | |
| @@ -4168,8 +4168,8 @@ void Application::nodeKilled(Node* node) { · 28 unmodified lines | ||
| 4168 | 4168 | |
| 4169 | 4169 | // also clean up scene stats for that server |
| 4170 | 4170 | _voxelSceneStatsLock.lockForWrite(); |
| 4171 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4172 | − _voxelServerSceneStats.erase(nodeUUID); | |
| 4171 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4172 | + _octreeServerSceneStats.erase(nodeUUID); | |
| 4173 | 4173 | } |
| 4174 | 4174 | _voxelSceneStatsLock.unlock(); |
| 4175 | 4175 | |
| @@ -4199,8 +4199,8 @@ void Application::nodeKilled(Node* node) { · 23 unmodified lines | ||
| 4199 | 4199 | |
| 4200 | 4200 | // also clean up scene stats for that server |
| 4201 | 4201 | _voxelSceneStatsLock.lockForWrite(); |
| 4202 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4203 | − _voxelServerSceneStats.erase(nodeUUID); | |
| 4202 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4203 | + _octreeServerSceneStats.erase(nodeUUID); | |
| 4204 | 4204 | } |
| 4205 | 4205 | _voxelSceneStatsLock.unlock(); |
| 4206 | 4206 | |
| @@ -4227,8 +4227,8 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 20 unmodified lines | ||
| 4227 | 4227 | |
| 4228 | 4228 | // now that we know the node ID, let's add these stats to the stats for that node... |
| 4229 | 4229 | _voxelSceneStatsLock.lockForWrite(); |
| 4230 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4231 | − VoxelSceneStats& stats = _voxelServerSceneStats[nodeUUID]; | |
| 4230 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4231 | + VoxelSceneStats& stats = _octreeServerSceneStats[nodeUUID]; | |
| 4232 | 4232 | stats.trackIncomingOctreePacket(messageData, messageLength, wasStatsPacket); |
| 4233 | 4233 | } |
| 4234 | 4234 | _voxelSceneStatsLock.unlock(); |
| @@ -4251,10 +4251,10 @@ int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLen · 16 unmodified lines | ||
| 4251 | 4251 | |
| 4252 | 4252 | // now that we know the node ID, let's add these stats to the stats for that node... |
| 4253 | 4253 | _voxelSceneStatsLock.lockForWrite(); |
| 4254 | − if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) { | |
| 4255 | − _voxelServerSceneStats[nodeUUID].unpackFromMessage(messageData, messageLength); | |
| 4254 | + if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) { | |
| 4255 | + _octreeServerSceneStats[nodeUUID].unpackFromMessage(messageData, messageLength); | |
| 4256 | 4256 | } else { |
| 4257 | − _voxelServerSceneStats[nodeUUID] = temp; | |
| 4257 | + _octreeServerSceneStats[nodeUUID] = temp; | |
| 4258 | 4258 | } |
| 4259 | 4259 | _voxelSceneStatsLock.unlock(); |
| 4260 | 4260 | |