Merge pull request #129 from christiankerl/replace_glew_with_flextgl

removed GLEW dependency and use OpenGL function loader generated with flextGL

Author: christiankerl

depends/install_deps.sh

@@ -35,15 +35,3 @@ make && make install
 
 cd $DEPENDS_DIR
 
-# glew
-GLEW_SOURCE_DIR=$DEPENDS_DIR/glew_src
-GLEW_INSTALL_DIR=$DEPENDS_DIR/glew
-
-rm -rf $GLEW_SOURCE_DIR $GLEW_INSTALL_DIR
-
-git clone https://github.com/nigels-com/glew.git $GLEW_SOURCE_DIR
-cd $GLEW_SOURCE_DIR
-export GLEW_DEST=$GLEW_INSTALL_DIR
-make extensions && make all && make install.all
-
-cd $DEPENDS_DIR

examples/protonect/CMakeLists.txt

@@ -48,15 +48,6 @@ INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIR})
 INCLUDE_DIRECTORIES("${MY_DIR}/../../depends/libusb/include/libusb-1.0/")
 LINK_DIRECTORIES("${MY_DIR}/../../depends/libusb/lib/")
 
-# GLEW
-INCLUDE_DIRECTORIES("${MY_DIR}/../../depends/glew/include/")
-if (APPLE)
-  LINK_DIRECTORIES("${MY_DIR}/../../depends/glew/lib/")
-else()
-  LINK_DIRECTORIES("${MY_DIR}/../../depends/glew/lib64/")
-endif()
-ADD_DEFINITIONS(-DGLEW_MX -DGLEW_STATIC)
-
 # GLFW
 SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
 SET(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Build the GLFW example programs")
@@ -113,12 +104,11 @@ SET(RESOURCES
 
 # TODO: only append if building with opengl support
 LIST(APPEND SOURCES
-  src/opengl.cpp
+  src/flextGL.c
   src/opengl_depth_packet_processor.cpp
 )
 
 LIST(APPEND LIBRARIES
-  GLEWmx
   glfw
   ${GLFW_LIBRARIES}
 )

examples/protonect/Protonect.cpp

@@ -28,7 +28,7 @@
 #include <iostream>
 #include <signal.h>
 
-#include <libfreenect2/opengl.h>
+#include <GLFW/glfw3.h>
 
 #include <opencv2/opencv.hpp>
 

examples/protonect/include/libfreenect2/opengl.h

@@ -85,10 +85,11 @@ class LIBFREENECT2_API CpuPacketPipeline : public BasePacketPipeline
 class LIBFREENECT2_API OpenGLPacketPipeline : public BasePacketPipeline
 {
 protected:
+  void *parent_opengl_context_;
   bool debug_;
   virtual DepthPacketProcessor *createDepthPacketProcessor();
 public:
-  OpenGLPacketPipeline(bool debug = false);
+  OpenGLPacketPipeline(void *parent_opengl_context = 0, bool debug = false);
   virtual ~OpenGLPacketPipeline();
 };