diff --git a/.gitignore b/.gitignore index 4f0c1f8bd..ee1a53ef6 100644 --- 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 b/examples/Protonect.cpp similarity index 100% rename from examples/protonect/Protonect.cpp rename to examples/Protonect.cpp diff --git a/examples/protonect/11to16.bin b/libfreenect2/11to16.bin similarity index 100% rename from examples/protonect/11to16.bin rename to libfreenect2/11to16.bin diff --git a/examples/protonect/CMakeLists.txt b/libfreenect2/CMakeLists.txt similarity index 98% rename from examples/protonect/CMakeLists.txt rename to libfreenect2/CMakeLists.txt index ba93a6715..e96814db4 100644 --- a/examples/protonect/CMakeLists.txt +++ b/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/examples/protonect/cmake_modules/FindGLFW3.cmake b/libfreenect2/cmake_modules/FindGLFW3.cmake similarity index 100% rename from examples/protonect/cmake_modules/FindGLFW3.cmake rename to libfreenect2/cmake_modules/FindGLFW3.cmake diff --git a/examples/protonect/cmake_modules/FindLibUSB.cmake b/libfreenect2/cmake_modules/FindLibUSB.cmake similarity index 100% rename from examples/protonect/cmake_modules/FindLibUSB.cmake rename to libfreenect2/cmake_modules/FindLibUSB.cmake diff --git a/examples/protonect/cmake_modules/FindOpenCL.cmake b/libfreenect2/cmake_modules/FindOpenCL.cmake similarity index 100% rename from examples/protonect/cmake_modules/FindOpenCL.cmake rename to libfreenect2/cmake_modules/FindOpenCL.cmake diff --git a/examples/protonect/cmake_modules/FindTurboJPEG.cmake b/libfreenect2/cmake_modules/FindTurboJPEG.cmake similarity index 100% rename from examples/protonect/cmake_modules/FindTurboJPEG.cmake rename to libfreenect2/cmake_modules/FindTurboJPEG.cmake diff --git a/examples/protonect/cmake_modules/GenerateResources.cmake b/libfreenect2/cmake_modules/GenerateResources.cmake similarity index 100% rename from examples/protonect/cmake_modules/GenerateResources.cmake rename to libfreenect2/cmake_modules/GenerateResources.cmake diff --git a/examples/protonect/cmake_modules/SetupLibfreenect2Threading.cmake b/libfreenect2/cmake_modules/SetupLibfreenect2Threading.cmake similarity index 100% rename from examples/protonect/cmake_modules/SetupLibfreenect2Threading.cmake rename to libfreenect2/cmake_modules/SetupLibfreenect2Threading.cmake diff --git a/examples/protonect/freenect2.cmake.in b/libfreenect2/freenect2.cmake.in similarity index 100% rename from examples/protonect/freenect2.cmake.in rename to libfreenect2/freenect2.cmake.in diff --git a/examples/protonect/freenect2.pc.in b/libfreenect2/freenect2.pc.in similarity index 100% rename from examples/protonect/freenect2.pc.in rename to libfreenect2/freenect2.pc.in diff --git a/examples/protonect/include/libfreenect2/async_packet_processor.h b/libfreenect2/include/libfreenect2/async_packet_processor.h similarity index 100% rename from examples/protonect/include/libfreenect2/async_packet_processor.h rename to libfreenect2/include/libfreenect2/async_packet_processor.h diff --git a/examples/protonect/include/libfreenect2/config.h.in b/libfreenect2/include/libfreenect2/config.h.in similarity index 100% rename from examples/protonect/include/libfreenect2/config.h.in rename to libfreenect2/include/libfreenect2/config.h.in diff --git a/examples/protonect/include/libfreenect2/data_callback.h b/libfreenect2/include/libfreenect2/data_callback.h similarity index 100% rename from examples/protonect/include/libfreenect2/data_callback.h rename to libfreenect2/include/libfreenect2/data_callback.h diff --git a/examples/protonect/include/libfreenect2/depth_packet_processor.h b/libfreenect2/include/libfreenect2/depth_packet_processor.h similarity index 100% rename from examples/protonect/include/libfreenect2/depth_packet_processor.h rename to libfreenect2/include/libfreenect2/depth_packet_processor.h diff --git a/examples/protonect/include/libfreenect2/depth_packet_stream_parser.h b/libfreenect2/include/libfreenect2/depth_packet_stream_parser.h similarity index 100% rename from examples/protonect/include/libfreenect2/depth_packet_stream_parser.h rename to libfreenect2/include/libfreenect2/depth_packet_stream_parser.h diff --git a/examples/protonect/include/libfreenect2/double_buffer.h b/libfreenect2/include/libfreenect2/double_buffer.h similarity index 100% rename from examples/protonect/include/libfreenect2/double_buffer.h rename to libfreenect2/include/libfreenect2/double_buffer.h diff --git a/examples/protonect/include/libfreenect2/frame_listener.hpp b/libfreenect2/include/libfreenect2/frame_listener.hpp similarity index 100% rename from examples/protonect/include/libfreenect2/frame_listener.hpp rename to libfreenect2/include/libfreenect2/frame_listener.hpp diff --git a/examples/protonect/include/libfreenect2/frame_listener_impl.h b/libfreenect2/include/libfreenect2/frame_listener_impl.h similarity index 100% rename from examples/protonect/include/libfreenect2/frame_listener_impl.h rename to libfreenect2/include/libfreenect2/frame_listener_impl.h diff --git a/examples/protonect/include/libfreenect2/libfreenect2.hpp b/libfreenect2/include/libfreenect2/libfreenect2.hpp similarity index 100% rename from examples/protonect/include/libfreenect2/libfreenect2.hpp rename to libfreenect2/include/libfreenect2/libfreenect2.hpp diff --git a/examples/protonect/include/libfreenect2/packet_pipeline.h b/libfreenect2/include/libfreenect2/packet_pipeline.h similarity index 100% rename from examples/protonect/include/libfreenect2/packet_pipeline.h rename to libfreenect2/include/libfreenect2/packet_pipeline.h diff --git a/examples/protonect/include/libfreenect2/packet_processor.h b/libfreenect2/include/libfreenect2/packet_processor.h similarity index 100% rename from examples/protonect/include/libfreenect2/packet_processor.h rename to libfreenect2/include/libfreenect2/packet_processor.h diff --git a/examples/protonect/include/libfreenect2/protocol/command.h b/libfreenect2/include/libfreenect2/protocol/command.h similarity index 100% rename from examples/protonect/include/libfreenect2/protocol/command.h rename to libfreenect2/include/libfreenect2/protocol/command.h diff --git a/examples/protonect/include/libfreenect2/protocol/command_transaction.h b/libfreenect2/include/libfreenect2/protocol/command_transaction.h similarity index 100% rename from examples/protonect/include/libfreenect2/protocol/command_transaction.h rename to libfreenect2/include/libfreenect2/protocol/command_transaction.h diff --git a/examples/protonect/include/libfreenect2/protocol/response.h b/libfreenect2/include/libfreenect2/protocol/response.h similarity index 100% rename from examples/protonect/include/libfreenect2/protocol/response.h rename to libfreenect2/include/libfreenect2/protocol/response.h diff --git a/examples/protonect/include/libfreenect2/protocol/usb_control.h b/libfreenect2/include/libfreenect2/protocol/usb_control.h similarity index 100% rename from examples/protonect/include/libfreenect2/protocol/usb_control.h rename to libfreenect2/include/libfreenect2/protocol/usb_control.h diff --git a/examples/protonect/include/libfreenect2/registration.h b/libfreenect2/include/libfreenect2/registration.h similarity index 100% rename from examples/protonect/include/libfreenect2/registration.h rename to libfreenect2/include/libfreenect2/registration.h diff --git a/examples/protonect/include/libfreenect2/resource.h b/libfreenect2/include/libfreenect2/resource.h similarity index 100% rename from examples/protonect/include/libfreenect2/resource.h rename to libfreenect2/include/libfreenect2/resource.h diff --git a/examples/protonect/include/libfreenect2/rgb_packet_processor.h b/libfreenect2/include/libfreenect2/rgb_packet_processor.h similarity index 100% rename from examples/protonect/include/libfreenect2/rgb_packet_processor.h rename to libfreenect2/include/libfreenect2/rgb_packet_processor.h diff --git a/examples/protonect/include/libfreenect2/rgb_packet_stream_parser.h b/libfreenect2/include/libfreenect2/rgb_packet_stream_parser.h similarity index 100% rename from examples/protonect/include/libfreenect2/rgb_packet_stream_parser.h rename to libfreenect2/include/libfreenect2/rgb_packet_stream_parser.h diff --git a/examples/protonect/include/libfreenect2/threading.h b/libfreenect2/include/libfreenect2/threading.h similarity index 100% rename from examples/protonect/include/libfreenect2/threading.h rename to libfreenect2/include/libfreenect2/threading.h diff --git a/examples/protonect/include/libfreenect2/usb/event_loop.h b/libfreenect2/include/libfreenect2/usb/event_loop.h similarity index 100% rename from examples/protonect/include/libfreenect2/usb/event_loop.h rename to libfreenect2/include/libfreenect2/usb/event_loop.h diff --git a/examples/protonect/include/libfreenect2/usb/transfer_pool.h b/libfreenect2/include/libfreenect2/usb/transfer_pool.h similarity index 100% rename from examples/protonect/include/libfreenect2/usb/transfer_pool.h rename to libfreenect2/include/libfreenect2/usb/transfer_pool.h diff --git a/examples/protonect/src/command_transaction.cpp b/libfreenect2/src/command_transaction.cpp similarity index 100% rename from examples/protonect/src/command_transaction.cpp rename to libfreenect2/src/command_transaction.cpp diff --git a/examples/protonect/src/cpu_depth_packet_processor.cpp b/libfreenect2/src/cpu_depth_packet_processor.cpp similarity index 100% rename from examples/protonect/src/cpu_depth_packet_processor.cpp rename to libfreenect2/src/cpu_depth_packet_processor.cpp diff --git a/examples/protonect/src/depth_packet_processor.cpp b/libfreenect2/src/depth_packet_processor.cpp similarity index 100% rename from examples/protonect/src/depth_packet_processor.cpp rename to libfreenect2/src/depth_packet_processor.cpp diff --git a/examples/protonect/src/depth_packet_stream_parser.cpp b/libfreenect2/src/depth_packet_stream_parser.cpp similarity index 100% rename from examples/protonect/src/depth_packet_stream_parser.cpp rename to libfreenect2/src/depth_packet_stream_parser.cpp diff --git a/examples/protonect/src/double_buffer.cpp b/libfreenect2/src/double_buffer.cpp similarity index 100% rename from examples/protonect/src/double_buffer.cpp rename to libfreenect2/src/double_buffer.cpp diff --git a/examples/protonect/src/event_loop.cpp b/libfreenect2/src/event_loop.cpp similarity index 100% rename from examples/protonect/src/event_loop.cpp rename to libfreenect2/src/event_loop.cpp diff --git a/examples/protonect/src/flextGL.c b/libfreenect2/src/flextGL.c similarity index 100% rename from examples/protonect/src/flextGL.c rename to libfreenect2/src/flextGL.c diff --git a/examples/protonect/src/flextGL.h b/libfreenect2/src/flextGL.h similarity index 100% rename from examples/protonect/src/flextGL.h rename to libfreenect2/src/flextGL.h diff --git a/examples/protonect/src/frame_listener_impl.cpp b/libfreenect2/src/frame_listener_impl.cpp similarity index 100% rename from examples/protonect/src/frame_listener_impl.cpp rename to libfreenect2/src/frame_listener_impl.cpp diff --git a/examples/protonect/src/generate_resources.cpp b/libfreenect2/src/generate_resources.cpp similarity index 100% rename from examples/protonect/src/generate_resources.cpp rename to libfreenect2/src/generate_resources.cpp diff --git a/examples/protonect/src/libfreenect2.cpp b/libfreenect2/src/libfreenect2.cpp similarity index 100% rename from examples/protonect/src/libfreenect2.cpp rename to libfreenect2/src/libfreenect2.cpp diff --git a/examples/protonect/src/opencl_depth_packet_processor.cl b/libfreenect2/src/opencl_depth_packet_processor.cl similarity index 100% rename from examples/protonect/src/opencl_depth_packet_processor.cl rename to libfreenect2/src/opencl_depth_packet_processor.cl diff --git a/examples/protonect/src/opencl_depth_packet_processor.cpp b/libfreenect2/src/opencl_depth_packet_processor.cpp similarity index 100% rename from examples/protonect/src/opencl_depth_packet_processor.cpp rename to libfreenect2/src/opencl_depth_packet_processor.cpp diff --git a/examples/protonect/src/opengl_depth_packet_processor.cpp b/libfreenect2/src/opengl_depth_packet_processor.cpp similarity index 100% rename from examples/protonect/src/opengl_depth_packet_processor.cpp rename to libfreenect2/src/opengl_depth_packet_processor.cpp diff --git a/examples/protonect/src/packet_pipeline.cpp b/libfreenect2/src/packet_pipeline.cpp similarity index 100% rename from examples/protonect/src/packet_pipeline.cpp rename to libfreenect2/src/packet_pipeline.cpp diff --git a/examples/protonect/src/registration.cpp b/libfreenect2/src/registration.cpp similarity index 100% rename from examples/protonect/src/registration.cpp rename to libfreenect2/src/registration.cpp diff --git a/examples/protonect/src/resource.cpp b/libfreenect2/src/resource.cpp similarity index 100% rename from examples/protonect/src/resource.cpp rename to libfreenect2/src/resource.cpp diff --git a/examples/protonect/src/rgb_packet_processor.cpp b/libfreenect2/src/rgb_packet_processor.cpp similarity index 100% rename from examples/protonect/src/rgb_packet_processor.cpp rename to libfreenect2/src/rgb_packet_processor.cpp diff --git a/examples/protonect/src/rgb_packet_stream_parser.cpp b/libfreenect2/src/rgb_packet_stream_parser.cpp similarity index 100% rename from examples/protonect/src/rgb_packet_stream_parser.cpp rename to libfreenect2/src/rgb_packet_stream_parser.cpp diff --git a/examples/protonect/src/shader/debug.fs b/libfreenect2/src/shader/debug.fs similarity index 100% rename from examples/protonect/src/shader/debug.fs rename to libfreenect2/src/shader/debug.fs diff --git a/examples/protonect/src/shader/default.vs b/libfreenect2/src/shader/default.vs similarity index 100% rename from examples/protonect/src/shader/default.vs rename to libfreenect2/src/shader/default.vs diff --git a/examples/protonect/src/shader/filter1.fs b/libfreenect2/src/shader/filter1.fs similarity index 100% rename from examples/protonect/src/shader/filter1.fs rename to libfreenect2/src/shader/filter1.fs diff --git a/examples/protonect/src/shader/filter2.fs b/libfreenect2/src/shader/filter2.fs similarity index 100% rename from examples/protonect/src/shader/filter2.fs rename to libfreenect2/src/shader/filter2.fs diff --git a/examples/protonect/src/shader/stage1.fs b/libfreenect2/src/shader/stage1.fs similarity index 100% rename from examples/protonect/src/shader/stage1.fs rename to libfreenect2/src/shader/stage1.fs diff --git a/examples/protonect/src/shader/stage2.fs b/libfreenect2/src/shader/stage2.fs similarity index 100% rename from examples/protonect/src/shader/stage2.fs rename to libfreenect2/src/shader/stage2.fs diff --git a/examples/protonect/src/test_opengl_depth_packet_processor.cpp b/libfreenect2/src/test_opengl_depth_packet_processor.cpp similarity index 100% rename from examples/protonect/src/test_opengl_depth_packet_processor.cpp rename to libfreenect2/src/test_opengl_depth_packet_processor.cpp diff --git a/examples/protonect/src/tinythread/tinythread.cpp b/libfreenect2/src/tinythread/tinythread.cpp similarity index 100% rename from examples/protonect/src/tinythread/tinythread.cpp rename to libfreenect2/src/tinythread/tinythread.cpp diff --git a/examples/protonect/src/tinythread/tinythread.h b/libfreenect2/src/tinythread/tinythread.h similarity index 100% rename from examples/protonect/src/tinythread/tinythread.h rename to libfreenect2/src/tinythread/tinythread.h diff --git a/examples/protonect/src/transfer_pool.cpp b/libfreenect2/src/transfer_pool.cpp similarity index 100% rename from examples/protonect/src/transfer_pool.cpp rename to libfreenect2/src/transfer_pool.cpp diff --git a/examples/protonect/src/turbo_jpeg_rgb_packet_processor.cpp b/libfreenect2/src/turbo_jpeg_rgb_packet_processor.cpp similarity index 100% rename from examples/protonect/src/turbo_jpeg_rgb_packet_processor.cpp rename to libfreenect2/src/turbo_jpeg_rgb_packet_processor.cpp diff --git a/examples/protonect/src/usb_control.cpp b/libfreenect2/src/usb_control.cpp similarity index 100% rename from examples/protonect/src/usb_control.cpp rename to libfreenect2/src/usb_control.cpp diff --git a/examples/protonect/xTable.bin b/libfreenect2/xTable.bin similarity index 100% rename from examples/protonect/xTable.bin rename to libfreenect2/xTable.bin diff --git a/examples/protonect/zTable.bin b/libfreenect2/zTable.bin similarity index 100% rename from examples/protonect/zTable.bin rename to libfreenect2/zTable.bin