Fix libfreenect2 build paths

Remove Protonect definitions from the main CMakeLists.txt
to `examples` directory.

Fix *.bin paths.

A few line-end whitespace deletions.

Author: xlz

CMakeLists.txt

@@ -14,7 +14,7 @@ ENDIF()
 PROJECT(libfreenect2)
 
 SET(MY_DIR ${libfreenect2_SOURCE_DIR})
-SET(DEPENDS_DIR "${MY_DIR}/../../depends" CACHE STRING "dependency directory must be set to 'false' if external deps are used")
+SET(DEPENDS_DIR "${MY_DIR}/depends" CACHE STRING "dependency directory must be set to 'false' if external deps are used")
 
 OPTION(BUILD_SHARED_LIBS "Build shared (ON) or static (OFF) libraries" ON)
 OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
@@ -44,10 +44,10 @@ INCLUDE(SetupLibfreenect2Threading)
 INCLUDE(GenerateResources)
 
 #set the default path for built executables to the "bin" directory
-SET(EXECUTABLE_OUTPUT_PATH ${MY_DIR}/bin)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 #set the default path for built libraries to the "lib" directory
-SET(LIBRARY_OUTPUT_PATH ${MY_DIR}/lib)
+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
 # dependencies
 FIND_PACKAGE(PkgConfig)    # try find PKGConfig as it will be used if found
@@ -71,7 +71,7 @@ SET(SOURCES
   include/libfreenect2/protocol/command_transaction.h
   include/libfreenect2/protocol/response.h
   include/libfreenect2/protocol/usb_control.h
-  
+
   include/libfreenect2/usb/event_loop.h
   include/libfreenect2/usb/transfer_pool.h
 
@@ -93,7 +93,7 @@ SET(SOURCES
   include/libfreenect2/rgb_packet_processor.h
   include/libfreenect2/rgb_packet_stream_parser.h
   include/libfreenect2/threading.h
-  
+
   src/transfer_pool.cpp
   src/event_loop.cpp
   src/usb_control.cpp
@@ -111,7 +111,7 @@ SET(SOURCES
   src/registration.cpp
   src/logging.cpp
   src/libfreenect2.cpp
-  
+
   ${LIBFREENECT2_THREADING_SOURCE}
   ${RESOURCES_INC_FILE}
 )
@@ -123,9 +123,9 @@ SET(LIBRARIES
 )
 
 SET(RESOURCES
-  11to16.bin 
-  xTable.bin 
-  zTable.bin
+  data/11to16.bin
+  data/xTable.bin
+  data/zTable.bin
 )
 
 IF(ENABLE_OPENGL)
@@ -144,7 +144,7 @@ IF(ENABLE_OPENGL)
     src/flextGL.c
     src/opengl_depth_packet_processor.cpp
   )
-  
+
   LIST(APPEND RESOURCES
     src/shader/debug.fs
     src/shader/default.vs
@@ -159,18 +159,18 @@ ENDIF(ENABLE_OPENGL)
 IF(ENABLE_OPENCL)
   FIND_PACKAGE(OpenCL)
 
-  IF(OPENCL_FOUND)      
+  IF(OPENCL_FOUND)
     SET(LIBFREENECT2_WITH_OPENCL_SUPPORT 1)
     INCLUDE_DIRECTORIES(${OPENCL_INCLUDE_DIRS})
-    
+
     LIST(APPEND SOURCES
       src/opencl_depth_packet_processor.cpp
     )
 
     LIST(APPEND LIBRARIES
       ${OPENCL_LIBRARIES}
     )
-      
+
     LIST(APPEND RESOURCES
       src/opencl_depth_packet_processor.cl
     )
@@ -213,27 +213,6 @@ IF(MSVC AND NOT BUILD_SHARED_LIBS)
 ENDIF()
 MESSAGE(STATUS "Linking with these libraries: ${LIBRARIES}")
 TARGET_LINK_LIBRARIES(freenect2 ${LIBRARIES})
-  
-SET(Protonect_src
-    Protonect.cpp
-    )
-    
-IF (ENABLE_OPENGL AND OPENGL_FOUND)
-    LIST(APPEND Protonect_src
-        viewer.h
-        viewer.cpp
-        src/flextGL.c
-        )
-ENDIF()
-  
-ADD_EXECUTABLE(Protonect
-  ${Protonect_src}
-
-)
-  
-TARGET_LINK_LIBRARIES(Protonect
-  freenect2
-)
 
 CONFIGURE_FILE(freenect2.cmake.in "${PROJECT_BINARY_DIR}/freenect2Config.cmake" @ONLY)
 CONFIGURE_FILE(freenect2.pc.in "${PROJECT_BINARY_DIR}/freenect2.pc" @ONLY)

cmake_modules/GenerateResources.cmake

@@ -1,7 +1,7 @@
 FUNCTION(GENERATE_RESOURCES OUTPUT BASE_FOLDER)
 
 ADD_EXECUTABLE(generate_resources_tool
-  src/generate_resources.cpp
+  tools/generate_resources.cpp
 )
 
 ADD_CUSTOM_COMMAND(

src/opencl_depth_packet_processor.cpp

@@ -532,7 +532,7 @@ class OpenCLDepthPacketProcessorImpl: public WithPerfLogging
 
   bool readProgram(std::string &source) const
   {
-    source = loadCLSource("src/opencl_depth_packet_processor.cl");
+    source = loadCLSource("opencl_depth_packet_processor.cl");
     return !source.empty();
   }
 

src/opengl_depth_packet_processor.cpp

@@ -400,7 +400,6 @@ struct Texture : public WithOpenGLBindings
 struct OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings, public WithPerfLogging
 {
   GLFWwindow *opengl_context_ptr;
-  std::string shader_folder;
   libfreenect2::DepthPacketProcessor::Config config;
 
   GLuint square_vbo, square_vao, stage1_framebuffer, filter1_framebuffer, stage2_framebuffer, filter2_framebuffer;
@@ -441,7 +440,6 @@ struct OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings, public WithPe
 
   OpenGLDepthPacketProcessorImpl(GLFWwindow *new_opengl_context_ptr, bool debug) :
     opengl_context_ptr(new_opengl_context_ptr),
-    shader_folder("src/shader/"),
     square_vao(0),
     square_vbo(0),
     stage1_framebuffer(0),
@@ -556,40 +554,40 @@ struct OpenGLDepthPacketProcessorImpl : public WithOpenGLBindings, public WithPe
     if(do_debug) filter2_debug.allocate(512, 424);
     filter2_depth.allocate(512, 424);
 
-    stage1.setVertexShader(loadShaderSource(shader_folder + "default.vs"));
-    stage1.setFragmentShader(loadShaderSource(shader_folder + "stage1.fs"));
+    stage1.setVertexShader(loadShaderSource("default.vs"));
+    stage1.setFragmentShader(loadShaderSource("stage1.fs"));
     stage1.bindFragDataLocation("Debug", 0);
     stage1.bindFragDataLocation("A", 1);
     stage1.bindFragDataLocation("B", 2);
     stage1.bindFragDataLocation("Norm", 3);
     stage1.bindFragDataLocation("Infrared", 4);
     stage1.build();
 
-    filter1.setVertexShader(loadShaderSource(shader_folder + "default.vs"));
-    filter1.setFragmentShader(loadShaderSource(shader_folder + "filter1.fs"));
+    filter1.setVertexShader(loadShaderSource("default.vs"));
+    filter1.setFragmentShader(loadShaderSource("filter1.fs"));
     filter1.bindFragDataLocation("Debug", 0);
     filter1.bindFragDataLocation("FilterA", 1);
     filter1.bindFragDataLocation("FilterB", 2);
     filter1.bindFragDataLocation("MaxEdgeTest", 3);
     filter1.build();
 
-    stage2.setVertexShader(loadShaderSource(shader_folder + "default.vs"));
-    stage2.setFragmentShader(loadShaderSource(shader_folder + "stage2.fs"));
+    stage2.setVertexShader(loadShaderSource("default.vs"));
+    stage2.setFragmentShader(loadShaderSource("stage2.fs"));
     stage2.bindFragDataLocation("Debug", 0);
     stage2.bindFragDataLocation("Depth", 1);
     stage2.bindFragDataLocation("DepthAndIrSum", 2);
     stage2.build();
 
-    filter2.setVertexShader(loadShaderSource(shader_folder + "default.vs"));
-    filter2.setFragmentShader(loadShaderSource(shader_folder + "filter2.fs"));
+    filter2.setVertexShader(loadShaderSource("default.vs"));
+    filter2.setFragmentShader(loadShaderSource("filter2.fs"));
     filter2.bindFragDataLocation("Debug", 0);
     filter2.bindFragDataLocation("FilterDepth", 1);
     filter2.build();
 
     if(do_debug)
     {
-      debug.setVertexShader(loadShaderSource(shader_folder + "default.vs"));
-      debug.setFragmentShader(loadShaderSource(shader_folder + "debug.fs"));
+      debug.setVertexShader(loadShaderSource("default.vs"));
+      debug.setFragmentShader(loadShaderSource("debug.fs"));
       debug.bindFragDataLocation("Debug", 0);
       debug.build();
     }

tools/generate_resources.cpp

@@ -83,7 +83,11 @@ int main(int argc, char **argv)
 
   for(int i = 2; i < argc; ++i)
   {
-    cout << "  { \"" << argv[i] << "\", resource" << (i - 2) << ", " << "sizeof(resource" << (i - 2) << ") }," << endl;
+    string path(argv[i]);
+    size_t last_slash = path.find_last_of("\\/");
+    if (last_slash != std::string::npos)
+      path.erase(0, last_slash + 1);
+    cout << "  { \"" << path << "\", resource" << (i - 2) << ", " << "sizeof(resource" << (i - 2) << ") }," << endl;
   }
 
   cout << "};" << endl;