Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -2786,8 +2786,8 @@ void Application::displayStats() { · 2785 unmodified lines | |||
| 2786 | voxelStats.str(""); | 2786 | voxelStats.str(""); |
| 2787 | QString packetsString = locale.toString((int)voxelPacketsToProcess); | 2787 | QString packetsString = locale.toString((int)voxelPacketsToProcess); |
| 2788 | QString maxString = locale.toString((int)_recentMaxPackets); | 2788 | QString maxString = locale.toString((int)_recentMaxPackets); |
| 2789 | voxelStats << "Voxel Packets to Process: " << packetsString.toLocal8Bit().constData() | 2789 | voxelStats << "Voxel Packets to Process: " << qPrintable(packetsString) |
| 2790 | << " [Recent Max: " << maxString.toLocal8Bit().constData() << "]"; | 2790 | << " [Recent Max: " << qPrintable(maxString) << "]"; |
| 2791 | verticalOffset += STATS_PELS_PER_LINE; | 2791 | verticalOffset += STATS_PELS_PER_LINE; |
| 2792 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); | 2792 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); |
| 2793 | } | 2793 | } |
| @@ -2810,7 +2810,7 @@ void Application::displayStats() { · 16 unmodified lines | |||
| 2810 | 2810 | ||
| 2811 | // Server Voxels | 2811 | // Server Voxels |
| 2812 | voxelStats.str(""); | 2812 | voxelStats.str(""); |
| 2813 | voxelStats << "Server voxels: " << serversTotalString.toLocal8Bit().constData(); | 2813 | voxelStats << "Server voxels: " << qPrintable(serversTotalString); |
| 2814 | verticalOffset += STATS_PELS_PER_LINE; | 2814 | verticalOffset += STATS_PELS_PER_LINE; |
| 2815 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); | 2815 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); |
| 2816 | 2816 | ||
| @@ -2820,8 +2820,8 @@ void Application::displayStats() { · 3 unmodified lines | |||
| 2820 | 2820 | ||
| 2821 | voxelStats.str(""); | 2821 | voxelStats.str(""); |
| 2822 | voxelStats << | 2822 | voxelStats << |
| 2823 | "Internal: " << serversInternalString.toLocal8Bit().constData() << " " << | 2823 | "Internal: " << qPrintable(serversInternalString) << " " << |
| 2824 | "Leaves: " << serversLeavesString.toLocal8Bit().constData() << ""; | 2824 | "Leaves: " << qPrintable(serversLeavesString) << ""; |
| 2825 | verticalOffset += STATS_PELS_PER_LINE; | 2825 | verticalOffset += STATS_PELS_PER_LINE; |
| 2826 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); | 2826 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); |
| 2827 | } | 2827 | } |
| @@ -2831,7 +2831,7 @@ void Application::displayStats() { · 3 unmodified lines | |||
| 2831 | 2831 | ||
| 2832 | // Local Voxels | 2832 | // Local Voxels |
| 2833 | voxelStats.str(""); | 2833 | voxelStats.str(""); |
| 2834 | voxelStats << "Local voxels: " << localTotalString.toLocal8Bit().constData(); | 2834 | voxelStats << "Local voxels: " << qPrintable(localTotalString); |
| 2835 | verticalOffset += STATS_PELS_PER_LINE; | 2835 | verticalOffset += STATS_PELS_PER_LINE; |
| 2836 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); | 2836 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); |
| 2837 | 2837 | ||
| @@ -2843,8 +2843,17 @@ void Application::displayStats() { · 5 unmodified lines | |||
| 2843 | 2843 | ||
| 2844 | voxelStats.str(""); | 2844 | voxelStats.str(""); |
| 2845 | voxelStats << | 2845 | voxelStats << |
| 2846 | "Internal: " << localInternalString.toLocal8Bit().constData() << " " << | 2846 | "Internal: " << qPrintable(localInternalString) << " " << |
| 2847 | "Leaves: " << localLeavesString.toLocal8Bit().constData() << ""; | 2847 | "Leaves: " << qPrintable(localLeavesString) << ""; |
| 2848 | verticalOffset += STATS_PELS_PER_LINE; | ||
| 2849 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); | ||
| 2850 | } | ||
| 2851 | |||
| 2852 | // LOD Details | ||
| 2853 | if (_statsExpanded) { | ||
| 2854 | voxelStats.str(""); | ||
| 2855 | QString displayLODDetails = Menu::getInstance()->getLODFeedbackText(); | ||
| 2856 | voxelStats << "LOD: You can see " << qPrintable(displayLODDetails.trimmed()); | ||
| 2848 | verticalOffset += STATS_PELS_PER_LINE; | 2857 | verticalOffset += STATS_PELS_PER_LINE; |
| 2849 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); | 2858 | drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), WHITE_TEXT); |
| 2850 | } | 2859 | } |