OpenKinect · floe · Jul 7, 2015 · Jul 8, 2015
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,10 @@
 # generated config file
-examples/protonect/include/libfreenect2/config.h
+libfreenect2/include/libfreenect2/config.h
 
 # generated resource file
-examples/protonect/src/resources.inc.h
-examples/protonect/build
-examples/protonect/lib
+libfreenect2/src/resources.inc.h
+libfreenect2/build
+libfreenect2/lib
 
 # Dependency folders
 depends/*/

diff --git a/examples/protonect/Protonect.cpp → examples/Protonect.cpp b/examples/protonect/Protonect.cpp → examples/Protonect.cpp
diff --git a/examples/protonect/11to16.bin → libfreenect2/11to16.bin b/examples/protonect/11to16.bin → libfreenect2/11to16.bin
diff --git a/examples/protonect/CMakeLists.txt → libfreenect2/CMakeLists.txt b/examples/protonect/CMakeLists.txt → libfreenect2/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(libfreenect2)
 SET(CMAKE_BUILD_TYPE RelWithDebInfo)
 
 SET(MY_DIR ${libfreenect2_SOURCE_DIR})
-SET(DEPENDS_DIR "${MY_DIR}/../../depends" CACHE STRING "dependency directory")
+SET(DEPENDS_DIR "${MY_DIR}/../depends" CACHE STRING "dependency directory")
 
 OPTION(ENABLE_CXX11 "Enable C++11 support" OFF)
 OPTION(ENABLE_OPENCL "Enable OpenCL support" ON)
@@ -184,7 +184,7 @@ MESSAGE("Linking with these libraries: ${LIBRARIES}")
 TARGET_LINK_LIBRARIES(freenect2shared ${LIBRARIES})
 
 ADD_EXECUTABLE(Protonect
-  Protonect.cpp
+  ../examples/Protonect.cpp
 )
 
 TARGET_LINK_LIBRARIES(Protonect

diff --git a/...s/protonect/cmake_modules/FindGLFW3.cmake → libfreenect2/cmake_modules/FindGLFW3.cmake b/...s/protonect/cmake_modules/FindGLFW3.cmake → libfreenect2/cmake_modules/FindGLFW3.cmake
diff --git a/.../protonect/cmake_modules/FindLibUSB.cmake → libfreenect2/cmake_modules/FindLibUSB.cmake b/.../protonect/cmake_modules/FindLibUSB.cmake → libfreenect2/cmake_modules/FindLibUSB.cmake
diff --git a/.../protonect/cmake_modules/FindOpenCL.cmake → libfreenect2/cmake_modules/FindOpenCL.cmake b/.../protonect/cmake_modules/FindOpenCL.cmake → libfreenect2/cmake_modules/FindOpenCL.cmake
diff --git a/...otonect/cmake_modules/FindTurboJPEG.cmake → ...eenect2/cmake_modules/FindTurboJPEG.cmake b/...otonect/cmake_modules/FindTurboJPEG.cmake → ...eenect2/cmake_modules/FindTurboJPEG.cmake
diff --git a/...ect/cmake_modules/GenerateResources.cmake → ...ct2/cmake_modules/GenerateResources.cmake b/...ect/cmake_modules/GenerateResources.cmake → ...ct2/cmake_modules/GenerateResources.cmake
diff --git a/..._modules/SetupLibfreenect2Threading.cmake → ..._modules/SetupLibfreenect2Threading.cmake b/..._modules/SetupLibfreenect2Threading.cmake → ..._modules/SetupLibfreenect2Threading.cmake
diff --git a/examples/protonect/freenect2.cmake.in → libfreenect2/freenect2.cmake.in b/examples/protonect/freenect2.cmake.in → libfreenect2/freenect2.cmake.in
diff --git a/examples/protonect/freenect2.pc.in → libfreenect2/freenect2.pc.in b/examples/protonect/freenect2.pc.in → libfreenect2/freenect2.pc.in
diff --git a/...ude/libfreenect2/async_packet_processor.h → ...ude/libfreenect2/async_packet_processor.h b/...ude/libfreenect2/async_packet_processor.h → ...ude/libfreenect2/async_packet_processor.h
diff --git a/...rotonect/include/libfreenect2/config.h.in → ...reenect2/include/libfreenect2/config.h.in b/...rotonect/include/libfreenect2/config.h.in → ...reenect2/include/libfreenect2/config.h.in
diff --git a/...nect/include/libfreenect2/data_callback.h → ...ect2/include/libfreenect2/data_callback.h b/...nect/include/libfreenect2/data_callback.h → ...ect2/include/libfreenect2/data_callback.h
diff --git a/...ude/libfreenect2/depth_packet_processor.h → ...ude/libfreenect2/depth_packet_processor.h b/...ude/libfreenect2/depth_packet_processor.h → ...ude/libfreenect2/depth_packet_processor.h
diff --git a/...libfreenect2/depth_packet_stream_parser.h → ...libfreenect2/depth_packet_stream_parser.h b/...libfreenect2/depth_packet_stream_parser.h → ...libfreenect2/depth_packet_stream_parser.h
diff --git a/...nect/include/libfreenect2/double_buffer.h → ...ect2/include/libfreenect2/double_buffer.h b/...nect/include/libfreenect2/double_buffer.h → ...ect2/include/libfreenect2/double_buffer.h
diff --git a/...t/include/libfreenect2/frame_listener.hpp → ...2/include/libfreenect2/frame_listener.hpp b/...t/include/libfreenect2/frame_listener.hpp → ...2/include/libfreenect2/frame_listener.hpp
diff --git a/...nclude/libfreenect2/frame_listener_impl.h → ...nclude/libfreenect2/frame_listener_impl.h b/...nclude/libfreenect2/frame_listener_impl.h → ...nclude/libfreenect2/frame_listener_impl.h
diff --git a/...ect/include/libfreenect2/libfreenect2.hpp → ...ct2/include/libfreenect2/libfreenect2.hpp b/...ect/include/libfreenect2/libfreenect2.hpp → ...ct2/include/libfreenect2/libfreenect2.hpp
diff --git a/...ct/include/libfreenect2/packet_pipeline.h → ...t2/include/libfreenect2/packet_pipeline.h b/...ct/include/libfreenect2/packet_pipeline.h → ...t2/include/libfreenect2/packet_pipeline.h
diff --git a/...t/include/libfreenect2/packet_processor.h → ...2/include/libfreenect2/packet_processor.h b/...t/include/libfreenect2/packet_processor.h → ...2/include/libfreenect2/packet_processor.h
diff --git a/...t/include/libfreenect2/protocol/command.h → ...2/include/libfreenect2/protocol/command.h b/...t/include/libfreenect2/protocol/command.h → ...2/include/libfreenect2/protocol/command.h
diff --git a/...bfreenect2/protocol/command_transaction.h → ...bfreenect2/protocol/command_transaction.h b/...bfreenect2/protocol/command_transaction.h → ...bfreenect2/protocol/command_transaction.h
diff --git a/.../include/libfreenect2/protocol/response.h → .../include/libfreenect2/protocol/response.h b/.../include/libfreenect2/protocol/response.h → .../include/libfreenect2/protocol/response.h
diff --git a/...clude/libfreenect2/protocol/usb_control.h → ...clude/libfreenect2/protocol/usb_control.h b/...clude/libfreenect2/protocol/usb_control.h → ...clude/libfreenect2/protocol/usb_control.h
diff --git a/...onect/include/libfreenect2/registration.h → ...nect2/include/libfreenect2/registration.h b/...onect/include/libfreenect2/registration.h → ...nect2/include/libfreenect2/registration.h
diff --git a/...protonect/include/libfreenect2/resource.h → libfreenect2/include/libfreenect2/resource.h b/...protonect/include/libfreenect2/resource.h → libfreenect2/include/libfreenect2/resource.h
diff --git a/...clude/libfreenect2/rgb_packet_processor.h → ...clude/libfreenect2/rgb_packet_processor.h b/...clude/libfreenect2/rgb_packet_processor.h → ...clude/libfreenect2/rgb_packet_processor.h
diff --git a/...e/libfreenect2/rgb_packet_stream_parser.h → ...e/libfreenect2/rgb_packet_stream_parser.h b/...e/libfreenect2/rgb_packet_stream_parser.h → ...e/libfreenect2/rgb_packet_stream_parser.h
diff --git a/...rotonect/include/libfreenect2/threading.h → ...reenect2/include/libfreenect2/threading.h b/...rotonect/include/libfreenect2/threading.h → ...reenect2/include/libfreenect2/threading.h
diff --git a/...ect/include/libfreenect2/usb/event_loop.h → ...ct2/include/libfreenect2/usb/event_loop.h b/...ect/include/libfreenect2/usb/event_loop.h → ...ct2/include/libfreenect2/usb/event_loop.h
diff --git a/.../include/libfreenect2/usb/transfer_pool.h → .../include/libfreenect2/usb/transfer_pool.h b/.../include/libfreenect2/usb/transfer_pool.h → .../include/libfreenect2/usb/transfer_pool.h
diff --git a/...les/protonect/src/command_transaction.cpp → libfreenect2/src/command_transaction.cpp b/...les/protonect/src/command_transaction.cpp → libfreenect2/src/command_transaction.cpp
diff --git a/...tonect/src/cpu_depth_packet_processor.cpp → ...enect2/src/cpu_depth_packet_processor.cpp b/...tonect/src/cpu_depth_packet_processor.cpp → ...enect2/src/cpu_depth_packet_processor.cpp
diff --git a/.../protonect/src/depth_packet_processor.cpp → libfreenect2/src/depth_packet_processor.cpp b/.../protonect/src/depth_packet_processor.cpp → libfreenect2/src/depth_packet_processor.cpp
diff --git a/...tonect/src/depth_packet_stream_parser.cpp → ...enect2/src/depth_packet_stream_parser.cpp b/...tonect/src/depth_packet_stream_parser.cpp → ...enect2/src/depth_packet_stream_parser.cpp
diff --git a/examples/protonect/src/double_buffer.cpp → libfreenect2/src/double_buffer.cpp b/examples/protonect/src/double_buffer.cpp → libfreenect2/src/double_buffer.cpp
diff --git a/examples/protonect/src/event_loop.cpp → libfreenect2/src/event_loop.cpp b/examples/protonect/src/event_loop.cpp → libfreenect2/src/event_loop.cpp
diff --git a/examples/protonect/src/flextGL.c → libfreenect2/src/flextGL.c b/examples/protonect/src/flextGL.c → libfreenect2/src/flextGL.c
diff --git a/examples/protonect/src/flextGL.h → libfreenect2/src/flextGL.h b/examples/protonect/src/flextGL.h → libfreenect2/src/flextGL.h
diff --git a/...les/protonect/src/frame_listener_impl.cpp → libfreenect2/src/frame_listener_impl.cpp b/...les/protonect/src/frame_listener_impl.cpp → libfreenect2/src/frame_listener_impl.cpp
diff --git a/...ples/protonect/src/generate_resources.cpp → libfreenect2/src/generate_resources.cpp b/...ples/protonect/src/generate_resources.cpp → libfreenect2/src/generate_resources.cpp
diff --git a/examples/protonect/src/libfreenect2.cpp → libfreenect2/src/libfreenect2.cpp b/examples/protonect/src/libfreenect2.cpp → libfreenect2/src/libfreenect2.cpp
diff --git a/...nect/src/opencl_depth_packet_processor.cl → ...ect2/src/opencl_depth_packet_processor.cl b/...nect/src/opencl_depth_packet_processor.cl → ...ect2/src/opencl_depth_packet_processor.cl
diff --git a/...ect/src/opencl_depth_packet_processor.cpp → ...ct2/src/opencl_depth_packet_processor.cpp b/...ect/src/opencl_depth_packet_processor.cpp → ...ct2/src/opencl_depth_packet_processor.cpp
diff --git a/...ect/src/opengl_depth_packet_processor.cpp → ...ct2/src/opengl_depth_packet_processor.cpp b/...ect/src/opengl_depth_packet_processor.cpp → ...ct2/src/opengl_depth_packet_processor.cpp
diff --git a/examples/protonect/src/packet_pipeline.cpp → libfreenect2/src/packet_pipeline.cpp b/examples/protonect/src/packet_pipeline.cpp → libfreenect2/src/packet_pipeline.cpp
diff --git a/examples/protonect/src/registration.cpp → libfreenect2/src/registration.cpp b/examples/protonect/src/registration.cpp → libfreenect2/src/registration.cpp
diff --git a/examples/protonect/src/resource.cpp → libfreenect2/src/resource.cpp b/examples/protonect/src/resource.cpp → libfreenect2/src/resource.cpp
diff --git a/...es/protonect/src/rgb_packet_processor.cpp → libfreenect2/src/rgb_packet_processor.cpp b/...es/protonect/src/rgb_packet_processor.cpp → libfreenect2/src/rgb_packet_processor.cpp
diff --git a/...rotonect/src/rgb_packet_stream_parser.cpp → ...reenect2/src/rgb_packet_stream_parser.cpp b/...rotonect/src/rgb_packet_stream_parser.cpp → ...reenect2/src/rgb_packet_stream_parser.cpp
diff --git a/examples/protonect/src/shader/debug.fs → libfreenect2/src/shader/debug.fs b/examples/protonect/src/shader/debug.fs → libfreenect2/src/shader/debug.fs
diff --git a/examples/protonect/src/shader/default.vs → libfreenect2/src/shader/default.vs b/examples/protonect/src/shader/default.vs → libfreenect2/src/shader/default.vs
diff --git a/examples/protonect/src/shader/filter1.fs → libfreenect2/src/shader/filter1.fs b/examples/protonect/src/shader/filter1.fs → libfreenect2/src/shader/filter1.fs
diff --git a/examples/protonect/src/shader/filter2.fs → libfreenect2/src/shader/filter2.fs b/examples/protonect/src/shader/filter2.fs → libfreenect2/src/shader/filter2.fs
diff --git a/examples/protonect/src/shader/stage1.fs → libfreenect2/src/shader/stage1.fs b/examples/protonect/src/shader/stage1.fs → libfreenect2/src/shader/stage1.fs
diff --git a/examples/protonect/src/shader/stage2.fs → libfreenect2/src/shader/stage2.fs b/examples/protonect/src/shader/stage2.fs → libfreenect2/src/shader/stage2.fs
diff --git a/...rc/test_opengl_depth_packet_processor.cpp → ...rc/test_opengl_depth_packet_processor.cpp b/...rc/test_opengl_depth_packet_processor.cpp → ...rc/test_opengl_depth_packet_processor.cpp
diff --git a/...s/protonect/src/tinythread/tinythread.cpp → libfreenect2/src/tinythread/tinythread.cpp b/...s/protonect/src/tinythread/tinythread.cpp → libfreenect2/src/tinythread/tinythread.cpp
diff --git a/...les/protonect/src/tinythread/tinythread.h → libfreenect2/src/tinythread/tinythread.h b/...les/protonect/src/tinythread/tinythread.h → libfreenect2/src/tinythread/tinythread.h
diff --git a/examples/protonect/src/transfer_pool.cpp → libfreenect2/src/transfer_pool.cpp b/examples/protonect/src/transfer_pool.cpp → libfreenect2/src/transfer_pool.cpp
diff --git a/...t/src/turbo_jpeg_rgb_packet_processor.cpp → ...2/src/turbo_jpeg_rgb_packet_processor.cpp b/...t/src/turbo_jpeg_rgb_packet_processor.cpp → ...2/src/turbo_jpeg_rgb_packet_processor.cpp
diff --git a/examples/protonect/src/usb_control.cpp → libfreenect2/src/usb_control.cpp b/examples/protonect/src/usb_control.cpp → libfreenect2/src/usb_control.cpp
diff --git a/examples/protonect/xTable.bin → libfreenect2/xTable.bin b/examples/protonect/xTable.bin → libfreenect2/xTable.bin
diff --git a/examples/protonect/zTable.bin → libfreenect2/zTable.bin b/examples/protonect/zTable.bin → libfreenect2/zTable.bin