Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -2822,28 +2822,36 @@ void Application::displayStats() { · 2821 unmodified lines | ||
| 2822 | 2822 | voxelStats << "Voxels Rendered: " << _voxels.getVoxelsRendered() / 1000.f << "K " << |
| 2823 | 2823 | "Updated: " << _voxels.getVoxelsUpdated()/1000.f << "K " << |
| 2824 | 2824 | "Max: " << _voxels.getMaxVoxels()/1000.f << "K "; |
| 2825 | − | |
| 2826 | 2825 | drawtext(10, statsVerticalOffset + 230, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); |
| 2826 | + | |
| 2827 | + voxelStats.str(""); | |
| 2828 | + voxelStats << "Voxels Memory RAM: " << _voxels.getVoxelMemoryUsageRAM() / 1000000.f << "MB " << | |
| 2829 | + "VBO: " << _voxels.getVoxelMemoryUsageVBO() / 1000000.f << "MB "; | |
| 2830 | + if (_voxels.hasVoxelMemoryUsageGPU()) { | |
| 2831 | + voxelStats << "GPU: " << _voxels.getVoxelMemoryUsageGPU() / 1000000.f << "MB "; | |
| 2832 | + } | |
| 2833 | + | |
| 2834 | + drawtext(10, statsVerticalOffset + 250, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2827 | 2835 | |
| 2828 | 2836 | voxelStats.str(""); |
| 2829 | 2837 | char* voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_VOXELS); |
| 2830 | 2838 | voxelStats << "Voxels Sent from Server: " << voxelDetails; |
| 2831 | − drawtext(10, statsVerticalOffset + 250, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2839 | + drawtext(10, statsVerticalOffset + 270, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2832 | 2840 | |
| 2833 | 2841 | voxelStats.str(""); |
| 2834 | 2842 | voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ELAPSED); |
| 2835 | 2843 | voxelStats << "Scene Send Time from Server: " << voxelDetails; |
| 2836 | − drawtext(10, statsVerticalOffset + 270, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2844 | + drawtext(10, statsVerticalOffset + 290, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2837 | 2845 | |
| 2838 | 2846 | voxelStats.str(""); |
| 2839 | 2847 | voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ENCODE); |
| 2840 | 2848 | voxelStats << "Encode Time on Server: " << voxelDetails; |
| 2841 | − drawtext(10, statsVerticalOffset + 290, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2849 | + drawtext(10, statsVerticalOffset + 310, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2842 | 2850 | |
| 2843 | 2851 | voxelStats.str(""); |
| 2844 | 2852 | voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_MODE); |
| 2845 | 2853 | voxelStats << "Sending Mode: " << voxelDetails; |
| 2846 | − drawtext(10, statsVerticalOffset + 310, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2854 | + drawtext(10, statsVerticalOffset + 330, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str()); | |
| 2847 | 2855 | |
| 2848 | 2856 | Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER); |
| 2849 | 2857 | char avatarMixerStats[200]; |
| @@ -2856,7 +2864,7 @@ void Application::displayStats() { · 6 unmodified lines | ||
| 2856 | 2864 | sprintf(avatarMixerStats, "No Avatar Mixer"); |
| 2857 | 2865 | } |
| 2858 | 2866 | |
| 2859 | − drawtext(10, statsVerticalOffset + 330, 0.10f, 0, 1.0, 0, avatarMixerStats); | |
| 2867 | + drawtext(10, statsVerticalOffset + 350, 0.10f, 0, 1.0, 0, avatarMixerStats); | |
| 2860 | 2868 | drawtext(10, statsVerticalOffset + 450, 0.10f, 0, 1.0, 0, (char *)LeapManager::statusString().c_str()); |
| 2861 | 2869 | |
| 2862 | 2870 | if (_perfStatsOn) { |