History

add memory usage debugging

ZappoMan committed 13 years ago

Commit 605c2f31 parent eb6af1a3 files · +105 −10Browse files

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

Unified · Split

interface/src/Application.cpp+14−6
@@ -2822,28 +2822,36 @@ void Application::displayStats() { · 2821 unmodified lines
2822 voxelStats << "Voxels Rendered: " << _voxels.getVoxelsRendered() / 1000.f << "K " <<2822 voxelStats << "Voxels Rendered: " << _voxels.getVoxelsRendered() / 1000.f << "K " <<
2823 "Updated: " << _voxels.getVoxelsUpdated()/1000.f << "K " <<2823 "Updated: " << _voxels.getVoxelsUpdated()/1000.f << "K " <<
2824 "Max: " << _voxels.getMaxVoxels()/1000.f << "K ";2824 "Max: " << _voxels.getMaxVoxels()/1000.f << "K ";
2825
2826 drawtext(10, statsVerticalOffset + 230, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());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 voxelStats.str("");2836 voxelStats.str("");
2829 char* voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_VOXELS);2837 char* voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_VOXELS);
2830 voxelStats << "Voxels Sent from Server: " << voxelDetails;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 voxelStats.str("");2841 voxelStats.str("");
2834 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ELAPSED);2842 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ELAPSED);
2835 voxelStats << "Scene Send Time from Server: " << voxelDetails;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 voxelStats.str("");2846 voxelStats.str("");
2839 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ENCODE);2847 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ENCODE);
2840 voxelStats << "Encode Time on Server: " << voxelDetails;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 voxelStats.str("");2851 voxelStats.str("");
2844 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_MODE);2852 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_MODE);
2845 voxelStats << "Sending Mode: " << voxelDetails;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 Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);2856 Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
2849 char avatarMixerStats[200];2857 char avatarMixerStats[200];
@@ -2856,7 +2864,7 @@ void Application::displayStats() { · 6 unmodified lines
2856 sprintf(avatarMixerStats, "No Avatar Mixer");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 drawtext(10, statsVerticalOffset + 450, 0.10f, 0, 1.0, 0, (char *)LeapManager::statusString().c_str());2868 drawtext(10, statsVerticalOffset + 450, 0.10f, 0, 1.0, 0, (char *)LeapManager::statusString().c_str());
2861 2869
2862 if (_perfStatsOn) {2870 if (_perfStatsOn) {

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