new samples gallery and major code folder restructure

CHANGELOG.md

@@ -9,11 +9,13 @@
   
 ## Changelog
   
+### **HEAD -> main** 2021/09/24 mandic00@live.com
+
+- new release
+
 ### **2.2.3** 2021/09/24 mandic00@live.com
 
-
-### **origin/main** 2021/09/23 mandic00@live.com
-
+- optimize model loading
 - support segmentation for nodejs
 - redo segmentation and handtracking
 - prototype handtracking

README.md

@@ -42,6 +42,7 @@ Check out [**Live Demo**](https://vladmandic.github.io/human/demo/index.html) ap
 - [*Live:* **Face Extraction and 3D Rendering**](https://vladmandic.github.io/human/demo/face3d/index.html)
 - [*Live:* **Multithreaded Detection Showcasing Maximum Performance**](https://vladmandic.github.io/human/demo/multithread/index.html)
 - [*Live:* **VR Model with Head, Face, Eye, Body and Hand tracking**](https://vladmandic.github.io/human-vrm/src/human-vrm.html)
+- [Examples galery](https://vladmandic.github.io/human/samples/samples.html)
 
 ## Project pages
 
@@ -75,6 +76,7 @@ Check out [**Live Demo**](https://vladmandic.github.io/human/demo/index.html) ap
 - [**Platform Support**](https://github.com/vladmandic/human/wiki/Platforms)
 - [**Diagnostic and Performance trace information**](https://github.com/vladmandic/human/wiki/Diag)
 - [**List of Models & Credits**](https://github.com/vladmandic/human/wiki/Models)
+- [**Models Download Repository**](https://github.com/vladmandic/human-models)
 - [**Security & Privacy Policy**](https://github.com/vladmandic/human/blob/main/SECURITY.md)
 - [**License & Usage Restrictions**](https://github.com/vladmandic/human/blob/main/LICENSE)
 
@@ -86,6 +88,15 @@ Check out [**Live Demo**](https://vladmandic.github.io/human/demo/index.html) ap
 
 <hr><br>
 
+## Examples
+
+Visit [Examples galery](https://vladmandic.github.io/human/samples/samples.html) for more examples  
+<https://vladmandic.github.io/human/samples/samples.html>
+
+![samples](assets/samples.jpg)
+
+<br>
+
 ## Options
 
 All options as presented in the demo application...  
@@ -95,52 +106,15 @@ All options as presented in the demo application...
 
 <br>
 
-## Examples
-
-<br>
-
-**Face Close-up:**  
-![Face](assets/screenshot-face.jpg)
-
-<br>
-
-**Face under a high angle:**  
-![Angle](assets/screenshot-angle.jpg)
-
-<br>
-
-**Full Person Details:**  
-![Pose](assets/screenshot-person.jpg)
-
-<br>
-
-**Pose Detection:**  
-![Pose](assets/screenshot-pose.jpg)
-
-<br>
-
-**Body Segmentation and Background Replacement:**  
-![Pose](assets/screenshot-segmentation.jpg)
-
-<br>
-
-**Large Group:**  
-![Group](assets/screenshot-group.jpg)
-
-<br>
-
-**VR Model Tracking:**  
-![vrmodel](assets/screenshot-vrm.jpg)
-
-<br>
-
 **Results Browser:**  
 [ *Demo -> Display -> Show Results* ]<br>
 ![Results](assets/screenshot-results.png)
 
 <br>
 
-**Face Similarity Matching:**  
+## Advanced Examples
+
+1. **Face Similarity Matching:**  
 Extracts all faces from provided input images,  
 sorts them by similarity to selected face  
 and optionally matches detected face with database of known people to guess their names
@@ -150,13 +124,18 @@ and optionally matches detected face with database of known people to guess thei
 
 <br>
 
-**Face3D OpenGL Rendering:**  
+2. **Face3D OpenGL Rendering:**  
 > [demo/face3d](demo/face3d/index.html)
 
 ![Face Matching](assets/screenshot-face3d.jpg)
 
 <br>
 
+3. **VR Model Tracking:**  
+![vrmodel](assets/screenshot-vrm.jpg)
+
+<br>
+
 **468-Point Face Mesh Defails:**  
 (view in full resolution to see keypoints)  
 

demo/nodejs/node-canvas.js

@@ -12,7 +12,7 @@ const Human = require('../../dist/human.node.js'); // this is 'const Human = req
 const config = { // just enable all and leave default settings
   debug: false,
   face: { enabled: true }, // includes mesh, iris, emotion, descriptor
-  hand: { enabled: true },
+  hand: { enabled: true, maxDetected: 2, minConfidence: 0.5, detector: { modelPath: 'handtrack.json' } }, // use alternative hand model
   body: { enabled: true },
   object: { enabled: true },
   gestures: { enabled: true },

dist/human.esm-nobundle.js

@@ -46,7 +46,7 @@ var __privateSet = (obj, member, value, setter) => {
   return value;
 };
 
-// src/helpers.ts
+// src/util.ts
 function join(folder, file) {
   const separator = folder.endsWith("/") ? "" : "/";
   const skipJoin = file.startsWith(".") || file.startsWith("/") || file.startsWith("http:") || file.startsWith("https:") || file.startsWith("file:");
@@ -4495,11 +4495,11 @@ function process2(input, config3) {
     let targetHeight = originalHeight;
     if (targetWidth > maxSize) {
       targetWidth = maxSize;
-      targetHeight = targetWidth * originalHeight / originalWidth;
+      targetHeight = Math.trunc(targetWidth * originalHeight / originalWidth);
     }
     if (targetHeight > maxSize) {
       targetHeight = maxSize;
-      targetWidth = targetHeight * originalWidth / originalHeight;
+      targetWidth = Math.trunc(targetHeight * originalWidth / originalHeight);
     }
     if ((config3.filter.width || 0) > 0)
       targetWidth = config3.filter.width;
@@ -12483,13 +12483,6 @@ var Human = class {
       }
       return null;
     });
-    __publicField(this, "reset", () => {
-      const currentBackend = this.config.backend;
-      this.config = JSON.parse(JSON.stringify(config));
-      this.config.backend = currentBackend;
-    });
-    __publicField(this, "validate", (userConfig) => validate(config, userConfig || this.config));
-    __publicField(this, "image", (input) => process2(input, this.config));
     __publicField(this, "emit", (event) => {
       var _a;
       return (_a = this.events) == null ? void 0 : _a.dispatchEvent(new Event(event));
@@ -12505,7 +12498,6 @@ var Human = class {
     Object.seal(this.config);
     if (userConfig)
       this.config = mergeDeep(this.config, userConfig);
-    validate(config, this.config);
     this.tf = tfjs_esm_exports;
     this.state = "idle";
     __privateSet(this, _numTensors, 0);
@@ -12532,6 +12524,17 @@ var Human = class {
     this.gl = config2;
     this.emit("create");
   }
+  reset() {
+    const currentBackend = this.config.backend;
+    this.config = JSON.parse(JSON.stringify(config));
+    this.config.backend = currentBackend;
+  }
+  validate(userConfig) {
+    return validate(config, userConfig || this.config);
+  }
+  image(input) {
+    return process2(input, this.config);
+  }
   similarity(embedding1, embedding2) {
     return similarity(embedding1, embedding2);
   }

dist/human.esm.js

@@ -42,7 +42,7 @@ var __privateSet = (obj, member, value, setter) => {
   return value;
 };
 
-// src/helpers.ts
+// src/util.ts
 function join(folder, file) {
   const separator = folder.endsWith("/") ? "" : "/";
   const skipJoin = file.startsWith(".") || file.startsWith("/") || file.startsWith("http:") || file.startsWith("https:") || file.startsWith("file:");
@@ -64563,11 +64563,11 @@ function process2(input2, config3) {
     let targetHeight = originalHeight;
     if (targetWidth > maxSize) {
       targetWidth = maxSize;
-      targetHeight = targetWidth * originalHeight / originalWidth;
+      targetHeight = Math.trunc(targetWidth * originalHeight / originalWidth);
     }
     if (targetHeight > maxSize) {
       targetHeight = maxSize;
-      targetWidth = targetHeight * originalWidth / originalHeight;
+      targetWidth = Math.trunc(targetHeight * originalWidth / originalHeight);
     }
     if ((config3.filter.width || 0) > 0)
       targetWidth = config3.filter.width;
@@ -72551,13 +72551,6 @@ var Human = class {
       }
       return null;
     });
-    __publicField(this, "reset", () => {
-      const currentBackend = this.config.backend;
-      this.config = JSON.parse(JSON.stringify(config));
-      this.config.backend = currentBackend;
-    });
-    __publicField(this, "validate", (userConfig) => validate(config, userConfig || this.config));
-    __publicField(this, "image", (input2) => process2(input2, this.config));
     __publicField(this, "emit", (event) => {
       var _a;
       return (_a = this.events) == null ? void 0 : _a.dispatchEvent(new Event(event));
@@ -72573,7 +72566,6 @@ var Human = class {
     Object.seal(this.config);
     if (userConfig)
       this.config = mergeDeep(this.config, userConfig);
-    validate(config, this.config);
     this.tf = tfjs_esm_exports;
     this.state = "idle";
     __privateSet(this, _numTensors, 0);
@@ -72600,6 +72592,17 @@ var Human = class {
     this.gl = config2;
     this.emit("create");
   }
+  reset() {
+    const currentBackend = this.config.backend;
+    this.config = JSON.parse(JSON.stringify(config));
+    this.config.backend = currentBackend;
+  }
+  validate(userConfig) {
+    return validate(config, userConfig || this.config);
+  }
+  image(input2) {
+    return process2(input2, this.config);
+  }
   similarity(embedding1, embedding2) {
     return similarity(embedding1, embedding2);
   }

dist/human.node-gpu.js

@@ -89,7 +89,7 @@ __export(exports, {
   env: () => env
 });
 
-// src/helpers.ts
+// src/util.ts
 function join(folder, file) {
   const separator = folder.endsWith("/") ? "" : "/";
   const skipJoin = file.startsWith(".") || file.startsWith("/") || file.startsWith("http:") || file.startsWith("https:") || file.startsWith("file:");
@@ -4527,11 +4527,11 @@ function process2(input, config3) {
     let targetHeight = originalHeight;
     if (targetWidth > maxSize) {
       targetWidth = maxSize;
-      targetHeight = targetWidth * originalHeight / originalWidth;
+      targetHeight = Math.trunc(targetWidth * originalHeight / originalWidth);
     }
     if (targetHeight > maxSize) {
       targetHeight = maxSize;
-      targetWidth = targetHeight * originalWidth / originalHeight;
+      targetWidth = Math.trunc(targetHeight * originalWidth / originalHeight);
     }
     if ((config3.filter.width || 0) > 0)
       targetWidth = config3.filter.width;
@@ -12548,13 +12548,6 @@ var Human = class {
       }
       return null;
     });
-    __publicField(this, "reset", () => {
-      const currentBackend = this.config.backend;
-      this.config = JSON.parse(JSON.stringify(config));
-      this.config.backend = currentBackend;
-    });
-    __publicField(this, "validate", (userConfig) => validate(config, userConfig || this.config));
-    __publicField(this, "image", (input) => process2(input, this.config));
     __publicField(this, "emit", (event) => {
       var _a;
       return (_a = this.events) == null ? void 0 : _a.dispatchEvent(new Event(event));
@@ -12570,7 +12563,6 @@ var Human = class {
     Object.seal(this.config);
     if (userConfig)
       this.config = mergeDeep(this.config, userConfig);
-    validate(config, this.config);
     this.tf = tf26;
     this.state = "idle";
     __privateSet(this, _numTensors, 0);
@@ -12597,6 +12589,17 @@ var Human = class {
     this.gl = config2;
     this.emit("create");
   }
+  reset() {
+    const currentBackend = this.config.backend;
+    this.config = JSON.parse(JSON.stringify(config));
+    this.config.backend = currentBackend;
+  }
+  validate(userConfig) {
+    return validate(config, userConfig || this.config);
+  }
+  image(input) {
+    return process2(input, this.config);
+  }
   similarity(embedding1, embedding2) {
     return similarity(embedding1, embedding2);
   }

dist/human.node-wasm.js

@@ -90,7 +90,7 @@ __export(exports, {
   env: () => env
 });
 
-// src/helpers.ts
+// src/util.ts
 function join(folder, file) {
   const separator = folder.endsWith("/") ? "" : "/";
   const skipJoin = file.startsWith(".") || file.startsWith("/") || file.startsWith("http:") || file.startsWith("https:") || file.startsWith("file:");
@@ -4528,11 +4528,11 @@ function process2(input, config3) {
     let targetHeight = originalHeight;
     if (targetWidth > maxSize) {
       targetWidth = maxSize;
-      targetHeight = targetWidth * originalHeight / originalWidth;
+      targetHeight = Math.trunc(targetWidth * originalHeight / originalWidth);
     }
     if (targetHeight > maxSize) {
       targetHeight = maxSize;
-      targetWidth = targetHeight * originalWidth / originalHeight;
+      targetWidth = Math.trunc(targetHeight * originalWidth / originalHeight);
     }
     if ((config3.filter.width || 0) > 0)
       targetWidth = config3.filter.width;
@@ -12549,13 +12549,6 @@ var Human = class {
       }
       return null;
     });
-    __publicField(this, "reset", () => {
-      const currentBackend = this.config.backend;
-      this.config = JSON.parse(JSON.stringify(config));
-      this.config.backend = currentBackend;
-    });
-    __publicField(this, "validate", (userConfig) => validate(config, userConfig || this.config));
-    __publicField(this, "image", (input) => process2(input, this.config));
     __publicField(this, "emit", (event) => {
       var _a;
       return (_a = this.events) == null ? void 0 : _a.dispatchEvent(new Event(event));
@@ -12571,7 +12564,6 @@ var Human = class {
     Object.seal(this.config);
     if (userConfig)
       this.config = mergeDeep(this.config, userConfig);
-    validate(config, this.config);
     this.tf = tf26;
     this.state = "idle";
     __privateSet(this, _numTensors, 0);
@@ -12598,6 +12590,17 @@ var Human = class {
     this.gl = config2;
     this.emit("create");
   }
+  reset() {
+    const currentBackend = this.config.backend;
+    this.config = JSON.parse(JSON.stringify(config));
+    this.config.backend = currentBackend;
+  }
+  validate(userConfig) {
+    return validate(config, userConfig || this.config);
+  }
+  image(input) {
+    return process2(input, this.config);
+  }
   similarity(embedding1, embedding2) {
     return similarity(embedding1, embedding2);
   }

dist/human.node.js

@@ -89,7 +89,7 @@ __export(exports, {
   env: () => env
 });
 
-// src/helpers.ts
+// src/util.ts
 function join(folder, file) {
   const separator = folder.endsWith("/") ? "" : "/";
   const skipJoin = file.startsWith(".") || file.startsWith("/") || file.startsWith("http:") || file.startsWith("https:") || file.startsWith("file:");
@@ -4527,11 +4527,11 @@ function process2(input, config3) {
     let targetHeight = originalHeight;
     if (targetWidth > maxSize) {
       targetWidth = maxSize;
-      targetHeight = targetWidth * originalHeight / originalWidth;
+      targetHeight = Math.trunc(targetWidth * originalHeight / originalWidth);
     }
     if (targetHeight > maxSize) {
       targetHeight = maxSize;
-      targetWidth = targetHeight * originalWidth / originalHeight;
+      targetWidth = Math.trunc(targetHeight * originalWidth / originalHeight);
     }
     if ((config3.filter.width || 0) > 0)
       targetWidth = config3.filter.width;
@@ -12548,13 +12548,6 @@ var Human = class {
       }
       return null;
     });
-    __publicField(this, "reset", () => {
-      const currentBackend = this.config.backend;
-      this.config = JSON.parse(JSON.stringify(config));
-      this.config.backend = currentBackend;
-    });
-    __publicField(this, "validate", (userConfig) => validate(config, userConfig || this.config));
-    __publicField(this, "image", (input) => process2(input, this.config));
     __publicField(this, "emit", (event) => {
       var _a;
       return (_a = this.events) == null ? void 0 : _a.dispatchEvent(new Event(event));
@@ -12570,7 +12563,6 @@ var Human = class {
     Object.seal(this.config);
     if (userConfig)
       this.config = mergeDeep(this.config, userConfig);
-    validate(config, this.config);
     this.tf = tf26;
     this.state = "idle";
     __privateSet(this, _numTensors, 0);
@@ -12597,6 +12589,17 @@ var Human = class {
     this.gl = config2;
     this.emit("create");
   }
+  reset() {
+    const currentBackend = this.config.backend;
+    this.config = JSON.parse(JSON.stringify(config));
+    this.config.backend = currentBackend;
+  }
+  validate(userConfig) {
+    return validate(config, userConfig || this.config);
+  }
+  image(input) {
+    return process2(input, this.config);
+  }
   similarity(embedding1, embedding2) {
     return similarity(embedding1, embedding2);
   }

package.json

@@ -66,14 +66,14 @@
     "@tensorflow/tfjs-layers": "^3.9.0",
     "@tensorflow/tfjs-node": "^3.9.0",
     "@tensorflow/tfjs-node-gpu": "^3.9.0",
-    "@types/node": "^16.9.6",
+    "@types/node": "^16.10.1",
     "@typescript-eslint/eslint-plugin": "^4.31.2",
     "@typescript-eslint/parser": "^4.31.2",
     "@vladmandic/build": "^0.5.3",
     "@vladmandic/pilogger": "^0.3.3",
     "canvas": "^2.8.0",
     "dayjs": "^1.10.7",
-    "esbuild": "^0.13.0",
+    "esbuild": "^0.13.2",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-import": "^2.24.2",

samples/README.md

@@ -2,3 +2,11 @@
 
 Sample Images used by `Human` library demos and automated tests
 Not required for normal funcioning of library
+
+Samples were generated using default configuration without any fine-tuning using command:
+
+```shell
+node test/test-node-canvas.js samples/in/ samples/out/
+```
+
+Samples galery viewer: <https://vladmandic.github.io/human/samples/samples.html>