diff --git a/CHANGELOG.md b/CHANGELOG.md index 521bc08..e6dd148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# Release v0.38.0 + +**Release Date**: 8 Jan 2025 +**Nuitrack Runtime version**: 0.38.0 +**Nuitrack SDK version**: 1.14.0 + +## Bug Fixes and Improvements +* Depth sensing - numerous fixes, in particular for Azure Kinect, Orbbec Astra (multiple revisions) +* Scene segmentation and user tracking - improved robustness, additional options for floor detection / scene segmentation + +## Known Issues +* Nuitrack.exe works unstable when depth map rotation is set (examples and other applications are not impacted) + # Release v0.37.24 **Release Date**: 1 Jul 2024 diff --git a/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackManager.jar b/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackManager.jar index f6d5064..317f06b 100644 Binary files a/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackManager.jar and b/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackManager.jar differ diff --git a/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackWrapper.jar b/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackWrapper.jar index 2dce066..573919a 100644 Binary files a/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackWrapper.jar and b/Examples/nuitrack_android_studio_gl_sample/app/libs/NuitrackWrapper.jar differ diff --git a/Examples/nuitrack_android_studio_gl_sample/app/libs/obsensor_native.jar b/Examples/nuitrack_android_studio_gl_sample/app/libs/obsensor_native.jar index 70705fc..6f7d038 100644 Binary files a/Examples/nuitrack_android_studio_gl_sample/app/libs/obsensor_native.jar and b/Examples/nuitrack_android_studio_gl_sample/app/libs/obsensor_native.jar differ diff --git a/Examples/nuitrack_csharp_device_api_sample/cmake/FindMono.cmake b/Examples/nuitrack_csharp_device_api_sample/cmake/FindMono.cmake index 12fc246..2e7a657 100644 --- a/Examples/nuitrack_csharp_device_api_sample/cmake/FindMono.cmake +++ b/Examples/nuitrack_csharp_device_api_sample/cmake/FindMono.cmake @@ -32,7 +32,7 @@ if( DEFINED CSHARP_MONO_FOUND ) endif( DEFINED CSHARP_MONO_FOUND ) unset( CSHARP_MONO_VERSIONS CACHE ) # Clear versions -if( WIN32 AND NOT CMAKE_CROSSCOMPILING) +if (WIN32 AND NOT CMAKE_CROSSCOMPILING) # Search for Mono on Win32 systems # See http://mono-project.com/OldReleases and http://www.go-mono.com/mono-downloads/download.html set( csharp_mono_bin_dirs ) @@ -103,7 +103,7 @@ if( WIN32 AND NOT CMAKE_CROSSCOMPILING) set( CSHARP_MONO_FOUND 1 CACHE INTERNAL "Boolean indicating if C# Mono was found" ) endforeach( csharp_mono_bin_dir ) -else( UNIX OR CMAKE_CROSSCOMPILING ) +else() # Search for Mono on non-Win32 systems set( chsarp_mono_names "mcs" "mcs.exe" "dmcs" "dmcs.exe" "smcs" "smcs.exe" "gmcs" "gmcs.exe" ) set( @@ -150,7 +150,7 @@ else( UNIX OR CMAKE_CROSSCOMPILING ) # Remove temp variable from cache unset( csharp_mono_compiler CACHE ) -endif( WIN32 ) +endif() if( CSHARP_MONO_FOUND ) # Report the found versions diff --git a/Examples/nuitrack_csharp_device_api_sample/nuitrack.net.dll b/Examples/nuitrack_csharp_device_api_sample/nuitrack.net.dll index fb03269..580d8a9 100755 Binary files a/Examples/nuitrack_csharp_device_api_sample/nuitrack.net.dll and b/Examples/nuitrack_csharp_device_api_sample/nuitrack.net.dll differ diff --git a/Examples/nuitrack_csharp_sample/cmake/FindMono.cmake b/Examples/nuitrack_csharp_sample/cmake/FindMono.cmake index 12fc246..2e7a657 100644 --- a/Examples/nuitrack_csharp_sample/cmake/FindMono.cmake +++ b/Examples/nuitrack_csharp_sample/cmake/FindMono.cmake @@ -32,7 +32,7 @@ if( DEFINED CSHARP_MONO_FOUND ) endif( DEFINED CSHARP_MONO_FOUND ) unset( CSHARP_MONO_VERSIONS CACHE ) # Clear versions -if( WIN32 AND NOT CMAKE_CROSSCOMPILING) +if (WIN32 AND NOT CMAKE_CROSSCOMPILING) # Search for Mono on Win32 systems # See http://mono-project.com/OldReleases and http://www.go-mono.com/mono-downloads/download.html set( csharp_mono_bin_dirs ) @@ -103,7 +103,7 @@ if( WIN32 AND NOT CMAKE_CROSSCOMPILING) set( CSHARP_MONO_FOUND 1 CACHE INTERNAL "Boolean indicating if C# Mono was found" ) endforeach( csharp_mono_bin_dir ) -else( UNIX OR CMAKE_CROSSCOMPILING ) +else() # Search for Mono on non-Win32 systems set( chsarp_mono_names "mcs" "mcs.exe" "dmcs" "dmcs.exe" "smcs" "smcs.exe" "gmcs" "gmcs.exe" ) set( @@ -150,7 +150,7 @@ else( UNIX OR CMAKE_CROSSCOMPILING ) # Remove temp variable from cache unset( csharp_mono_compiler CACHE ) -endif( WIN32 ) +endif() if( CSHARP_MONO_FOUND ) # Report the found versions diff --git a/Examples/nuitrack_csharp_sample/nuitrack.net.dll b/Examples/nuitrack_csharp_sample/nuitrack.net.dll index fb03269..580d8a9 100755 Binary files a/Examples/nuitrack_csharp_sample/nuitrack.net.dll and b/Examples/nuitrack_csharp_sample/nuitrack.net.dll differ diff --git a/Examples/nuitrack_gl_sample/android/libs/NuitrackManager.jar b/Examples/nuitrack_gl_sample/android/libs/NuitrackManager.jar index f6d5064..317f06b 100644 Binary files a/Examples/nuitrack_gl_sample/android/libs/NuitrackManager.jar and b/Examples/nuitrack_gl_sample/android/libs/NuitrackManager.jar differ diff --git a/Examples/nuitrack_gl_sample/android/libs/NuitrackWrapper.jar b/Examples/nuitrack_gl_sample/android/libs/NuitrackWrapper.jar index 2dce066..573919a 100644 Binary files a/Examples/nuitrack_gl_sample/android/libs/NuitrackWrapper.jar and b/Examples/nuitrack_gl_sample/android/libs/NuitrackWrapper.jar differ diff --git a/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackManager.jar b/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackManager.jar index f6d5064..317f06b 100644 Binary files a/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackManager.jar and b/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackManager.jar differ diff --git a/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackWrapper.jar b/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackWrapper.jar index 2dce066..573919a 100644 Binary files a/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackWrapper.jar and b/Examples/nuitrack_ni_gl_sample/android/libs/NuitrackWrapper.jar differ diff --git a/Nuitrack/include/nuitrack/utils/ExceptionTranslator.h b/Nuitrack/include/nuitrack/utils/ExceptionTranslator.h index e01f34f..d92f15e 100644 --- a/Nuitrack/include/nuitrack/utils/ExceptionTranslator.h +++ b/Nuitrack/include/nuitrack/utils/ExceptionTranslator.h @@ -19,28 +19,30 @@ class ExceptionTranslator #ifndef NUITRACK_NO_EXCEPTIONS switch(errorCode) { - case EXCEPTION: - throw tdv::nuitrack::Exception(); - case TERMINATE_EXCEPTION: - throw tdv::nuitrack::TerminateException(); - case BAD_CONFIG_VALUE_EXCEPTION: - throw tdv::nuitrack::BadConfigValueException(); - case CONFIG_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ConfigNotFoundException(); - case MODUDLE_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ModuleNotFoundException(); - case LICENSE_NOT_ACQUIRED_EXCEPTION: - throw tdv::nuitrack::LicenseNotAcquiredException(); - case MODULE_NOT_INITIALIZED_EXCEPTION: - throw tdv::nuitrack::ModuleNotInitializedException(); - case MODULE_NOT_STARTED_EXCEPTION: - throw tdv::nuitrack::ModuleNotStartedException(); - case NETWORK_EXCEPTION: - throw tdv::nuitrack::NetworkException(); - case NETWORK_UNAVAILABLE_EXCEPTION: - throw tdv::nuitrack::NetworkUnavailableException(); - case SENSOR_DISCONNECTED_EXCEPTION: - throw tdv::nuitrack::SensorDisconnectedException(); + case EXCEPTION: + throw tdv::nuitrack::Exception(); + case TERMINATE_EXCEPTION: + throw tdv::nuitrack::TerminateException(); + case BAD_CONFIG_VALUE_EXCEPTION: + throw tdv::nuitrack::BadConfigValueException(); + case CONFIG_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ConfigNotFoundException(); + case MODUDLE_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ModuleNotFoundException(); + case LICENSE_NOT_ACQUIRED_EXCEPTION: + throw tdv::nuitrack::LicenseNotAcquiredException(); + case MODULE_NOT_INITIALIZED_EXCEPTION: + throw tdv::nuitrack::ModuleNotInitializedException(); + case MODULE_NOT_STARTED_EXCEPTION: + throw tdv::nuitrack::ModuleNotStartedException(); + case NETWORK_EXCEPTION: + throw tdv::nuitrack::NetworkException(); + case NETWORK_UNAVAILABLE_EXCEPTION: + throw tdv::nuitrack::NetworkUnavailableException(); + case SENSOR_DISCONNECTED_EXCEPTION: + throw tdv::nuitrack::SensorDisconnectedException(); + case OK: + break; } #else if (errorCode != ExceptionType::OK) @@ -54,28 +56,30 @@ class ExceptionTranslator std::string message = (errorMessage == NULL ? "" : errorMessage); switch(errorCode) { - case EXCEPTION: - throw tdv::nuitrack::Exception("NuitrackException: " + message); - case TERMINATE_EXCEPTION: - throw tdv::nuitrack::TerminateException("NuitrackException (TerminateException): " + message); - case BAD_CONFIG_VALUE_EXCEPTION: - throw tdv::nuitrack::BadConfigValueException("NuitrackException (BadConfigValueException): " + message); - case CONFIG_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ConfigNotFoundException("NuitrackException (ConfigNotFoundException): " + message); - case MODUDLE_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ModuleNotFoundException("NuitrackException (ModuleNotFoundException): " + message); - case LICENSE_NOT_ACQUIRED_EXCEPTION: - throw tdv::nuitrack::LicenseNotAcquiredException("NuitrackException (LicenseNotAcquiredException): " + message); - case MODULE_NOT_INITIALIZED_EXCEPTION: - throw tdv::nuitrack::ModuleNotInitializedException("NuitrackException (ModuleNotInitializedException): " + message); - case MODULE_NOT_STARTED_EXCEPTION: - throw tdv::nuitrack::ModuleNotStartedException("NuitrackException (ModuleNotStartedException): " + message); - case NETWORK_EXCEPTION: - throw tdv::nuitrack::NetworkException("NuitrackException (NetworkException): " + message); - case NETWORK_UNAVAILABLE_EXCEPTION: - throw tdv::nuitrack::NetworkUnavailableException("NuitrackException (NetworkUnavailableException): " + message); - case SENSOR_DISCONNECTED_EXCEPTION: - throw tdv::nuitrack::SensorDisconnectedException("NuitrackException (SensorDisconnectedException): " + message); + case EXCEPTION: + throw tdv::nuitrack::Exception("NuitrackException: " + message); + case TERMINATE_EXCEPTION: + throw tdv::nuitrack::TerminateException("NuitrackException (TerminateException): " + message); + case BAD_CONFIG_VALUE_EXCEPTION: + throw tdv::nuitrack::BadConfigValueException("NuitrackException (BadConfigValueException): " + message); + case CONFIG_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ConfigNotFoundException("NuitrackException (ConfigNotFoundException): " + message); + case MODUDLE_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ModuleNotFoundException("NuitrackException (ModuleNotFoundException): " + message); + case LICENSE_NOT_ACQUIRED_EXCEPTION: + throw tdv::nuitrack::LicenseNotAcquiredException("NuitrackException (LicenseNotAcquiredException): " + message); + case MODULE_NOT_INITIALIZED_EXCEPTION: + throw tdv::nuitrack::ModuleNotInitializedException("NuitrackException (ModuleNotInitializedException): " + message); + case MODULE_NOT_STARTED_EXCEPTION: + throw tdv::nuitrack::ModuleNotStartedException("NuitrackException (ModuleNotStartedException): " + message); + case NETWORK_EXCEPTION: + throw tdv::nuitrack::NetworkException("NuitrackException (NetworkException): " + message); + case NETWORK_UNAVAILABLE_EXCEPTION: + throw tdv::nuitrack::NetworkUnavailableException("NuitrackException (NetworkUnavailableException): " + message); + case SENSOR_DISCONNECTED_EXCEPTION: + throw tdv::nuitrack::SensorDisconnectedException("NuitrackException (SensorDisconnectedException): " + message); + case OK: + break; } #else if (errorCode != ExceptionType::OK) diff --git a/Nuitrack/lib/android-arm64/NuitrackManager.jar b/Nuitrack/lib/android-arm64/NuitrackManager.jar index f6d5064..317f06b 100644 Binary files a/Nuitrack/lib/android-arm64/NuitrackManager.jar and b/Nuitrack/lib/android-arm64/NuitrackManager.jar differ diff --git a/Nuitrack/lib/android-arm64/NuitrackWrapper.jar b/Nuitrack/lib/android-arm64/NuitrackWrapper.jar index 2dce066..573919a 100644 Binary files a/Nuitrack/lib/android-arm64/NuitrackWrapper.jar and b/Nuitrack/lib/android-arm64/NuitrackWrapper.jar differ diff --git a/Nuitrack/lib/android-arm64/libOpenNI.so b/Nuitrack/lib/android-arm64/libOpenNI.so index 6384af0..d97e82b 100644 Binary files a/Nuitrack/lib/android-arm64/libOpenNI.so and b/Nuitrack/lib/android-arm64/libOpenNI.so differ diff --git a/Nuitrack/lib/android-arm64/libmiddleware.so b/Nuitrack/lib/android-arm64/libmiddleware.so index 59c6154..6a1b7ed 100755 Binary files a/Nuitrack/lib/android-arm64/libmiddleware.so and b/Nuitrack/lib/android-arm64/libmiddleware.so differ diff --git a/Nuitrack/lib/android-arm64/libnuitrack.so b/Nuitrack/lib/android-arm64/libnuitrack.so index 9a5f47e..0d15b68 100755 Binary files a/Nuitrack/lib/android-arm64/libnuitrack.so and b/Nuitrack/lib/android-arm64/libnuitrack.so differ diff --git a/Nuitrack/lib/android-arm64/obsensor_native.jar b/Nuitrack/lib/android-arm64/obsensor_native.jar index 70705fc..6f7d038 100644 Binary files a/Nuitrack/lib/android-arm64/obsensor_native.jar and b/Nuitrack/lib/android-arm64/obsensor_native.jar differ diff --git a/Nuitrack/lib/android/NuitrackManager.jar b/Nuitrack/lib/android/NuitrackManager.jar index 8e60adf..e3baabd 100644 Binary files a/Nuitrack/lib/android/NuitrackManager.jar and b/Nuitrack/lib/android/NuitrackManager.jar differ diff --git a/Nuitrack/lib/android/NuitrackWrapper.jar b/Nuitrack/lib/android/NuitrackWrapper.jar index 46706c4..ca8a069 100644 Binary files a/Nuitrack/lib/android/NuitrackWrapper.jar and b/Nuitrack/lib/android/NuitrackWrapper.jar differ diff --git a/Nuitrack/lib/android/libOpenNI.so b/Nuitrack/lib/android/libOpenNI.so index 433d12b..97c73d6 100644 Binary files a/Nuitrack/lib/android/libOpenNI.so and b/Nuitrack/lib/android/libOpenNI.so differ diff --git a/Nuitrack/lib/android/libmiddleware.so b/Nuitrack/lib/android/libmiddleware.so index 50e1f8b..2dc19b6 100755 Binary files a/Nuitrack/lib/android/libmiddleware.so and b/Nuitrack/lib/android/libmiddleware.so differ diff --git a/Nuitrack/lib/android/libnuitrack.so b/Nuitrack/lib/android/libnuitrack.so index 947a159..1386fef 100755 Binary files a/Nuitrack/lib/android/libnuitrack.so and b/Nuitrack/lib/android/libnuitrack.so differ diff --git a/Nuitrack/lib/android/obsensor_native.jar b/Nuitrack/lib/android/obsensor_native.jar index 70705fc..6f7d038 100644 Binary files a/Nuitrack/lib/android/obsensor_native.jar and b/Nuitrack/lib/android/obsensor_native.jar differ diff --git a/Nuitrack/lib/csharp/nuitrack.net.dll b/Nuitrack/lib/csharp/nuitrack.net.dll index fb03269..580d8a9 100755 Binary files a/Nuitrack/lib/csharp/nuitrack.net.dll and b/Nuitrack/lib/csharp/nuitrack.net.dll differ diff --git a/Nuitrack/lib/linux64/libmiddleware.so b/Nuitrack/lib/linux64/libmiddleware.so index 6b97431..fcc599b 100755 Binary files a/Nuitrack/lib/linux64/libmiddleware.so and b/Nuitrack/lib/linux64/libmiddleware.so differ diff --git a/Nuitrack/lib/linux64/libnuitrack.so b/Nuitrack/lib/linux64/libnuitrack.so index 43d6259..7c3e48e 100755 Binary files a/Nuitrack/lib/linux64/libnuitrack.so and b/Nuitrack/lib/linux64/libnuitrack.so differ diff --git a/Nuitrack/lib/linux_arm/libmiddleware.so b/Nuitrack/lib/linux_arm/libmiddleware.so index 22e44ba..0280049 100755 Binary files a/Nuitrack/lib/linux_arm/libmiddleware.so and b/Nuitrack/lib/linux_arm/libmiddleware.so differ diff --git a/Nuitrack/lib/linux_arm/libnuitrack.so b/Nuitrack/lib/linux_arm/libnuitrack.so index 4e7ce34..54827b4 100755 Binary files a/Nuitrack/lib/linux_arm/libnuitrack.so and b/Nuitrack/lib/linux_arm/libnuitrack.so differ diff --git a/Nuitrack/lib/linux_arm64/libmiddleware.so b/Nuitrack/lib/linux_arm64/libmiddleware.so index a46fdf3..8539b7a 100755 Binary files a/Nuitrack/lib/linux_arm64/libmiddleware.so and b/Nuitrack/lib/linux_arm64/libmiddleware.so differ diff --git a/Nuitrack/lib/linux_arm64/libnuitrack.so b/Nuitrack/lib/linux_arm64/libnuitrack.so index 89c5fff..0ee724b 100755 Binary files a/Nuitrack/lib/linux_arm64/libnuitrack.so and b/Nuitrack/lib/linux_arm64/libnuitrack.so differ diff --git a/Nuitrack/lib/win32/middleware.lib b/Nuitrack/lib/win32/middleware.lib index d1d751b..da0bb0f 100644 Binary files a/Nuitrack/lib/win32/middleware.lib and b/Nuitrack/lib/win32/middleware.lib differ diff --git a/Nuitrack/lib/win32/nuitrack.lib b/Nuitrack/lib/win32/nuitrack.lib index 4dd816d..1580715 100644 Binary files a/Nuitrack/lib/win32/nuitrack.lib and b/Nuitrack/lib/win32/nuitrack.lib differ diff --git a/Nuitrack/lib/win64/middleware.lib b/Nuitrack/lib/win64/middleware.lib index 444b0b0..ff403ab 100644 Binary files a/Nuitrack/lib/win64/middleware.lib and b/Nuitrack/lib/win64/middleware.lib differ diff --git a/Nuitrack/lib/win64/nuitrack.lib b/Nuitrack/lib/win64/nuitrack.lib index 5d18967..67f28da 100644 Binary files a/Nuitrack/lib/win64/nuitrack.lib and b/Nuitrack/lib/win64/nuitrack.lib differ diff --git a/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_arm64-0.1.0-py3-none-any.whl b/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_arm64-0.1.0-py3-none-any.whl index 19b4613..2676e83 100644 Binary files a/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_arm64-0.1.0-py3-none-any.whl and b/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_arm64-0.1.0-py3-none-any.whl differ diff --git a/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_x64-0.1.0-py3-none-any.whl b/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_x64-0.1.0-py3-none-any.whl index e5a3ef6..43b9319 100644 Binary files a/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_x64-0.1.0-py3-none-any.whl and b/PythonNuitrack-beta/pip_packages/dist/linux/py_nuitrack_ubuntu_x64-0.1.0-py3-none-any.whl differ diff --git a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.10-0.1.0-py3-none-any.whl b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.10-0.1.0-py3-none-any.whl index af22264..3dcc6d2 100644 Binary files a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.10-0.1.0-py3-none-any.whl and b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.10-0.1.0-py3-none-any.whl differ diff --git a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.6-0.1.0-py3-none-any.whl b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.6-0.1.0-py3-none-any.whl index 0fc0aa1..ce1d863 100644 Binary files a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.6-0.1.0-py3-none-any.whl and b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.6-0.1.0-py3-none-any.whl differ diff --git a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.7-0.1.0-py3-none-any.whl b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.7-0.1.0-py3-none-any.whl index 723b7ab..2377f44 100644 Binary files a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.7-0.1.0-py3-none-any.whl and b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.7-0.1.0-py3-none-any.whl differ diff --git a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.8-0.1.0-py3-none-any.whl b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.8-0.1.0-py3-none-any.whl index 8c93ba0..9d99f38 100644 Binary files a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.8-0.1.0-py3-none-any.whl and b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.8-0.1.0-py3-none-any.whl differ diff --git a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.9-0.1.0-py3-none-any.whl b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.9-0.1.0-py3-none-any.whl index cf30ff0..d7ff425 100644 Binary files a/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.9-0.1.0-py3-none-any.whl and b/PythonNuitrack-beta/pip_packages/dist/windows/py_nuitrack_windows_python3.9-0.1.0-py3-none-any.whl differ diff --git a/TouchDesigner/NuitrackPlugin/NuitrackCHOP.dll b/TouchDesigner/NuitrackPlugin/NuitrackCHOP.dll index 3143c50..a748db5 100644 Binary files a/TouchDesigner/NuitrackPlugin/NuitrackCHOP.dll and b/TouchDesigner/NuitrackPlugin/NuitrackCHOP.dll differ diff --git a/TouchDesigner/NuitrackPlugin/NuitrackTOP.dll b/TouchDesigner/NuitrackPlugin/NuitrackTOP.dll index e70fa9e..1a3500a 100644 Binary files a/TouchDesigner/NuitrackPlugin/NuitrackTOP.dll and b/TouchDesigner/NuitrackPlugin/NuitrackTOP.dll differ diff --git a/Unity3D/README.md b/Unity3D/README.md index 72bd097..4981bfe 100644 --- a/Unity3D/README.md +++ b/Unity3D/README.md @@ -1,9 +1,8 @@ ## How to use? -- Download Nuitrack Runtime for your platform of choice and corresponding Unity package at the [Releases page](https://github.com/3DiVi/nuitrack-sdk/releases) -- Install Nuitrack Runtime -- Create new Project in Unity (or open your project) +- Install Nuitrack Runtime https://github.com/3DiVi/nuitrack-sdk/blob/master/README.md +- Create new Project in Unity (Or open your project) - Import NuitrackSDK.unitypackage into your project (Main menu: "Assets/Import Package/Custom Package..." and click "import" button) -- Connect supported depth sensor (https://nuitrack.com/#sensors) +- Connect supported sensor (https://nuitrack.com/#sensors) - In the main menu, select "Nuitrack/Activate Nuitrack" - In the main menu, select "Nuitrack/Play Test Unity Scene" (or manually open in Project Tab "Assets/NuitrackSDK/NuitrackDemos/AllModulesScene" and click Play button) (If something doesn't work, follow the on-screen instructions) - Сheck out the tutorials "Nuitrack/Help/Open Tutorials List" diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/include/nuitrack/utils/ExceptionTranslator.h b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/include/nuitrack/utils/ExceptionTranslator.h index e01f34f..d92f15e 100644 --- a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/include/nuitrack/utils/ExceptionTranslator.h +++ b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/include/nuitrack/utils/ExceptionTranslator.h @@ -19,28 +19,30 @@ class ExceptionTranslator #ifndef NUITRACK_NO_EXCEPTIONS switch(errorCode) { - case EXCEPTION: - throw tdv::nuitrack::Exception(); - case TERMINATE_EXCEPTION: - throw tdv::nuitrack::TerminateException(); - case BAD_CONFIG_VALUE_EXCEPTION: - throw tdv::nuitrack::BadConfigValueException(); - case CONFIG_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ConfigNotFoundException(); - case MODUDLE_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ModuleNotFoundException(); - case LICENSE_NOT_ACQUIRED_EXCEPTION: - throw tdv::nuitrack::LicenseNotAcquiredException(); - case MODULE_NOT_INITIALIZED_EXCEPTION: - throw tdv::nuitrack::ModuleNotInitializedException(); - case MODULE_NOT_STARTED_EXCEPTION: - throw tdv::nuitrack::ModuleNotStartedException(); - case NETWORK_EXCEPTION: - throw tdv::nuitrack::NetworkException(); - case NETWORK_UNAVAILABLE_EXCEPTION: - throw tdv::nuitrack::NetworkUnavailableException(); - case SENSOR_DISCONNECTED_EXCEPTION: - throw tdv::nuitrack::SensorDisconnectedException(); + case EXCEPTION: + throw tdv::nuitrack::Exception(); + case TERMINATE_EXCEPTION: + throw tdv::nuitrack::TerminateException(); + case BAD_CONFIG_VALUE_EXCEPTION: + throw tdv::nuitrack::BadConfigValueException(); + case CONFIG_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ConfigNotFoundException(); + case MODUDLE_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ModuleNotFoundException(); + case LICENSE_NOT_ACQUIRED_EXCEPTION: + throw tdv::nuitrack::LicenseNotAcquiredException(); + case MODULE_NOT_INITIALIZED_EXCEPTION: + throw tdv::nuitrack::ModuleNotInitializedException(); + case MODULE_NOT_STARTED_EXCEPTION: + throw tdv::nuitrack::ModuleNotStartedException(); + case NETWORK_EXCEPTION: + throw tdv::nuitrack::NetworkException(); + case NETWORK_UNAVAILABLE_EXCEPTION: + throw tdv::nuitrack::NetworkUnavailableException(); + case SENSOR_DISCONNECTED_EXCEPTION: + throw tdv::nuitrack::SensorDisconnectedException(); + case OK: + break; } #else if (errorCode != ExceptionType::OK) @@ -54,28 +56,30 @@ class ExceptionTranslator std::string message = (errorMessage == NULL ? "" : errorMessage); switch(errorCode) { - case EXCEPTION: - throw tdv::nuitrack::Exception("NuitrackException: " + message); - case TERMINATE_EXCEPTION: - throw tdv::nuitrack::TerminateException("NuitrackException (TerminateException): " + message); - case BAD_CONFIG_VALUE_EXCEPTION: - throw tdv::nuitrack::BadConfigValueException("NuitrackException (BadConfigValueException): " + message); - case CONFIG_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ConfigNotFoundException("NuitrackException (ConfigNotFoundException): " + message); - case MODUDLE_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ModuleNotFoundException("NuitrackException (ModuleNotFoundException): " + message); - case LICENSE_NOT_ACQUIRED_EXCEPTION: - throw tdv::nuitrack::LicenseNotAcquiredException("NuitrackException (LicenseNotAcquiredException): " + message); - case MODULE_NOT_INITIALIZED_EXCEPTION: - throw tdv::nuitrack::ModuleNotInitializedException("NuitrackException (ModuleNotInitializedException): " + message); - case MODULE_NOT_STARTED_EXCEPTION: - throw tdv::nuitrack::ModuleNotStartedException("NuitrackException (ModuleNotStartedException): " + message); - case NETWORK_EXCEPTION: - throw tdv::nuitrack::NetworkException("NuitrackException (NetworkException): " + message); - case NETWORK_UNAVAILABLE_EXCEPTION: - throw tdv::nuitrack::NetworkUnavailableException("NuitrackException (NetworkUnavailableException): " + message); - case SENSOR_DISCONNECTED_EXCEPTION: - throw tdv::nuitrack::SensorDisconnectedException("NuitrackException (SensorDisconnectedException): " + message); + case EXCEPTION: + throw tdv::nuitrack::Exception("NuitrackException: " + message); + case TERMINATE_EXCEPTION: + throw tdv::nuitrack::TerminateException("NuitrackException (TerminateException): " + message); + case BAD_CONFIG_VALUE_EXCEPTION: + throw tdv::nuitrack::BadConfigValueException("NuitrackException (BadConfigValueException): " + message); + case CONFIG_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ConfigNotFoundException("NuitrackException (ConfigNotFoundException): " + message); + case MODUDLE_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ModuleNotFoundException("NuitrackException (ModuleNotFoundException): " + message); + case LICENSE_NOT_ACQUIRED_EXCEPTION: + throw tdv::nuitrack::LicenseNotAcquiredException("NuitrackException (LicenseNotAcquiredException): " + message); + case MODULE_NOT_INITIALIZED_EXCEPTION: + throw tdv::nuitrack::ModuleNotInitializedException("NuitrackException (ModuleNotInitializedException): " + message); + case MODULE_NOT_STARTED_EXCEPTION: + throw tdv::nuitrack::ModuleNotStartedException("NuitrackException (ModuleNotStartedException): " + message); + case NETWORK_EXCEPTION: + throw tdv::nuitrack::NetworkException("NuitrackException (NetworkException): " + message); + case NETWORK_UNAVAILABLE_EXCEPTION: + throw tdv::nuitrack::NetworkUnavailableException("NuitrackException (NetworkUnavailableException): " + message); + case SENSOR_DISCONNECTED_EXCEPTION: + throw tdv::nuitrack::SensorDisconnectedException("NuitrackException (SensorDisconnectedException): " + message); + case OK: + break; } #else if (errorCode != ExceptionType::OK) diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackManager.jar b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackManager.jar index f6d5064..317f06b 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackManager.jar and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackManager.jar differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackWrapper.jar b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackWrapper.jar index 2dce066..573919a 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackWrapper.jar and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/NuitrackWrapper.jar differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libOpenNI.so b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libOpenNI.so index 6384af0..d97e82b 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libOpenNI.so and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libOpenNI.so differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libmiddleware.so b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libmiddleware.so old mode 100755 new mode 100644 index 59c6154..6a1b7ed Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libmiddleware.so and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libmiddleware.so differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libnuitrack.so b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libnuitrack.so old mode 100755 new mode 100644 index 9a5f47e..0d15b68 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libnuitrack.so and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/libnuitrack.so differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/obsensor_native.jar b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/obsensor_native.jar index 70705fc..6f7d038 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/obsensor_native.jar and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android-arm64/obsensor_native.jar differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackManager.jar b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackManager.jar index 8e60adf..e3baabd 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackManager.jar and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackManager.jar differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackWrapper.jar b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackWrapper.jar index 46706c4..ca8a069 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackWrapper.jar and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/NuitrackWrapper.jar differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libOpenNI.so b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libOpenNI.so index 433d12b..97c73d6 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libOpenNI.so and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libOpenNI.so differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libmiddleware.so b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libmiddleware.so old mode 100755 new mode 100644 index 50e1f8b..2dc19b6 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libmiddleware.so and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libmiddleware.so differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libnuitrack.so b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libnuitrack.so old mode 100755 new mode 100644 index 947a159..1386fef Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libnuitrack.so and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/libnuitrack.so differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/obsensor_native.jar b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/obsensor_native.jar index 70705fc..6f7d038 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/obsensor_native.jar and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/android/obsensor_native.jar differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/middleware.lib b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/middleware.lib index d1d751b..da0bb0f 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/middleware.lib and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/middleware.lib differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/nuitrack.lib b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/nuitrack.lib index 4dd816d..1580715 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/nuitrack.lib and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win32/nuitrack.lib differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/middleware.lib b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/middleware.lib index 444b0b0..ff403ab 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/middleware.lib and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/middleware.lib differ diff --git a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/nuitrack.lib b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/nuitrack.lib index 5d18967..67f28da 100644 Binary files a/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/nuitrack.lib and b/UnrealEngine/NuitrackPluginForUE4/Source/NuitrackModule/lib/win64/nuitrack.lib differ diff --git a/VERSION b/VERSION index 94a68bd..bfdddb7 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -0.37.24 -1.13.24 +0.38.0 +1.14.0 diff --git a/doc/CSV_Recorder.md b/doc/CSV_Recorder.md index 6f97a5f..e452e2c 100644 --- a/doc/CSV_Recorder.md +++ b/doc/CSV_Recorder.md @@ -44,25 +44,36 @@ In order to do so, tick the checkbox as shown on the picture below: import pandas as pd import matplotlib.pyplot as plt import numpy as np -from matplotlib.animation import FuncAnimation -from matplotlib.animation import PillowWriter +from matplotlib.animation import FuncAnimation, PillowWriter df = pd.read_csv('SkeletonData.csv') -max_z = np.nanmax(df.filter(regex='.*\.z$').max().to_numpy()) +max_z = np.nanmax(df.filter(regex='.*\.z$').to_numpy()) fig = plt.figure() ax = plt.axes(projection='3d') def get_joint_coords_by_idx(dataframe, idx, joint_name): - coords = df.filter(regex=(f'{joint_name}\..$')) - return coords.iloc[idx] + return dataframe.filter(regex=f'{joint_name}\..$').iloc[idx] def draw_line(ax, origin, to): - x = np.array([origin[0], to[0]]) - y = np.array([origin[1], to[1]]) - z = np.array([origin[2], to[2]]) - ax.plot3D(x, y, z) + ax.plot3D(*zip(origin, to)) + +joints = ['JOINT_HEAD', 'JOINT_NECK', 'JOINT_LEFT_COLLAR', 'JOINT_RIGHT_SHOULDER', 'JOINT_LEFT_SHOULDER', + 'JOINT_RIGHT_ELBOW', 'JOINT_LEFT_ELBOW', 'JOINT_LEFT_WRIST', 'JOINT_RIGHT_WRIST', 'JOINT_RIGHT_HAND', + 'JOINT_LEFT_HAND', 'JOINT_TORSO', 'JOINT_WAIST', 'JOINT_RIGHT_HIP', 'JOINT_LEFT_HIP', 'JOINT_RIGHT_KNEE', + 'JOINT_LEFT_KNEE', 'JOINT_RIGHT_ANKLE', 'JOINT_LEFT_ANKLE'] + +connections = [ + ('JOINT_HEAD', 'JOINT_NECK'), ('JOINT_NECK', 'JOINT_LEFT_COLLAR'), + ('JOINT_LEFT_COLLAR', 'JOINT_RIGHT_SHOULDER'), ('JOINT_LEFT_COLLAR', 'JOINT_LEFT_SHOULDER'), + ('JOINT_RIGHT_SHOULDER', 'JOINT_RIGHT_ELBOW'), ('JOINT_LEFT_SHOULDER', 'JOINT_LEFT_ELBOW'), + ('JOINT_LEFT_ELBOW', 'JOINT_LEFT_HAND'), ('JOINT_RIGHT_ELBOW', 'JOINT_RIGHT_HAND'), + ('JOINT_LEFT_COLLAR', 'JOINT_TORSO'), ('JOINT_TORSO', 'JOINT_WAIST'), + ('JOINT_WAIST', 'JOINT_LEFT_HIP'), ('JOINT_WAIST', 'JOINT_RIGHT_HIP'), + ('JOINT_LEFT_HIP', 'JOINT_LEFT_KNEE'), ('JOINT_RIGHT_HIP', 'JOINT_RIGHT_KNEE'), + ('JOINT_RIGHT_KNEE', 'JOINT_RIGHT_ANKLE'), ('JOINT_LEFT_KNEE', 'JOINT_LEFT_ANKLE') +] def animate(i): ax.clear() @@ -70,53 +81,19 @@ def animate(i): ax.set_ylim3d(-1, 1) ax.set_zlim3d(0, max_z) ax.set_title(f'timestamp: {df.iloc[i]["timestamp"]:.0f}') - ax.view_init(elev=290, azim=120, roll=-30) - head = get_joint_coords_by_idx(df, i, 'JOINT_HEAD') - neck = get_joint_coords_by_idx(df, i, 'JOINT_NECK') - collar = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_COLLAR') - right_shoulder = get_joint_coords_by_idx(df, i, 'JOINT_RIGHT_SHOULDER') - left_shoulder = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_SHOULDER') - right_elbow = get_joint_coords_by_idx(df, i, 'JOINT_RIGHT_ELBOW') - left_elbow = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_ELBOW') - left_wrist = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_WRIST') - right_wrist = get_joint_coords_by_idx(df, i, 'JOINT_RIGHT_WRIST') - right_hand = get_joint_coords_by_idx(df, i, 'JOINT_RIGHT_HAND') - left_hand = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_HAND') - torso = get_joint_coords_by_idx(df, i, 'JOINT_TORSO') - waist = get_joint_coords_by_idx(df, i, 'JOINT_WAIST') - right_hip = get_joint_coords_by_idx(df, i, 'JOINT_RIGHT_HIP') - left_hip = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_HIP') - right_knee = get_joint_coords_by_idx(df, i, 'JOINT_RIGHT_KNEE') - left_knee = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_KNEE') - right_ankle = get_joint_coords_by_idx(df, i, 'JOINT_RIGHT_ANKLE') - left_ankle = get_joint_coords_by_idx(df, i, 'JOINT_LEFT_ANKLE') - - draw_line(ax, head, neck) - draw_line(ax, neck, collar) - draw_line(ax, collar, right_shoulder) - draw_line(ax, collar, left_shoulder) - draw_line(ax, right_shoulder, right_elbow) - draw_line(ax, left_shoulder, left_elbow) - draw_line(ax, left_elbow, left_hand) - draw_line(ax, right_elbow, right_hand) - draw_line(ax, collar, torso) - draw_line(ax, torso, waist) - draw_line(ax, waist, left_hip) - draw_line(ax, waist, right_hip) - draw_line(ax, left_hip, left_knee) - draw_line(ax, right_hip, right_knee) - draw_line(ax, right_knee, right_ankle) - draw_line(ax, left_knee, left_ankle) - -anim = FuncAnimation(fig, animate, frames=len(df.index), interval=15, repeat=True) - -# To save the animation using Pillow as a gif -# writer = PillowWriter(fps=30, -# metadata=dict(artist='Me'), -# bitrate=1800) -# anim.save('skeleton_animation.gif', writer=writer) + joint_coords = {joint: get_joint_coords_by_idx(df, i, joint) for joint in joints} + + for joint1, joint2 in connections: + draw_line(ax, joint_coords[joint1], joint_coords[joint2]) + +anim = FuncAnimation(fig, animate, frames=len(df.index), interval=1, repeat=True) + +# To save the animation using Pillow as a gif: +# +# writer = PillowWriter(fps=30, metadata=dict(artist='Me'), bitrate=1800) +# anim.save('skeleton_animation.gif', writer=writer) plt.show() ``` diff --git a/iOS-beta/nuitrack_sample/nuitrack.framework/Headers/utils/ExceptionTranslator.h b/iOS-beta/nuitrack_sample/nuitrack.framework/Headers/utils/ExceptionTranslator.h index e01f34f..d92f15e 100644 --- a/iOS-beta/nuitrack_sample/nuitrack.framework/Headers/utils/ExceptionTranslator.h +++ b/iOS-beta/nuitrack_sample/nuitrack.framework/Headers/utils/ExceptionTranslator.h @@ -19,28 +19,30 @@ class ExceptionTranslator #ifndef NUITRACK_NO_EXCEPTIONS switch(errorCode) { - case EXCEPTION: - throw tdv::nuitrack::Exception(); - case TERMINATE_EXCEPTION: - throw tdv::nuitrack::TerminateException(); - case BAD_CONFIG_VALUE_EXCEPTION: - throw tdv::nuitrack::BadConfigValueException(); - case CONFIG_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ConfigNotFoundException(); - case MODUDLE_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ModuleNotFoundException(); - case LICENSE_NOT_ACQUIRED_EXCEPTION: - throw tdv::nuitrack::LicenseNotAcquiredException(); - case MODULE_NOT_INITIALIZED_EXCEPTION: - throw tdv::nuitrack::ModuleNotInitializedException(); - case MODULE_NOT_STARTED_EXCEPTION: - throw tdv::nuitrack::ModuleNotStartedException(); - case NETWORK_EXCEPTION: - throw tdv::nuitrack::NetworkException(); - case NETWORK_UNAVAILABLE_EXCEPTION: - throw tdv::nuitrack::NetworkUnavailableException(); - case SENSOR_DISCONNECTED_EXCEPTION: - throw tdv::nuitrack::SensorDisconnectedException(); + case EXCEPTION: + throw tdv::nuitrack::Exception(); + case TERMINATE_EXCEPTION: + throw tdv::nuitrack::TerminateException(); + case BAD_CONFIG_VALUE_EXCEPTION: + throw tdv::nuitrack::BadConfigValueException(); + case CONFIG_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ConfigNotFoundException(); + case MODUDLE_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ModuleNotFoundException(); + case LICENSE_NOT_ACQUIRED_EXCEPTION: + throw tdv::nuitrack::LicenseNotAcquiredException(); + case MODULE_NOT_INITIALIZED_EXCEPTION: + throw tdv::nuitrack::ModuleNotInitializedException(); + case MODULE_NOT_STARTED_EXCEPTION: + throw tdv::nuitrack::ModuleNotStartedException(); + case NETWORK_EXCEPTION: + throw tdv::nuitrack::NetworkException(); + case NETWORK_UNAVAILABLE_EXCEPTION: + throw tdv::nuitrack::NetworkUnavailableException(); + case SENSOR_DISCONNECTED_EXCEPTION: + throw tdv::nuitrack::SensorDisconnectedException(); + case OK: + break; } #else if (errorCode != ExceptionType::OK) @@ -54,28 +56,30 @@ class ExceptionTranslator std::string message = (errorMessage == NULL ? "" : errorMessage); switch(errorCode) { - case EXCEPTION: - throw tdv::nuitrack::Exception("NuitrackException: " + message); - case TERMINATE_EXCEPTION: - throw tdv::nuitrack::TerminateException("NuitrackException (TerminateException): " + message); - case BAD_CONFIG_VALUE_EXCEPTION: - throw tdv::nuitrack::BadConfigValueException("NuitrackException (BadConfigValueException): " + message); - case CONFIG_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ConfigNotFoundException("NuitrackException (ConfigNotFoundException): " + message); - case MODUDLE_NOT_FOUND_EXCEPTION: - throw tdv::nuitrack::ModuleNotFoundException("NuitrackException (ModuleNotFoundException): " + message); - case LICENSE_NOT_ACQUIRED_EXCEPTION: - throw tdv::nuitrack::LicenseNotAcquiredException("NuitrackException (LicenseNotAcquiredException): " + message); - case MODULE_NOT_INITIALIZED_EXCEPTION: - throw tdv::nuitrack::ModuleNotInitializedException("NuitrackException (ModuleNotInitializedException): " + message); - case MODULE_NOT_STARTED_EXCEPTION: - throw tdv::nuitrack::ModuleNotStartedException("NuitrackException (ModuleNotStartedException): " + message); - case NETWORK_EXCEPTION: - throw tdv::nuitrack::NetworkException("NuitrackException (NetworkException): " + message); - case NETWORK_UNAVAILABLE_EXCEPTION: - throw tdv::nuitrack::NetworkUnavailableException("NuitrackException (NetworkUnavailableException): " + message); - case SENSOR_DISCONNECTED_EXCEPTION: - throw tdv::nuitrack::SensorDisconnectedException("NuitrackException (SensorDisconnectedException): " + message); + case EXCEPTION: + throw tdv::nuitrack::Exception("NuitrackException: " + message); + case TERMINATE_EXCEPTION: + throw tdv::nuitrack::TerminateException("NuitrackException (TerminateException): " + message); + case BAD_CONFIG_VALUE_EXCEPTION: + throw tdv::nuitrack::BadConfigValueException("NuitrackException (BadConfigValueException): " + message); + case CONFIG_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ConfigNotFoundException("NuitrackException (ConfigNotFoundException): " + message); + case MODUDLE_NOT_FOUND_EXCEPTION: + throw tdv::nuitrack::ModuleNotFoundException("NuitrackException (ModuleNotFoundException): " + message); + case LICENSE_NOT_ACQUIRED_EXCEPTION: + throw tdv::nuitrack::LicenseNotAcquiredException("NuitrackException (LicenseNotAcquiredException): " + message); + case MODULE_NOT_INITIALIZED_EXCEPTION: + throw tdv::nuitrack::ModuleNotInitializedException("NuitrackException (ModuleNotInitializedException): " + message); + case MODULE_NOT_STARTED_EXCEPTION: + throw tdv::nuitrack::ModuleNotStartedException("NuitrackException (ModuleNotStartedException): " + message); + case NETWORK_EXCEPTION: + throw tdv::nuitrack::NetworkException("NuitrackException (NetworkException): " + message); + case NETWORK_UNAVAILABLE_EXCEPTION: + throw tdv::nuitrack::NetworkUnavailableException("NuitrackException (NetworkUnavailableException): " + message); + case SENSOR_DISCONNECTED_EXCEPTION: + throw tdv::nuitrack::SensorDisconnectedException("NuitrackException (SensorDisconnectedException): " + message); + case OK: + break; } #else if (errorCode != ExceptionType::OK) diff --git a/iOS-beta/nuitrack_sample/nuitrack.framework/Info.plist b/iOS-beta/nuitrack_sample/nuitrack.framework/Info.plist index 460d0ff..23fa773 100644 --- a/iOS-beta/nuitrack_sample/nuitrack.framework/Info.plist +++ b/iOS-beta/nuitrack_sample/nuitrack.framework/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.37.24 + 0.38.0 CFBundleSignature ???? CFBundleVersion diff --git a/iOS-beta/nuitrack_sample/nuitrack.framework/data/nuitrack.config b/iOS-beta/nuitrack_sample/nuitrack.framework/data/nuitrack.config index a75aaee..02a3882 100644 --- a/iOS-beta/nuitrack_sample/nuitrack.framework/data/nuitrack.config +++ b/iOS-beta/nuitrack_sample/nuitrack.framework/data/nuitrack.config @@ -65,7 +65,7 @@ "MAX_DISTANCE": 7000, "Pixelization": 0, "skipFrames": 0, - "FloorDetector": "AdaptiveFloorDetector", + "FloorDetector": "3d", "FloorMaxError": 100, "RotationOX": 0, "RotationOY": 0, @@ -291,7 +291,17 @@ } } }, - "AzureKinectDepthProviderModule": {}, + "AzureKinectDepthProviderModule": { + "FPS": 30, + "Depth": { + "Width": 640, + "Height": 576 + }, + "RGB": { + "Width": 1920, + "Height": 1080 + } + }, "Filter": { "DummyFilter": {}, "ThreshHold": { diff --git a/iOS-beta/nuitrack_sample/nuitrack.framework/nuitrack b/iOS-beta/nuitrack_sample/nuitrack.framework/nuitrack index dac7e5b..293dbae 100755 Binary files a/iOS-beta/nuitrack_sample/nuitrack.framework/nuitrack and b/iOS-beta/nuitrack_sample/nuitrack.framework/nuitrack differ