History

Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work

ZappoMan committed 13 years ago

Commit 67910a22 parents 8c45361 51aafc317 files · +734 −707Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+6−6
@@ -93,24 +93,24 @@ long int VoxelSystem::getVoxelsCreated() { · 92 unmodified lines
9393 return tree->voxelsCreated;
9494 }
9595
96−long int VoxelSystem::getVoxelsCreatedRunningAverage() {
97− return tree->voxelsCreatedStats.getRunningAverage();
96+float VoxelSystem::getVoxelsCreatedPerSecondAverage() {
97+ return (1 / tree->voxelsCreatedStats.getEventDeltaAverage());
9898 }
9999
100100 long int VoxelSystem::getVoxelsColored() {
101101 return tree->voxelsColored;
102102 }
103103
104−long int VoxelSystem::getVoxelsColoredRunningAverage() {
105− return tree->voxelsColoredStats.getRunningAverage();
104+float VoxelSystem::getVoxelsColoredPerSecondAverage() {
105+ return (1 / tree->voxelsColoredStats.getEventDeltaAverage());
106106 }
107107
108108 long int VoxelSystem::getVoxelsBytesRead() {
109109 return tree->voxelsBytesRead;
110110 }
111111
112−long int VoxelSystem::getVoxelsBytesReadRunningAverage() {
113− return tree->voxelsBytesReadStats.getRunningAverage();
112+float VoxelSystem::getVoxelsBytesReadPerSecondAverage() {
113+ return tree->voxelsBytesReadStats.getAverageSampleValuePerSecond();
114114 }
115115
116116