From 27c6b6b79ed3acfe6a40a91800eb104cebc74b8f Mon Sep 17 00:00:00 2001 From: Wouter Verweirder Date: Sun, 22 Dec 2019 17:09:00 +0100 Subject: [PATCH] updated body tracking SDK to 0.9.5 --- lib/kinect-azure.js | 2 +- lib/settings.js | 6 +++--- package-lock.json | 2 +- package.json | 4 +++- scripts/clean.js | 18 ++++++++++++++++++ src/kinect_azure.cc | 4 +++- 6 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 scripts/clean.js diff --git a/lib/kinect-azure.js b/lib/kinect-azure.js index 6a5d64e..4fd2231 100644 --- a/lib/kinect-azure.js +++ b/lib/kinect-azure.js @@ -81,7 +81,7 @@ class KinectAzure { } { KinectAzure.K4ABT_JOINT_PELVIS = 0, - KinectAzure.K4ABT_JOINT_SPINE_NAVAL = 1, + KinectAzure.K4ABT_JOINT_SPINE_NAVEL = 1, KinectAzure.K4ABT_JOINT_SPINE_CHEST = 2, KinectAzure.K4ABT_JOINT_NECK = 3, KinectAzure.K4ABT_JOINT_CLAVICLE_LEFT = 4, diff --git a/lib/settings.js b/lib/settings.js index 3450bd8..c282065 100644 --- a/lib/settings.js +++ b/lib/settings.js @@ -2,9 +2,9 @@ const path = require('path'); module.exports = () => { const KINECT_SENSOR_SDK_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.Sensor/1.3.0'; - const KINECT_BODY_TRACKING_SDK_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking/0.9.4'; - const KINECT_BODY_TRACKING_DEPENDENCIES_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies/0.9.0'; - const KINECT_CUDNN_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies.cuDNN/0.9.0'; + const KINECT_BODY_TRACKING_SDK_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking/0.9.5'; + const KINECT_BODY_TRACKING_DEPENDENCIES_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies/0.9.1'; + const KINECT_CUDNN_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies.cuDNN/0.9.1'; const TARGET_SDK_DIR = path.resolve(__dirname, '../sdk'); const TARGET_KINECT_SENSOR_SDK_ZIP = path.resolve(TARGET_SDK_DIR, 'sensor-sdk.zip'); diff --git a/package-lock.json b/package-lock.json index 6b28c5e..005fd12 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "kinect-azure", - "version": "0.0.7", + "version": "0.0.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7d04f4d..db5ebf8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kinect-azure", - "version": "0.0.7", + "version": "0.0.8", "description": "Nodejs library to access the azure kinect data from the official SDK", "repository": "https://github.com/wouterverweirder/kinect-azure", "main": "lib/kinect-azure.js", @@ -16,6 +16,8 @@ }, "scripts": { "install": "node ./scripts/install.js && node-gyp rebuild", + "clean": "node ./scripts/clean.js", + "reinstall": "npm run clean && npm run install", "prepublishOnly": "rimraf ./examples/**/node_modules" }, "gypfile": true, diff --git a/scripts/clean.js b/scripts/clean.js new file mode 100644 index 0000000..d3755b9 --- /dev/null +++ b/scripts/clean.js @@ -0,0 +1,18 @@ +const fs = require('fs-extra'); +const path = require('path'); +const settings = require('../lib/settings.js')(); + +const init = async () => { + await fs.remove(settings.TARGET_SDK_DIR); + + const appRoot = process.cwd().split('/node_modules')[0]; + const { appRootDlls } = settings; + for (const dllName in appRootDlls) { + if (appRootDlls.hasOwnProperty(dllName)) { + const dllTargetPath = path.resolve(appRoot, dllName); + await fs.remove(dllTargetPath); + } + } +}; + +init(); \ No newline at end of file diff --git a/src/kinect_azure.cc b/src/kinect_azure.cc index 549b1b3..c3f58a9 100644 --- a/src/kinect_azure.cc +++ b/src/kinect_azure.cc @@ -418,7 +418,8 @@ Napi::Value MethodStartListening(const Napi::CallbackInfo& info) { k4a_wait_result_t queue_capture_result = k4abt_tracker_enqueue_capture(g_tracker, sensor_capture, 0); if (queue_capture_result == K4A_WAIT_RESULT_FAILED) { - // printf("[kinect_azure.cc] Error! Add capture to tracker process queue failed!\n"); + k4a_capture_release(sensor_capture); + mtx.unlock(); break; } @@ -480,6 +481,7 @@ Napi::Value MethodStartListening(const Napi::CallbackInfo& info) { if (!is_listening) { + mtx.unlock(); break; } // Perform a blocking call