History

merge conflict fix

ZappoMan committed 13 years ago

Commit 843e9da1 parent 581e0ad1 file · +0 −22Browse files

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

Unified · Split

interface/src/Application.cpp+0−22
@@ -3491,28 +3491,6 @@ void Application::displayStats() { · 3490 unmodified lines
3491 statsVerticalOffset += PELS_PER_LINE;3491 statsVerticalOffset += PELS_PER_LINE;
3492 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());3492 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());
3493 3493
3494 voxelStats.str("");
3495 int voxelPacketsToProcess = _voxelProcessor.packetsToProcessCount();
3496 QString packetsString = locale.toString((int)voxelPacketsToProcess);
3497 QString maxString = locale.toString((int)_recentMaxPackets);
3498
3499 voxelStats << "Voxel Packets to Process: " << packetsString.toLocal8Bit().constData()
3500 << " [Recent Max: " << maxString.toLocal8Bit().constData() << "]";
3501
3502 if (_resetRecentMaxPacketsSoon && voxelPacketsToProcess > 0) {
3503 _recentMaxPackets = 0;
3504 _resetRecentMaxPacketsSoon = false;
3505 }
3506 if (voxelPacketsToProcess == 0) {
3507 _resetRecentMaxPacketsSoon = true;
3508 } else {
3509 if (voxelPacketsToProcess > _recentMaxPackets) {
3510 _recentMaxPackets = voxelPacketsToProcess;
3511 }
3512 }
3513 statsVerticalOffset += PELS_PER_LINE;
3514 drawtext(10, statsVerticalOffset, 0.10f, 0, 1.0, 0, (char*)voxelStats.str().c_str());
3515
3516 Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);3494 Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
3517 char avatarMixerStats[200];3495 char avatarMixerStats[200];
3518 3496

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