Merge pull request #95 from christiankerl/configurable_opengl_debug_window

added option to hide the debug window of OpenGLDepthPacketProcessor

Author: christiankerl

examples/protonect/include/libfreenect2/depth_packet_processor.h

@@ -112,7 +112,7 @@ class OpenGLDepthPacketProcessorImpl;
 class OpenGLDepthPacketProcessor : public DepthPacketProcessor
 {
 public:
-  OpenGLDepthPacketProcessor(void *parent_opengl_context_ptr);
+  OpenGLDepthPacketProcessor(void *parent_opengl_context_ptr, bool debug);
   virtual ~OpenGLDepthPacketProcessor();
   virtual void setConfiguration(const libfreenect2::DepthPacketProcessor::Config &config);
 

examples/protonect/include/libfreenect2/packet_pipeline.h

@@ -84,9 +84,10 @@ class CpuPacketPipeline : public BasePacketPipeline
 class OpenGLPacketPipeline : public BasePacketPipeline
 {
 protected:
+  bool debug_;
   virtual DepthPacketProcessor *createDepthPacketProcessor();
 public:
-  OpenGLPacketPipeline();
+  OpenGLPacketPipeline(bool debug = false);
   virtual ~OpenGLPacketPipeline();
 };
 

examples/protonect/src/opengl_depth_packet_processor.cpp

@@ -319,15 +319,15 @@ struct OpenGLDepthPacketProcessorImpl
 
   double timing_current_start;
 
-  static const bool do_debug = true;
+  bool do_debug;
 
   struct Vertex
   {
     float x, y;
     float u, v;
   };
 
-  OpenGLDepthPacketProcessorImpl(OpenGLContext *new_opengl_context_ptr) :
+  OpenGLDepthPacketProcessorImpl(OpenGLContext *new_opengl_context_ptr, bool debug) :
     opengl_context_ptr(new_opengl_context_ptr),
     shader_folder("src/shader/"),
     square_vao(0),
@@ -339,7 +339,8 @@ struct OpenGLDepthPacketProcessorImpl
     params_need_update(true),
     timing_acc(0),
     timing_acc_n(0),
-    timing_current_start(0)
+    timing_current_start(0),
+    do_debug(debug)
   {
   }
 
@@ -662,7 +663,7 @@ struct OpenGLDepthPacketProcessorImpl
   }
 };
 
-OpenGLDepthPacketProcessor::OpenGLDepthPacketProcessor(void *parent_opengl_context_ptr)
+OpenGLDepthPacketProcessor::OpenGLDepthPacketProcessor(void *parent_opengl_context_ptr, bool debug)
 {
   GLFWwindow* parent_window = (GLFWwindow *)parent_opengl_context_ptr;
 
@@ -673,12 +674,12 @@ OpenGLDepthPacketProcessor::OpenGLDepthPacketProcessor(void *parent_opengl_conte
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
   #endif
   glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-  glfwWindowHint(GLFW_VISIBLE, impl_->do_debug ? GL_TRUE : GL_FALSE);
+  glfwWindowHint(GLFW_VISIBLE, debug ? GL_TRUE : GL_FALSE);
 
   GLFWwindow* window = glfwCreateWindow(1024, 848, "OpenGLDepthPacketProcessor", 0, parent_window);
   OpenGLContext *opengl_ctx = new OpenGLContext(window);
 
-  impl_ = new OpenGLDepthPacketProcessorImpl(opengl_ctx);
+  impl_ = new OpenGLDepthPacketProcessorImpl(opengl_ctx, debug);
   impl_->initialize();
 }
 

examples/protonect/src/packet_pipeline.cpp

@@ -96,7 +96,7 @@ DepthPacketProcessor *CpuPacketPipeline::createDepthPacketProcessor()
   return depth_processor;
 }
 
-OpenGLPacketPipeline::OpenGLPacketPipeline()
+OpenGLPacketPipeline::OpenGLPacketPipeline(bool debug) : debug_(debug)
 { 
   initialize();
 }
@@ -105,7 +105,7 @@ OpenGLPacketPipeline::~OpenGLPacketPipeline() { }
 
 DepthPacketProcessor *OpenGLPacketPipeline::createDepthPacketProcessor()
 {
-  OpenGLDepthPacketProcessor *depth_processor = new OpenGLDepthPacketProcessor(0);
+  OpenGLDepthPacketProcessor *depth_processor = new OpenGLDepthPacketProcessor(0, debug_);
   depth_processor->load11To16LutFromFile("11to16.bin");
   depth_processor->loadXTableFromFile("xTable.bin");
   depth_processor->loadZTableFromFile("zTable.bin");

examples/protonect/src/test_opengl_depth_packet_processor.cpp

@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
   cfg.EnableBilateralFilter = false;
   cfg.EnableEdgeAwareFilter = false;
 
-  libfreenect2::OpenGLDepthPacketProcessor processor(opengl_ctx.glfw_ctx);
+  libfreenect2::OpenGLDepthPacketProcessor processor(opengl_ctx.glfw_ctx, true);
   processor.setConfiguration(cfg);
   processor.setFrameListener(&fl);
   processor.loadP0TablesFromFiles((binpath + "../p00.bin").c_str(), (binpath + "../p01.bin").c_str(), (binpath + "../p02.bin").c_str());