ambiser
/
human
mirror of https://github.com/vladmandic/human
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add hand labels in draw

pull/134/head
Vladimir Mandic 2021-04-26 07:37:29 -04:00
parent 3de870633a
commit 4880048595
12 changed files with 110 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -9,7 +9,7 @@ Repository: **<git+https://github.com/vladmandic/human.git>**
## Changelog
### **HEAD -> main** 2021/04/25 mandic00@live.com
### **HEAD -> main** 2021/04/26 mandic00@live.com
- convert blazeface to module
- version 1.8 release candidate

6
dist/human.esm-nobundle.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/human.esm-nobundle.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/human.esm.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/human.esm.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/human.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/human.js.map vendored
View File

File diff suppressed because one or more lines are too long

27
dist/human.node-gpu.js vendored
View File

@ -18713,12 +18713,24 @@ async function hand2(inCanvas2, result, drawOptions) {
}
}
}
if (localOptions.drawLabels) {
const addHandLabel = (part, title) => {
ctx.fillStyle = localOptions.useDepth ? `rgba(${127.5 + 2 * part[part.length - 1][2]}, ${127.5 - 2 * part[part.length - 1][2]}, 255, 0.5)` : localOptions.color;
ctx.fillText(title, part[part.length - 1][0] + 4, part[part.length - 1][1] + 4);
};
ctx.font = localOptions.font;
addHandLabel(h.annotations.indexFinger, "index");
addHandLabel(h.annotations.middleFinger, "middle");
addHandLabel(h.annotations.ringFinger, "ring");
addHandLabel(h.annotations.pinky, "pinky");
addHandLabel(h.annotations.thumb, "thumb");
addHandLabel(h.annotations.palmBase, "palm");
}
if (localOptions.drawPolygons) {
const addPart = (part) => {
const addHandLine = (part) => {
if (!part)
return;
for (let i = 0; i < part.length; i++) {
ctx.lineWidth = localOptions.lineWidth;
ctx.beginPath();
ctx.strokeStyle = localOptions.useDepth ? `rgba(${127.5 + 2 * part[i][2]}, ${127.5 - 2 * part[i][2]}, 255, 0.5)` : localOptions.color;
ctx.moveTo(part[i > 0 ? i - 1 : 0][0], part[i > 0 ? i - 1 : 0][1]);
@ -18726,11 +18738,12 @@ async function hand2(inCanvas2, result, drawOptions) {
ctx.stroke();
}
};
addPart(h.annotations.indexFinger);
addPart(h.annotations.middleFinger);
addPart(h.annotations.ringFinger);
addPart(h.annotations.pinky);
addPart(h.annotations.thumb);
ctx.lineWidth = localOptions.lineWidth;
addHandLine(h.annotations.indexFinger);
addHandLine(h.annotations.middleFinger);
addHandLine(h.annotations.ringFinger);
addHandLine(h.annotations.pinky);
addHandLine(h.annotations.thumb);
}
}
}

27
dist/human.node-wasm.js vendored
View File

@ -18714,12 +18714,24 @@ async function hand2(inCanvas2, result, drawOptions) {
}
}
}
if (localOptions.drawLabels) {
const addHandLabel = (part, title) => {
ctx.fillStyle = localOptions.useDepth ? `rgba(${127.5 + 2 * part[part.length - 1][2]}, ${127.5 - 2 * part[part.length - 1][2]}, 255, 0.5)` : localOptions.color;
ctx.fillText(title, part[part.length - 1][0] + 4, part[part.length - 1][1] + 4);
};
ctx.font = localOptions.font;
addHandLabel(h.annotations.indexFinger, "index");
addHandLabel(h.annotations.middleFinger, "middle");
addHandLabel(h.annotations.ringFinger, "ring");
addHandLabel(h.annotations.pinky, "pinky");
addHandLabel(h.annotations.thumb, "thumb");
addHandLabel(h.annotations.palmBase, "palm");
}
if (localOptions.drawPolygons) {
const addPart = (part) => {
const addHandLine = (part) => {
if (!part)
return;
for (let i = 0; i < part.length; i++) {
ctx.lineWidth = localOptions.lineWidth;
ctx.beginPath();
ctx.strokeStyle = localOptions.useDepth ? `rgba(${127.5 + 2 * part[i][2]}, ${127.5 - 2 * part[i][2]}, 255, 0.5)` : localOptions.color;
ctx.moveTo(part[i > 0 ? i - 1 : 0][0], part[i > 0 ? i - 1 : 0][1]);
@ -18727,11 +18739,12 @@ async function hand2(inCanvas2, result, drawOptions) {
ctx.stroke();
}
};
addPart(h.annotations.indexFinger);
addPart(h.annotations.middleFinger);
addPart(h.annotations.ringFinger);
addPart(h.annotations.pinky);
addPart(h.annotations.thumb);
ctx.lineWidth = localOptions.lineWidth;
addHandLine(h.annotations.indexFinger);
addHandLine(h.annotations.middleFinger);
addHandLine(h.annotations.ringFinger);
addHandLine(h.annotations.pinky);
addHandLine(h.annotations.thumb);
}
}
}

27
dist/human.node.js vendored
View File

@ -18713,12 +18713,24 @@ async function hand2(inCanvas2, result, drawOptions) {
}
}
}
if (localOptions.drawLabels) {
const addHandLabel = (part, title) => {
ctx.fillStyle = localOptions.useDepth ? `rgba(${127.5 + 2 * part[part.length - 1][2]}, ${127.5 - 2 * part[part.length - 1][2]}, 255, 0.5)` : localOptions.color;
ctx.fillText(title, part[part.length - 1][0] + 4, part[part.length - 1][1] + 4);
};
ctx.font = localOptions.font;
addHandLabel(h.annotations.indexFinger, "index");
addHandLabel(h.annotations.middleFinger, "middle");
addHandLabel(h.annotations.ringFinger, "ring");
addHandLabel(h.annotations.pinky, "pinky");
addHandLabel(h.annotations.thumb, "thumb");
addHandLabel(h.annotations.palmBase, "palm");
}
if (localOptions.drawPolygons) {
const addPart = (part) => {
const addHandLine = (part) => {
if (!part)
return;
for (let i = 0; i < part.length; i++) {
ctx.lineWidth = localOptions.lineWidth;
ctx.beginPath();
ctx.strokeStyle = localOptions.useDepth ? `rgba(${127.5 + 2 * part[i][2]}, ${127.5 - 2 * part[i][2]}, 255, 0.5)` : localOptions.color;
ctx.moveTo(part[i > 0 ? i - 1 : 0][0], part[i > 0 ? i - 1 : 0][1]);
@ -18726,11 +18738,12 @@ async function hand2(inCanvas2, result, drawOptions) {
ctx.stroke();
}
};
addPart(h.annotations.indexFinger);
addPart(h.annotations.middleFinger);
addPart(h.annotations.ringFinger);
addPart(h.annotations.pinky);
addPart(h.annotations.thumb);
ctx.lineWidth = localOptions.lineWidth;
addHandLine(h.annotations.indexFinger);
addHandLine(h.annotations.middleFinger);
addHandLine(h.annotations.ringFinger);
addHandLine(h.annotations.pinky);
addHandLine(h.annotations.thumb);
}
}
}

17
server/build.log
View File

@ -372,3 +372,20 @@
2021-04-26 07:18:24 INFO:  Generate types: ["src/human.ts"]
2021-04-26 07:18:30 INFO:  Update Change log: ["/home/vlado/dev/human/CHANGELOG.md"]
2021-04-26 07:18:30 INFO:  Generate TypeDocs: ["src/human.ts"]
2021-04-26 07:36:49 INFO:  @vladmandic/human version 1.8.0
2021-04-26 07:36:49 INFO:  User: vlado Platform: linux Arch: x64 Node: v16.0.0
2021-04-26 07:36:49 INFO:  Build: file startup all type: production config: {"minifyWhitespace":true,"minifyIdentifiers":true,"minifySyntax":true}
2021-04-26 07:36:49 STATE: Build for: node type: tfjs: {"imports":1,"importBytes":39,"outputBytes":696,"outputFiles":"dist/tfjs.esm.js"}
2021-04-26 07:36:50 STATE: Build for: node type: node: {"imports":35,"importBytes":415008,"outputBytes":374028,"outputFiles":"dist/human.node.js"}
2021-04-26 07:36:50 STATE: Build for: nodeGPU type: tfjs: {"imports":1,"importBytes":43,"outputBytes":700,"outputFiles":"dist/tfjs.esm.js"}
2021-04-26 07:36:50 STATE: Build for: nodeGPU type: node: {"imports":35,"importBytes":415012,"outputBytes":374032,"outputFiles":"dist/human.node-gpu.js"}
2021-04-26 07:36:50 STATE: Build for: nodeWASM type: tfjs: {"imports":1,"importBytes":81,"outputBytes":746,"outputFiles":"dist/tfjs.esm.js"}
2021-04-26 07:36:50 STATE: Build for: nodeWASM type: node: {"imports":35,"importBytes":415058,"outputBytes":374082,"outputFiles":"dist/human.node-wasm.js"}
2021-04-26 07:36:50 STATE: Build for: browserNoBundle type: tfjs: {"imports":1,"importBytes":2488,"outputBytes":1394,"outputFiles":"dist/tfjs.esm.js"}
2021-04-26 07:36:50 STATE: Build for: browserNoBundle type: esm: {"imports":35,"importBytes":415706,"outputBytes":230290,"outputFiles":"dist/human.esm-nobundle.js"}
2021-04-26 07:36:51 STATE: Build for: browserBundle type: tfjs: {"modules":1267,"moduleBytes":4085087,"imports":7,"importBytes":2488,"outputBytes":1101728,"outputFiles":"dist/tfjs.esm.js"}
2021-04-26 07:36:51 STATE: Build for: browserBundle type: iife: {"imports":35,"importBytes":1516040,"outputBytes":1328454,"outputFiles":"dist/human.js"}
2021-04-26 07:36:52 STATE: Build for: browserBundle type: esm: {"imports":35,"importBytes":1516040,"outputBytes":1328412,"outputFiles":"dist/human.esm.js"}
2021-04-26 07:36:52 INFO:  Generate types: ["src/human.ts"]
2021-04-26 07:36:56 INFO:  Update Change log: ["/home/vlado/dev/human/CHANGELOG.md"]
2021-04-26 07:36:56 INFO:  Generate TypeDocs: ["src/human.ts"]

29
src/draw/draw.ts
View File

@ -410,11 +410,23 @@ export async function hand(inCanvas: HTMLCanvasElement, result: Array<any>, draw
}
}
}
if (localOptions.drawLabels) {
const addHandLabel = (part, title) => {
ctx.fillStyle = localOptions.useDepth ? `rgba(${127.5 + (2 * part[part.length - 1][2])}, ${127.5 - (2 * part[part.length - 1][2])}, 255, 0.5)` : localOptions.color;
ctx.fillText(title, part[part.length - 1][0] + 4, part[part.length - 1][1] + 4);
};
ctx.font = localOptions.font;
addHandLabel(h.annotations.indexFinger, 'index');
addHandLabel(h.annotations.middleFinger, 'middle');
addHandLabel(h.annotations.ringFinger, 'ring');
addHandLabel(h.annotations.pinky, 'pinky');
addHandLabel(h.annotations.thumb, 'thumb');
addHandLabel(h.annotations.palmBase, 'palm');
}
if (localOptions.drawPolygons) {
const addPart = (part) => {
const addHandLine = (part) => {
if (!part) return;
for (let i = 0; i < part.length; i++) {
ctx.lineWidth = localOptions.lineWidth;
ctx.beginPath();
ctx.strokeStyle = localOptions.useDepth ? `rgba(${127.5 + (2 * part[i][2])}, ${127.5 - (2 * part[i][2])}, 255, 0.5)` : localOptions.color;
ctx.moveTo(part[i > 0 ? i - 1 : 0][0], part[i > 0 ? i - 1 : 0][1]);
@ -422,12 +434,13 @@ export async function hand(inCanvas: HTMLCanvasElement, result: Array<any>, draw
ctx.stroke();
}
};
addPart(h.annotations.indexFinger);
addPart(h.annotations.middleFinger);
addPart(h.annotations.ringFinger);
addPart(h.annotations.pinky);
addPart(h.annotations.thumb);
// addPart(hand.annotations.palmBase);
ctx.lineWidth = localOptions.lineWidth;
addHandLine(h.annotations.indexFinger);
addHandLine(h.annotations.middleFinger);
addHandLine(h.annotations.ringFinger);
addHandLine(h.annotations.pinky);
addHandLine(h.annotations.thumb);
// addPart(h.annotations.palmBase);
}
}
}