From 44cb57afad7000428facd629ad886d410eca9355 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 18 Apr 2013 15:33:17 -0700
Subject: [PATCH] put back brad's voxel stats, he loves them too much

---
 interface/src/VoxelSystem.cpp |  6 +++---
 interface/src/VoxelSystem.h   |  2 +-
 interface/src/main.cpp        | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp
index cf88a199d0..7b22525fde 100644
--- a/interface/src/VoxelSystem.cpp
+++ b/interface/src/VoxelSystem.cpp
@@ -102,15 +102,15 @@ long int VoxelSystem::getVoxelsColored() {
 }
 
 float VoxelSystem::getVoxelsColoredPerSecondAverage() {
-    return tree->voxelsColoredStats.getEventDeltaAverage();
+    return (1 / tree->voxelsColoredStats.getEventDeltaAverage());
 }
 
 long int VoxelSystem::getVoxelsBytesRead() {
     return tree->voxelsBytesRead;
 }
 
-float VoxelSystem::getVoxelsBytesReadAverage() {
-    return tree->voxelsBytesReadStats.getAverage();
+float VoxelSystem::getVoxelsBytesReadPerSecondAverage() {
+    return tree->voxelsBytesReadStats.getAverageSampleValuePerSecond();
 }
 
 
diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h
index 3ca39d75bf..76aaf57a4e 100644
--- a/interface/src/VoxelSystem.h
+++ b/interface/src/VoxelSystem.h
@@ -42,7 +42,7 @@ public:
     long int getVoxelsBytesRead();
     float getVoxelsCreatedPerSecondAverage();
     float getVoxelsColoredPerSecondAverage();
-    float getVoxelsBytesReadAverage();
+    float getVoxelsBytesReadPerSecondAverage();
 
 private:
     int voxelsRendered;
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 09486a9c90..5adea8abff 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -236,6 +236,33 @@ void displayStats(void)
     sprintf(stats, "FPS = %3.0f  Pkts/s = %d  Bytes/s = %d Head(x,y,z)= %4.2f, %4.2f, %4.2f ", 
             FPS, packetsPerSecond,  bytesPerSecond, avatarPos.x,avatarPos.y,avatarPos.z);
     drawtext(10, statsVerticalOffset + 49, 0.10f, 0, 1.0, 0, stats);
+    
+    std::stringstream voxelStats;
+    voxelStats << "Voxels Rendered: " << voxels.getVoxelsRendered();
+    drawtext(10, statsVerticalOffset + 70, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
+    
+	voxelStats.str("");
+	voxelStats << "Voxels Created: " << voxels.getVoxelsCreated() << " (" << voxels.getVoxelsCreatedPerSecondAverage()
+    << "/sec) ";
+    drawtext(10, statsVerticalOffset + 250, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
+    
+	voxelStats.str("");
+	voxelStats << "Voxels Colored: " << voxels.getVoxelsColored() << " (" << voxels.getVoxelsColoredPerSecondAverage()
+    << "/sec) ";
+    drawtext(10, statsVerticalOffset + 270, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
+    
+	voxelStats.str("");
+	voxelStats << "Voxels Bytes Read: " << voxels.getVoxelsBytesRead()
+    << " (" << voxels.getVoxelsBytesReadPerSecondAverage() << " Bps)";
+    drawtext(10, statsVerticalOffset + 290,0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
+
+	voxelStats.str("");
+	float voxelsBytesPerColored = voxels.getVoxelsColored()
+        ? ((float) voxels.getVoxelsBytesRead() / voxels.getVoxelsColored())
+        : 0;
+    
+	voxelStats << "Voxels Bytes per Colored: " << voxelsBytesPerColored;
+    drawtext(10, statsVerticalOffset + 310, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
 
 	if (::perfStatsOn) {
 		// Get the PerfStats group details. We need to allocate and array of char* long enough to hold 1+groups