From 215a4aa27bb630246f6c30a161b7d1f4a8dae501 Mon Sep 17 00:00:00 2001 From: Thiemo Wiedemeyer Date: Tue, 6 Jan 2015 16:22:44 +0100 Subject: [PATCH 1/5] modifications for iai_kinect2. --- depends/install_deps.sh | 18 +++++++++--------- examples/protonect/CMakeLists.txt | 12 ++++-------- examples/protonect/freenect2.cmake.in | 4 ++++ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/depends/install_deps.sh b/depends/install_deps.sh index 9650bf597..e0776228c 100755 --- a/depends/install_deps.sh +++ b/depends/install_deps.sh @@ -14,7 +14,7 @@ cd $LIBUSB_SOURCE_DIR git checkout v1.0.19 git apply $DEPENDS_DIR/linux_usbfs_increase_max_iso_buffer_length.patch ./bootstrap.sh -./configure --prefix=$LIBUSB_INSTALL_DIR +./configure --prefix=$LIBUSB_INSTALL_DIR CFLAGS="$CFLAGS -fPIC" make && make install cd $DEPENDS_DIR @@ -36,14 +36,14 @@ make && make install cd $DEPENDS_DIR # glew -GLEW_SOURCE_DIR=$DEPENDS_DIR/glew_src -GLEW_INSTALL_DIR=$DEPENDS_DIR/glew +#GLEW_SOURCE_DIR=$DEPENDS_DIR/glew_src +#GLEW_INSTALL_DIR=$DEPENDS_DIR/glew -rm -rf $GLEW_SOURCE_DIR $GLEW_INSTALL_DIR +#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 +#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 +#cd $DEPENDS_DIR diff --git a/examples/protonect/CMakeLists.txt b/examples/protonect/CMakeLists.txt index cad07829b..3a442cfdf 100644 --- a/examples/protonect/CMakeLists.txt +++ b/examples/protonect/CMakeLists.txt @@ -5,7 +5,7 @@ SET(CMAKE_BUILD_TYPE RelWithDebInfo) SET(MY_DIR ${libfreenect2_SOURCE_DIR}) -OPTION(ENABLE_CXX11 "Enable C++11 support" OFF) +OPTION(ENABLE_CXX11 "Enable C++11 support" ON) OPTION(ENABLE_OPENCL "Enable OpenCL support" ON) IF(ENABLE_CXX11) @@ -49,12 +49,8 @@ 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() +FIND_PACKAGE(GLEW REQUIRED) +INCLUDE_DIRECTORIES(${GLEW_INCLUDE_DIR}) ADD_DEFINITIONS(-DGLEW_MX -DGLEW_STATIC) # GLFW @@ -99,7 +95,7 @@ SET(SOURCES ) SET(LIBRARIES - usb-1.0 + usb-1.0.a ${OpenCV_LIBS} turbojpeg ${LIBFREENECT2_THREADING_LIBRARIES} diff --git a/examples/protonect/freenect2.cmake.in b/examples/protonect/freenect2.cmake.in index 1f0a07913..ea9b7b8bf 100644 --- a/examples/protonect/freenect2.cmake.in +++ b/examples/protonect/freenect2.cmake.in @@ -15,3 +15,7 @@ ELSE("@LIBFREENECT2_THREADING_STDLIB@") SET(freenect2_INCLUDE_DIRS ${freenect2_INCLUDE_DIR} ${freenect2_INCLUDE_DIR}/tinythread) SET(freenect2_DEFINITIONS "-DLIBFREENECT2_THREADING_TINYTHREAD") ENDIF("@LIBFREENECT2_THREADING_STDLIB@") + +IF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@") + SET(freenect2_DEFINITIONS "${freenect2_DEFINITIONS} -DWITH_OPENCL_SUPPORT") +ENDIF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@") From 3c0cda4ffb6bea47a883439c1a1fa631eb6ab205 Mon Sep 17 00:00:00 2001 From: Thiemo Wiedemeyer Date: Tue, 13 Jan 2015 09:17:41 +0100 Subject: [PATCH 2/5] removed obsolete modification --- examples/protonect/freenect2.cmake.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/protonect/freenect2.cmake.in b/examples/protonect/freenect2.cmake.in index ea9b7b8bf..1f0a07913 100644 --- a/examples/protonect/freenect2.cmake.in +++ b/examples/protonect/freenect2.cmake.in @@ -15,7 +15,3 @@ ELSE("@LIBFREENECT2_THREADING_STDLIB@") SET(freenect2_INCLUDE_DIRS ${freenect2_INCLUDE_DIR} ${freenect2_INCLUDE_DIR}/tinythread) SET(freenect2_DEFINITIONS "-DLIBFREENECT2_THREADING_TINYTHREAD") ENDIF("@LIBFREENECT2_THREADING_STDLIB@") - -IF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@") - SET(freenect2_DEFINITIONS "${freenect2_DEFINITIONS} -DWITH_OPENCL_SUPPORT") -ENDIF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@") From 8b51cd2296cc47f3afb102e13db6ddcf0caa4301 Mon Sep 17 00:00:00 2001 From: Matteo Munaro Date: Wed, 28 Jan 2015 22:49:55 +0100 Subject: [PATCH 3/5] Modified max depth limit from 4.5 to 10 meters. --- examples/protonect/src/depth_packet_processor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/protonect/src/depth_packet_processor.cpp b/examples/protonect/src/depth_packet_processor.cpp index b37e0059e..4f9369805 100644 --- a/examples/protonect/src/depth_packet_processor.cpp +++ b/examples/protonect/src/depth_packet_processor.cpp @@ -83,7 +83,7 @@ DepthPacketProcessor::Parameters::Parameters() max_edge_count = 5.0f; min_depth = 500.0f; - max_depth = 4500.0f; + max_depth = 10000.0f; } DepthPacketProcessor::DepthPacketProcessor() : From 5d2aee7e8737d35fcb9e65a26ef350248855b1af Mon Sep 17 00:00:00 2001 From: Thiemo Wiedemeyer Date: Tue, 6 Jan 2015 16:22:44 +0100 Subject: [PATCH 4/5] modifications for iai_kinect2. --- depends/install_deps.sh | 18 +++++++++--------- examples/protonect/CMakeLists.txt | 12 ++++-------- examples/protonect/freenect2.cmake.in | 4 ++++ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/depends/install_deps.sh b/depends/install_deps.sh index 9650bf597..e0776228c 100755 --- a/depends/install_deps.sh +++ b/depends/install_deps.sh @@ -14,7 +14,7 @@ cd $LIBUSB_SOURCE_DIR git checkout v1.0.19 git apply $DEPENDS_DIR/linux_usbfs_increase_max_iso_buffer_length.patch ./bootstrap.sh -./configure --prefix=$LIBUSB_INSTALL_DIR +./configure --prefix=$LIBUSB_INSTALL_DIR CFLAGS="$CFLAGS -fPIC" make && make install cd $DEPENDS_DIR @@ -36,14 +36,14 @@ make && make install cd $DEPENDS_DIR # glew -GLEW_SOURCE_DIR=$DEPENDS_DIR/glew_src -GLEW_INSTALL_DIR=$DEPENDS_DIR/glew +#GLEW_SOURCE_DIR=$DEPENDS_DIR/glew_src +#GLEW_INSTALL_DIR=$DEPENDS_DIR/glew -rm -rf $GLEW_SOURCE_DIR $GLEW_INSTALL_DIR +#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 +#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 +#cd $DEPENDS_DIR diff --git a/examples/protonect/CMakeLists.txt b/examples/protonect/CMakeLists.txt index cad07829b..3a442cfdf 100644 --- a/examples/protonect/CMakeLists.txt +++ b/examples/protonect/CMakeLists.txt @@ -5,7 +5,7 @@ SET(CMAKE_BUILD_TYPE RelWithDebInfo) SET(MY_DIR ${libfreenect2_SOURCE_DIR}) -OPTION(ENABLE_CXX11 "Enable C++11 support" OFF) +OPTION(ENABLE_CXX11 "Enable C++11 support" ON) OPTION(ENABLE_OPENCL "Enable OpenCL support" ON) IF(ENABLE_CXX11) @@ -49,12 +49,8 @@ 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() +FIND_PACKAGE(GLEW REQUIRED) +INCLUDE_DIRECTORIES(${GLEW_INCLUDE_DIR}) ADD_DEFINITIONS(-DGLEW_MX -DGLEW_STATIC) # GLFW @@ -99,7 +95,7 @@ SET(SOURCES ) SET(LIBRARIES - usb-1.0 + usb-1.0.a ${OpenCV_LIBS} turbojpeg ${LIBFREENECT2_THREADING_LIBRARIES} diff --git a/examples/protonect/freenect2.cmake.in b/examples/protonect/freenect2.cmake.in index 1f0a07913..ea9b7b8bf 100644 --- a/examples/protonect/freenect2.cmake.in +++ b/examples/protonect/freenect2.cmake.in @@ -15,3 +15,7 @@ ELSE("@LIBFREENECT2_THREADING_STDLIB@") SET(freenect2_INCLUDE_DIRS ${freenect2_INCLUDE_DIR} ${freenect2_INCLUDE_DIR}/tinythread) SET(freenect2_DEFINITIONS "-DLIBFREENECT2_THREADING_TINYTHREAD") ENDIF("@LIBFREENECT2_THREADING_STDLIB@") + +IF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@") + SET(freenect2_DEFINITIONS "${freenect2_DEFINITIONS} -DWITH_OPENCL_SUPPORT") +ENDIF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@") From 51e13dba92c08ce88d342555f1a746d75a9c613d Mon Sep 17 00:00:00 2001 From: Thiemo Wiedemeyer Date: Tue, 13 Jan 2015 09:17:41 +0100 Subject: [PATCH 5/5] removed obsolete modification --- examples/protonect/freenect2.cmake.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/protonect/freenect2.cmake.in b/examples/protonect/freenect2.cmake.in index ea9b7b8bf..1f0a07913 100644 --- a/examples/protonect/freenect2.cmake.in +++ b/examples/protonect/freenect2.cmake.in @@ -15,7 +15,3 @@ ELSE("@LIBFREENECT2_THREADING_STDLIB@") SET(freenect2_INCLUDE_DIRS ${freenect2_INCLUDE_DIR} ${freenect2_INCLUDE_DIR}/tinythread) SET(freenect2_DEFINITIONS "-DLIBFREENECT2_THREADING_TINYTHREAD") ENDIF("@LIBFREENECT2_THREADING_STDLIB@") - -IF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@") - SET(freenect2_DEFINITIONS "${freenect2_DEFINITIONS} -DWITH_OPENCL_SUPPORT") -ENDIF("@ENABLE_OPENCL@" AND "@OPENCL_FOUND@")