From 60be01e945ec2966881c9d772fccf3d1df47264e Mon Sep 17 00:00:00 2001 From: Pinak Ahuja Date: Tue, 29 Sep 2020 11:43:14 +0200 Subject: [PATCH 1/4] Add missing include --- .../sample_helper_includes/BodyTrackingHelpers.h | 1 + 1 file changed, 1 insertion(+) diff --git a/body-tracking-samples/sample_helper_includes/BodyTrackingHelpers.h b/body-tracking-samples/sample_helper_includes/BodyTrackingHelpers.h index f7b1dfbc..996b88c0 100644 --- a/body-tracking-samples/sample_helper_includes/BodyTrackingHelpers.h +++ b/body-tracking-samples/sample_helper_includes/BodyTrackingHelpers.h @@ -6,6 +6,7 @@ #include #include #include +#include // Define the bone list based on the documentation const std::array, 31> g_boneList = From 238ffd947bc10fcad03b94ab644d34eb3e87b31b Mon Sep 17 00:00:00 2001 From: Pinak Ahuja Date: Tue, 29 Sep 2020 11:43:45 +0200 Subject: [PATCH 2/4] Find and link to recording libs in simple_3d_viewer --- body-tracking-samples/simple_3d_viewer/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/body-tracking-samples/simple_3d_viewer/CMakeLists.txt b/body-tracking-samples/simple_3d_viewer/CMakeLists.txt index 18b21c2f..89bd7e49 100644 --- a/body-tracking-samples/simple_3d_viewer/CMakeLists.txt +++ b/body-tracking-samples/simple_3d_viewer/CMakeLists.txt @@ -1,6 +1,9 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. +find_package(k4arecord REQUIRED) + + add_executable(simple_3d_viewer main.cpp) target_include_directories(simple_3d_viewer PRIVATE ../sample_helper_includes) @@ -9,6 +12,7 @@ target_include_directories(simple_3d_viewer PRIVATE ../sample_helper_includes) target_link_libraries(simple_3d_viewer PRIVATE k4a k4abt + k4arecord window_controller_3d::window_controller_3d glfw::glfw ) From 7d2261cd4a0c3694973b668d62bbd458d3b5737a Mon Sep 17 00:00:00 2001 From: Pinak Ahuja Date: Tue, 29 Sep 2020 11:53:54 +0200 Subject: [PATCH 3/4] Make glfw public depedency as it is used in public headers --- .../sample_helper_libs/window_controller_3d/CMakeLists.txt | 2 +- body-tracking-samples/simple_3d_viewer/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/body-tracking-samples/sample_helper_libs/window_controller_3d/CMakeLists.txt b/body-tracking-samples/sample_helper_libs/window_controller_3d/CMakeLists.txt index 6b3b50b8..d4f2a56e 100644 --- a/body-tracking-samples/sample_helper_libs/window_controller_3d/CMakeLists.txt +++ b/body-tracking-samples/sample_helper_libs/window_controller_3d/CMakeLists.txt @@ -21,7 +21,7 @@ target_include_directories(window_controller_3d PRIVATE ../../sample_helper_incl target_include_directories(window_controller_3d PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) # Dependencies of this library -target_link_libraries(window_controller_3d PRIVATE +target_link_libraries(window_controller_3d PUBLIC glfw::glfw ) diff --git a/body-tracking-samples/simple_3d_viewer/CMakeLists.txt b/body-tracking-samples/simple_3d_viewer/CMakeLists.txt index 89bd7e49..ac578e8c 100644 --- a/body-tracking-samples/simple_3d_viewer/CMakeLists.txt +++ b/body-tracking-samples/simple_3d_viewer/CMakeLists.txt @@ -14,6 +14,5 @@ target_link_libraries(simple_3d_viewer PRIVATE k4abt k4arecord window_controller_3d::window_controller_3d - glfw::glfw ) From 4ca0c3cacb81214133c62a1115ed23c5e14e15c5 Mon Sep 17 00:00:00 2001 From: Pinak Ahuja Date: Tue, 29 Sep 2020 11:54:37 +0200 Subject: [PATCH 4/4] Add CMakeLists.txt for floor detector sample --- body-tracking-samples/CMakeLists.txt | 1 + .../floor_detector_sample/CMakeLists.txt | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 body-tracking-samples/floor_detector_sample/CMakeLists.txt diff --git a/body-tracking-samples/CMakeLists.txt b/body-tracking-samples/CMakeLists.txt index 2992139a..aeb642de 100644 --- a/body-tracking-samples/CMakeLists.txt +++ b/body-tracking-samples/CMakeLists.txt @@ -5,3 +5,4 @@ add_subdirectory(extern) add_subdirectory(simple_3d_viewer) add_subdirectory(simple_sample) add_subdirectory(sample_helper_libs) +add_subdirectory(floor_detector_sample) diff --git a/body-tracking-samples/floor_detector_sample/CMakeLists.txt b/body-tracking-samples/floor_detector_sample/CMakeLists.txt new file mode 100644 index 00000000..e2375a78 --- /dev/null +++ b/body-tracking-samples/floor_detector_sample/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. + + +add_executable(floor_detector_sample + main.cpp + FloorDetector.cpp + PointCloudGenerator.cpp) + +target_include_directories(floor_detector_sample PRIVATE ../sample_helper_includes) + +# Dependencies of this library +target_link_libraries(floor_detector_sample PRIVATE + k4a + window_controller_3d::window_controller_3d + ) +