From 793ac841f288ac8256db2c27277bbfc9ef04539f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 1 Apr 2013 14:08:42 -0700
Subject: [PATCH] only allow VBO re-transfer every 5 seconds for test

---
 interface/src/VoxelSystem.cpp | 15 ++++++++++-----
 interface/src/VoxelSystem.h   |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp
index 6f859e2c8a..bf973c0e2f 100644
--- a/interface/src/VoxelSystem.cpp
+++ b/interface/src/VoxelSystem.cpp
@@ -40,6 +40,8 @@ VoxelSystem::VoxelSystem() {
     voxelsRendered = 0;
     tree = new VoxelTree();
     pthread_mutex_init(&bufferWriteLock, NULL);
+    lastBufferCopy.tv_sec = 0;
+    lastBufferCopy.tv_usec = 0;
 }
 
 VoxelSystem::~VoxelSystem() {    
@@ -185,11 +187,11 @@ VoxelSystem* VoxelSystem::clone() const {
 
 void VoxelSystem::init() {
     // prep the data structures for incoming voxel data
-    writeVerticesArray = new GLfloat[VERTEX_POINTS_PER_VOXEL * MAX_VOXELS_PER_SYSTEM];
-    readVerticesArray = new GLfloat[VERTEX_POINTS_PER_VOXEL * MAX_VOXELS_PER_SYSTEM];
+    writeVerticesEndPointer = writeVerticesArray = new GLfloat[VERTEX_POINTS_PER_VOXEL * MAX_VOXELS_PER_SYSTEM];
+    readVerticesEndPointer = readVerticesArray = new GLfloat[VERTEX_POINTS_PER_VOXEL * MAX_VOXELS_PER_SYSTEM];
     writeColorsArray = new GLubyte[VERTEX_POINTS_PER_VOXEL * MAX_VOXELS_PER_SYSTEM];
     readColorsArray = new GLubyte[VERTEX_POINTS_PER_VOXEL * MAX_VOXELS_PER_SYSTEM];
-    
+
     GLuint *indicesArray = new GLuint[INDICES_PER_VOXEL * MAX_VOXELS_PER_SYSTEM];
     
     // populate the indicesArray
@@ -231,8 +233,9 @@ void VoxelSystem::render() {
 
     glPushMatrix();
     
-    
-    if (readVerticesEndPointer != readVerticesArray) {
+    double timeSinceLastDraw = usecTimestampNow() - usecTimestamp(&lastBufferCopy);
+    if (readVerticesEndPointer != readVerticesArray && timeSinceLastDraw >= 5000 * 1000) {
+        printf("The time since the last draw was %f\n", timeSinceLastDraw);
         // try to lock on the buffer write
         // just avoid pulling new data if it is currently being written
         if (pthread_mutex_trylock(&bufferWriteLock) == 0) {
@@ -249,6 +252,8 @@ void VoxelSystem::render() {
             
             pthread_mutex_unlock(&bufferWriteLock);
         }
+        
+        gettimeofday(&lastBufferCopy, NULL);
     }
 
     // tell OpenGL where to find vertex and color information
diff --git a/interface/src/VoxelSystem.h b/interface/src/VoxelSystem.h
index 30c4ff9d64..eabe704d11 100644
--- a/interface/src/VoxelSystem.h
+++ b/interface/src/VoxelSystem.h
@@ -51,6 +51,7 @@ private:
     GLuint vboColorsID;
     GLuint vboIndicesID;
     pthread_mutex_t bufferWriteLock;
+    timeval lastBufferCopy;
     
     int treeToArrays(VoxelNode *currentNode, float nodePosition[3]);
     void setupNewVoxelsForDrawing();