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
93 return tree->voxelsCreated;93 return tree->voxelsCreated;
94}94}
95 95
96long int VoxelSystem::getVoxelsCreatedRunningAverage() {96float VoxelSystem::getVoxelsCreatedPerSecondAverage() {
97 return tree->voxelsCreatedStats.getRunningAverage();97 return (1 / tree->voxelsCreatedStats.getEventDeltaAverage());
98}98}
99 99
100long int VoxelSystem::getVoxelsColored() {100long int VoxelSystem::getVoxelsColored() {
101 return tree->voxelsColored;101 return tree->voxelsColored;
102}102}
103 103
104long int VoxelSystem::getVoxelsColoredRunningAverage() {104float VoxelSystem::getVoxelsColoredPerSecondAverage() {
105 return tree->voxelsColoredStats.getRunningAverage();105 return (1 / tree->voxelsColoredStats.getEventDeltaAverage());
106}106}
107 107
108long int VoxelSystem::getVoxelsBytesRead() {108long int VoxelSystem::getVoxelsBytesRead() {
109 return tree->voxelsBytesRead;109 return tree->voxelsBytesRead;
110}110}
111 111
112long int VoxelSystem::getVoxelsBytesReadRunningAverage() {112float VoxelSystem::getVoxelsBytesReadPerSecondAverage() {
113 return tree->voxelsBytesReadStats.getRunningAverage();113 return tree->voxelsBytesReadStats.getAverageSampleValuePerSecond();
114}114}
115 115
116 116