History

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

ZappoMan committed 12 years ago

Commit 4bfdce32 parents a6e6205 82f035c35 files · +410 −271Browse files

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

Unified · Split

interface/src/Application.cpp+12−12
@@ -3479,13 +3479,13 @@ void Application::displayStats() { · 3478 unmodified lines
34793479
34803480 // iterate all the current voxel stats, and list their sending modes, and total voxel counts
34813481 std::stringstream sendingMode("");
3482− sendingMode << "Voxel Sending Mode: [";
3482+ sendingMode << "Octree Sending Mode: [";
34833483 int serverCount = 0;
34843484 int movingServerCount = 0;
34853485 unsigned long totalNodes = 0;
34863486 unsigned long totalInternal = 0;
34873487 unsigned long totalLeaves = 0;
3488− for(NodeToVoxelSceneStatsIterator i = _voxelServerSceneStats.begin(); i != _voxelServerSceneStats.end(); i++) {
3488+ for(NodeToVoxelSceneStatsIterator i = _octreeServerSceneStats.begin(); i != _octreeServerSceneStats.end(); i++) {
34893489 //const QUuid& uuid = i->first;
34903490 VoxelSceneStats& stats = i->second;
34913491 serverCount++;
@@ -4133,7 +4133,7 @@ void Application::domainChanged(QString domain) { · 641 unmodified lines
41334133
41344134 // reset our node to stats and node to jurisdiction maps... since these must be changing...
41354135 _voxelServerJurisdictions.clear();
4136− _voxelServerSceneStats.clear();
4136+ _octreeServerSceneStats.clear();
41374137 _particleServerJurisdictions.clear();
41384138 }
41394139
@@ -4168,8 +4168,8 @@ void Application::nodeKilled(Node* node) { · 28 unmodified lines
41684168
41694169 // also clean up scene stats for that server
41704170 _voxelSceneStatsLock.lockForWrite();
4171− if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) {
4172− _voxelServerSceneStats.erase(nodeUUID);
4171+ if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) {
4172+ _octreeServerSceneStats.erase(nodeUUID);
41734173 }
41744174 _voxelSceneStatsLock.unlock();
41754175
@@ -4199,8 +4199,8 @@ void Application::nodeKilled(Node* node) { · 23 unmodified lines
41994199
42004200 // also clean up scene stats for that server
42014201 _voxelSceneStatsLock.lockForWrite();
4202− if (_voxelServerSceneStats.find(nodeUUID) != _voxelServerSceneStats.end()) {
4203− _voxelServerSceneStats.erase(nodeUUID);
4202+ if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) {
4203+ _octreeServerSceneStats.erase(nodeUUID);
42044204 }
42054205 _voxelSceneStatsLock.unlock();
42064206
@@ -4227,8 +4227,8 @@ void Application::trackIncomingVoxelPacket(unsigned char* messageData, ssize_t m · 20 unmodified lines
42274227
42284228 // now that we know the node ID, let's add these stats to the stats for that node...
42294229 _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];
42324232 stats.trackIncomingOctreePacket(messageData, messageLength, wasStatsPacket);
42334233 }
42344234 _voxelSceneStatsLock.unlock();
@@ -4251,10 +4251,10 @@ int Application::parseOctreeStats(unsigned char* messageData, ssize_t messageLen · 16 unmodified lines
42514251
42524252 // now that we know the node ID, let's add these stats to the stats for that node...
42534253 _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);
42564256 } else {
4257− _voxelServerSceneStats[nodeUUID] = temp;
4257+ _octreeServerSceneStats[nodeUUID] = temp;
42584258 }
42594259 _voxelSceneStatsLock.unlock();
42604260

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