Showing the changes to interface/src/Application.cpp (1 of 40 files). Show all
Unified · Split
| @@ -2676,7 +2676,7 @@ void Application::displayStats() { · 2675 unmodified lines | ||
| 2676 | 2676 | |
| 2677 | 2677 | glm::vec3 avatarPos = _myAvatar->getPosition(); |
| 2678 | 2678 | |
| 2679 | − lines = _statsExpanded ? 4 : 3; | |
| 2679 | + lines = _statsExpanded ? 5 : 3; | |
| 2680 | 2680 | displayStatsBackground(backgroundColor, horizontalOffset, 0, _glWidget->width() - (mirrorEnabled ? 301 : 411) - horizontalOffset, lines * STATS_PELS_PER_LINE + 10); |
| 2681 | 2681 | horizontalOffset += 5; |
| 2682 | 2682 | |
| @@ -2713,12 +2713,23 @@ void Application::displayStats() { · 30 unmodified lines | ||
| 2713 | 2713 | |
| 2714 | 2714 | verticalOffset += STATS_PELS_PER_LINE; |
| 2715 | 2715 | drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarMixerStats, WHITE_TEXT); |
| 2716 | + | |
| 2717 | + stringstream downloadStats; | |
| 2718 | + downloadStats << "Downloads: "; | |
| 2719 | + foreach (Resource* resource, ResourceCache::getLoadingRequests()) { | |
| 2720 | + const float MAXIMUM_PERCENTAGE = 100.0f; | |
| 2721 | + downloadStats << roundf(resource->getProgress() * MAXIMUM_PERCENTAGE) << "% "; | |
| 2722 | + } | |
| 2723 | + downloadStats << "(" << ResourceCache::getPendingRequestCount() << " pending)"; | |
| 2724 | + | |
| 2725 | + verticalOffset += STATS_PELS_PER_LINE; | |
| 2726 | + drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, downloadStats.str().c_str(), WHITE_TEXT); | |
| 2716 | 2727 | } |
| 2717 | 2728 | |
| 2718 | 2729 | verticalOffset = 0; |
| 2719 | 2730 | horizontalOffset = _glWidget->width() - (mirrorEnabled ? 300 : 410); |
| 2720 | 2731 | |
| 2721 | − lines = _statsExpanded ? 11 : 3; | |
| 2732 | + lines = _statsExpanded ? 12 : 3; | |
| 2722 | 2733 | displayStatsBackground(backgroundColor, horizontalOffset, 0, _glWidget->width() - horizontalOffset, lines * STATS_PELS_PER_LINE + 10); |
| 2723 | 2734 | horizontalOffset += 5; |
| 2724 | 2735 | |