From 95519c45b7db4f7c7760e795c37d7a74e45e5433 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Fri, 5 Mar 2021 07:39:37 -0500 Subject: [PATCH] added blazepose-upper --- config.js | 2 +- demo/browser.js | 10 ++++------ package.json | 6 +++--- src/human.ts | 2 +- wiki | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/config.js b/config.js index dd44ff2d..e024c36d 100644 --- a/config.js +++ b/config.js @@ -137,7 +137,7 @@ export default { body: { enabled: true, - modelPath: '../models/posenet.json', // can be 'posenet' or 'blazepose' + modelPath: '../models/posenet.json', // can be 'posenet', 'blazepose' or 'blazepose-upper' inputSize: 257, // fixed value, 257 for posenet and 256 for blazepose maxDetections: 10, // maximum number of people detected in the input // should be set to the minimum number for performance diff --git a/demo/browser.js b/demo/browser.js index 8b8fbcf9..fe39d3b3 100644 --- a/demo/browser.js +++ b/demo/browser.js @@ -8,20 +8,18 @@ import draw from './draw.js'; import Menu from './menu.js'; import GLBench from './gl-bench.js'; -const userConfig = {}; // add any user configuration overrides +// const userConfig = {}; // add any user configuration overrides -/* const userConfig = { backend: 'wasm', async: false, warmup: 'full', videoOptimized: false, - face: { enabled: true, iris: { enabled: true }, mesh: { enabled: true }, age: { enabled: true }, gender: { enabled: true }, emotion: { enabled: true }, embedding: { enabled: true } }, - hand: { enabled: true }, + face: { enabled: false, iris: { enabled: true }, mesh: { enabled: true }, age: { enabled: true }, gender: { enabled: true }, emotion: { enabled: true }, embedding: { enabled: true } }, + hand: { enabled: false }, gestures: { enabled: true }, - body: { enabled: true, modelType: 'blazepose', modelPath: '../models/blazepose.json' }, + body: { enabled: true, modelType: 'blazepose', modelPath: '../models/blazepose-upper.json' }, }; -*/ const human = new Human(userConfig); diff --git a/package.json b/package.json index c800d91f..fcb25c93 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@vladmandic/pilogger": "^0.2.14", "chokidar": "^3.5.1", "dayjs": "^1.10.4", - "esbuild": "^0.8.54", + "esbuild": "^0.8.56", "eslint": "^7.21.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-plugin-import": "^2.22.1", @@ -48,9 +48,9 @@ "eslint-plugin-promise": "^4.3.1", "rimraf": "^3.0.2", "seedrandom": "^3.0.5", - "simple-git": "^2.35.2", + "simple-git": "^2.36.0", "tslib": "^2.1.0", - "typescript": "^4.3.0-dev.20210302" + "typescript": "^4.3.0-dev.20210305" }, "scripts": { "start": "node --trace-warnings --unhandled-rejections=strict --trace-uncaught --no-deprecation src/node.js", diff --git a/src/human.ts b/src/human.ts index f28523ee..68961212 100644 --- a/src/human.ts +++ b/src/human.ts @@ -494,7 +494,7 @@ class Human { default: src = null; } - // src = encodeURI('../assets/human-sample-face.jpg'); + // src = encodeURI('../assets/human-sample-upper.jpg'); const img = new Image(); img.onload = async () => { const canvas = (typeof OffscreenCanvas !== 'undefined') ? new OffscreenCanvas(size, size) : document.createElement('canvas'); diff --git a/wiki b/wiki index c60f4427..870084a1 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit c60f442714b1b5887ae25feb35fa413bc9996402 +Subproject commit 870084a1a92e66943076ad41a99b74d32c799761