History

Merge branch 'master' of https://github.com/worklist/hifi into 19461

Stojce Slavkovski committed 12 years ago

Commit 3e1c8572 parents 1829580 77d291514 files · +154 −93Browse files

Showing the changes to interface/src/Application.cpp (1 of 14 files). Show all

Unified · Split

interface/src/Application.cpp+12−12
@@ -3484,13 +3484,13 @@ void Application::displayStats() { · 3483 unmodified lines
34843484
34853485 // iterate all the current voxel stats, and list their sending modes, and total voxel counts
34863486 std::stringstream sendingMode("");
3487− sendingMode << "Voxel Sending Mode: [";
3487+ sendingMode << "Octree Sending Mode: [";
34883488 int serverCount = 0;
34893489 int movingServerCount = 0;
34903490 unsigned long totalNodes = 0;
34913491 unsigned long totalInternal = 0;
34923492 unsigned long totalLeaves = 0;
3493− for(NodeToVoxelSceneStatsIterator i = _voxelServerSceneStats.begin(); i != _voxelServerSceneStats.end(); i++) {
3493+ for(NodeToVoxelSceneStatsIterator i = _octreeServerSceneStats.begin(); i != _octreeServerSceneStats.end(); i++) {
34943494 //const QUuid& uuid = i->first;
34953495 VoxelSceneStats& stats = i->second;
34963496 serverCount++;
@@ -4138,7 +4138,7 @@ void Application::domainChanged(QString domain) { · 641 unmodified lines
41384138
41394139 // reset our node to stats and node to jurisdiction maps... since these must be changing...
41404140 _voxelServerJurisdictions.clear();
4141− _voxelServerSceneStats.clear();
4141+ _octreeServerSceneStats.clear();
41424142 _particleServerJurisdictions.clear();
41434143 }
41444144
@@ -4173,8 +4173,8 @@ void Application::nodeKilled(Node* node) { · 28 unmodified lines
41734173
41744174 // also clean up scene stats for that server
41754175 _voxelSceneStatsLock.lockForWrite();
4176− if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) {
4177− _voxelServerSceneStats.erase(nodeUUID);
4176+ if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) {
4177+ _octreeServerSceneStats.erase(nodeUUID);
41784178 }
41794179 _voxelSceneStatsLock.unlock();
41804180
@@ -4204,8 +4204,8 @@ void Application::nodeKilled(Node* node) { · 23 unmodified lines
42044204
42054205 // also clean up scene stats for that server
42064206 _voxelSceneStatsLock.lockForWrite();
4207− if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) {
4208− _voxelServerSceneStats.erase(nodeUUID);
4207+ if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) {
4208+ _octreeServerSceneStats.erase(nodeUUID);
42094209 }
42104210 _voxelSceneStatsLock.unlock();
42114211
@@ -4232,8 +4232,8 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 20 unmodified lines
42324232
42334233 // now that we know the node ID, let's add these stats to the stats for that node...
42344234 _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];
42374237 stats.trackIncomingOctreePacket(messageData, messageLength, wasStatsPacket);
42384238 }
42394239 _voxelSceneStatsLock.unlock();
@@ -4256,10 +4256,10 @@ int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLen · 16 unmodified lines
42564256
42574257 // now that we know the node ID, let's add these stats to the stats for that node...
42584258 _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);
42614261 } else {
4262− _voxelServerSceneStats[nodeUUID] = temp;
4262+ _octreeServerSceneStats[nodeUUID] = temp;
42634263 }
42644264 _voxelSceneStatsLock.unlock();
42654265

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t