Merge pull request stereolabs#556 from stereolabs/update-from-4.0.2

update from 4.0.2
D300 · Apr 25, 2023 · ab81f3b · ab81f3b
2 parents 2e0bb8c + fc7e432
commit ab81f3b
Show file tree

Hide file tree

Showing 88 changed files with 1,562 additions and 865 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,23 +13,24 @@ endif()
 SET(CMAKE_BUILD_TYPE "Release")
 
 SET(SAMPLE_LIST "")
-add_subdirectory("body tracking/overview/${TYPE}")
+add_subdirectory("body tracking/body tracking/${TYPE}")
 add_subdirectory("body tracking/export/fbx export/${TYPE}")
-add_subdirectory("body tracking/fusion/${TYPE}")
+add_subdirectory("body tracking/multi-camera/${TYPE}")
 add_subdirectory("camera control/${TYPE}")
 add_subdirectory("camera streaming/receiver/${TYPE}")
 add_subdirectory("camera streaming/sender/${TYPE}")	
-add_subdirectory("depth sensing/overview/${TYPE}")
+add_subdirectory("depth sensing/depth sensing/${TYPE}")
 add_subdirectory("depth sensing/multi camera/${TYPE}")
 add_subdirectory("depth sensing/image refocus/${TYPE}")
 add_subdirectory("depth sensing/region of interest/${TYPE}")
+add_subdirectory("geotracking/live geotracking/${TYPE}")
 add_subdirectory("object detection/image viewer/${TYPE}")
 add_subdirectory("object detection/birds eye viewer/${TYPE}")
-add_subdirectory("object detection/multi instance/cpp")
-add_subdirectory("plane detection/overview/${TYPE}")
+add_subdirectory("object detection/concurrent detections/cpp")
+add_subdirectory("plane detection/plane detection/${TYPE}")
 add_subdirectory("plane detection/floor plane/${TYPE}")
-add_subdirectory("positional tracking/overview/${TYPE}")
-add_subdirectory("spatial mapping/overview/${TYPE}")
+add_subdirectory("positional tracking/positional tracking/${TYPE}")
+add_subdirectory("spatial mapping/spatial mapping/${TYPE}")
 add_subdirectory("spatial mapping/advanced point cloud mapping/${TYPE}")
 add_subdirectory("recording/export/sensors/${TYPE}")
 add_subdirectory("recording/export/svo/${TYPE}")

diff --git a/body tracking/body tracking/cpp/src/main.cpp b/body tracking/body tracking/cpp/src/main.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2022, STEREOLABS.
+// Copyright (c) 2023, STEREOLABS.
 //
 // All rights reserved.
 //

diff --git a/body tracking/body tracking/csharp/MainWindow.cs b/body tracking/body tracking/csharp/MainWindow.cs
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2022, STEREOLABS.
+// Copyright (c) 2023, STEREOLABS.
 //
 // All rights reserved.
 //

diff --git a/body tracking/export/JSON export/cpp/CMakeLists.txt b/body tracking/export/JSON export/cpp/CMakeLists.txt
@@ -1,53 +1,35 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
-PROJECT(ZED_FusionSkeleton)
+PROJECT(ZED_Bodies_JSON_Export)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_BUILD_TYPE "Release")
 
 option(LINK_SHARED_ZED "Link with the ZED SDK shared executable" ON)
-option(ENABLE_GUI "Enable OpenGL/ OpenCV display" ON)
 
 if (NOT LINK_SHARED_ZED AND MSVC)
     message(FATAL_ERROR "LINK_SHARED_ZED OFF : ZED SDK static libraries not available on Windows")
 endif()
 
 find_package(ZED 4 REQUIRED)
 find_package(CUDA REQUIRED)
-if (ENABLE_GUI)
-    add_definitions(-DENABLE_GUI)
-    find_package(GLUT REQUIRED)
-    find_package(GLEW REQUIRED)
-    SET(OpenGL_GL_PREFERENCE GLVND)
-    find_package(OpenGL REQUIRED)
-	find_package(OpenCV REQUIRED)
-endif()
+find_package(GLUT REQUIRED)
+find_package(GLEW REQUIRED)
+SET(OpenGL_GL_PREFERENCE GLVND)
+find_package(OpenGL REQUIRED)
 
 include_directories(${CUDA_INCLUDE_DIRS})
 include_directories(${ZED_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${OpenCV_INCLUDE_DIRS})
+include_directories(${GLUT_INCLUDE_DIR})
+include_directories(${GLEW_INCLUDE_DIRS})
+
 
 link_directories(${ZED_LIBRARY_DIR})
 link_directories(${CUDA_LIBRARY_DIRS})
-link_directories(${OpenCV_LIBRARY_DIRS})
-
-IF(NOT WIN32)
-    SET(SPECIAL_OS_LIBS "pthread")
-ENDIF()
-
-if (ENABLE_GUI)
-    include_directories(${GLEW_INCLUDE_DIRS})
-    include_directories(${GLUT_INCLUDE_DIR})
-	include_directories(${OpenCV_INCLUDE_DIRS})
-
-    link_directories(${GLEW_LIBRARY_DIRS})
-    link_directories(${GLUT_LIBRARY_DIRS})
-    link_directories(${OpenGL_LIBRARY_DIRS})
-	link_directories(${OpenCV_LIBRARY_DIRS})
-
-    SET(GUI_LIB ${OPENGL_LIBRARIES} ${OpenCV_LIBRARIES} ${GLUT_glut_LIBRARY} ${GLEW_LIBRARIES})
-endif()
+link_directories(${GLEW_LIBRARY_DIRS})
+link_directories(${GLUT_LIBRARY_DIRS})
+link_directories(${OpenGL_LIBRARY_DIRS})
 
 FILE(GLOB_RECURSE SRC_FILES src/*.c*)
 FILE(GLOB_RECURSE HDR_FILES include/*.h*)
@@ -60,7 +42,7 @@ else()
     SET(ZED_LIBS ${ZED_STATIC_LIBRARIES} ${CUDA_CUDA_LIBRARY} ${CUDA_LIBRARY})
 endif()
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ZED_LIBS} ${UTILS_LIB} ${SPECIAL_OS_LIBS} ${GUI_LIB} ${OpenCV_LIBRARIES})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ZED_LIBS} ${OPENGL_LIBRARIES} ${GLUT_glut_LIBRARY} ${GLEW_LIBRARIES})
 
 if(INSTALL_SAMPLES)
     LIST(APPEND SAMPLE_LIST ${PROJECT_NAME})