From 1bb15e5096966498583eb5634ddf7a018507042f Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Mon, 14 Jun 2021 08:16:10 -0400 Subject: [PATCH] reorganize demos --- CHANGELOG.md | 2 +- README.md | 8 ++-- demo/{ => face3d}/face3d.js | 8 ++-- demo/{face3d.html => face3d/index.html} | 10 ++--- demo/{ => facematch}/facematch.js | 10 +++-- .../faces.json} | 0 demo/{facematch.html => facematch/index.html} | 10 ++--- demo/{ => nodejs}/node-multiprocess-worker.js | 2 +- demo/{ => nodejs}/node-multiprocess.js | 5 ++- demo/{ => nodejs}/node-video.js | 4 +- demo/{ => nodejs}/node-webcam.js | 4 +- demo/{ => nodejs}/node.js | 2 +- package.json | 6 +-- server/build.log | 44 +++++++++---------- wiki | 2 +- 15 files changed, 62 insertions(+), 55 deletions(-) rename demo/{ => face3d}/face3d.js (95%) rename demo/{face3d.html => face3d/index.html} (80%) rename demo/{ => facematch}/facematch.js (96%) rename demo/{facematch-faces.json => facematch/faces.json} (100%) rename demo/{facematch.html => facematch/index.html} (84%) rename demo/{ => nodejs}/node-multiprocess-worker.js (95%) rename demo/{ => nodejs}/node-multiprocess.js (95%) rename demo/{ => nodejs}/node-video.js (94%) rename demo/{ => nodejs}/node-webcam.js (94%) rename demo/{ => nodejs}/node.js (98%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f9da4b6..b9eca3b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ Repository: **** ## Changelog -### **HEAD -> main** 2021/06/09 mandic00@live.com +### **HEAD -> main** 2021/06/11 mandic00@live.com - add body segmentation sample diff --git a/README.md b/README.md index a796b37e..4fc17a72 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Check out [**Live Demo**](https://vladmandic.github.io/human/demo/index.html) ap ## Demos - [**Main Application**](https://vladmandic.github.io/human/demo/index.html) -- [**Face Extraction, Description, Identification and Matching**](https://vladmandic.github.io/human/demo/facematch.html) -- [**Face Extraction and 3D Rendering**](https://vladmandic.github.io/human/demo/face3d.html) +- [**Face Extraction, Description, Identification and Matching**](https://vladmandic.github.io/human/demo/facematch/index.html) +- [**Face Extraction and 3D Rendering**](https://vladmandic.github.io/human/demo/face3d/index.html) - [**Details on Demo Applications**](https://github.com/vladmandic/human/wiki/Demos) ## Project pages @@ -134,14 +134,14 @@ All options as presented in the demo application... 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 -> [demo/facematch.html](demo/facematch.html) +> [demo/facematch](demo/facematch/index.html) ![Face Matching](assets/screenshot-facematch.jpg)
**Face3D OpenGL Rendering:** -> [demo/face3d.html](demo/face3d.html) +> [demo/face3d](demo/face3d/index.html) ![Face Matching](assets/screenshot-face3d.jpg) diff --git a/demo/face3d.js b/demo/face3d/face3d.js similarity index 95% rename from demo/face3d.js rename to demo/face3d/face3d.js index bbdd54c4..a102bc89 100644 --- a/demo/face3d.js +++ b/demo/face3d/face3d.js @@ -6,15 +6,17 @@ * Demo for face mesh detection and projection as 3D object using Three.js */ -import { DoubleSide, Mesh, MeshBasicMaterial, OrthographicCamera, Scene, sRGBEncoding, VideoTexture, WebGLRenderer, BufferGeometry, BufferAttribute } from './helpers/three.js'; -import { OrbitControls } from './helpers/three-orbitControls.js'; -import Human from '../dist/human.esm.js'; // equivalent of @vladmandic/human +import { DoubleSide, Mesh, MeshBasicMaterial, OrthographicCamera, Scene, sRGBEncoding, VideoTexture, WebGLRenderer, BufferGeometry, BufferAttribute } from '../helpers/three.js'; +import { OrbitControls } from '../helpers/three-orbitControls.js'; +import Human from '../../dist/human.esm.js'; // equivalent of @vladmandic/human const userConfig = { backend: 'wasm', async: false, profile: false, warmup: 'full', + modelBasePath: '../../models/', + wasmPath: 'https://cdn.jsdelivr.net/npm/@tensorflow/tfjs-backend-wasm@3.7.0/dist/', filter: { enabled: false }, face: { enabled: true, detector: { rotation: false, maxDetected: 1 }, diff --git a/demo/face3d.html b/demo/face3d/index.html similarity index 80% rename from demo/face3d.html rename to demo/face3d/index.html index 60e17f5c..fceb3692 100644 --- a/demo/face3d.html +++ b/demo/face3d/index.html @@ -9,12 +9,12 @@ - - - - + + + +