From 77476652d21f88312bae40d0b67a10022ac54298 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Mon, 29 Mar 2021 14:40:34 -0400 Subject: [PATCH] new serve module and demo structure --- CHANGELOG.md | 1 + demo/{faces.json => facematch-faces.json} | 0 demo/facematch.js | 2 +- demo/favicon.ico | Bin 0 -> 5063 bytes demo/{ => helpers}/gl-bench.js | 0 demo/{ => helpers}/menu.js | 82 ++++++++++-------- demo/{worker.js => index-worker.js} | 0 demo/index.html | 4 +- demo/{browser.js => index.js} | 10 +-- .../manifest.webmanifest | 0 package.json | 6 +- src/config.ts | 4 +- tsconfig.json | 2 +- wiki | 2 +- 14 files changed, 62 insertions(+), 51 deletions(-) rename demo/{faces.json => facematch-faces.json} (100%) create mode 100644 demo/favicon.ico rename demo/{ => helpers}/gl-bench.js (100%) rename demo/{ => helpers}/menu.js (83%) rename demo/{worker.js => index-worker.js} (100%) rename demo/{browser.js => index.js} (99%) rename manifest.webmanifest => demo/manifest.webmanifest (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed100625..1e17eced 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Repository: **** ### **HEAD -> main** 2021/03/28 mandic00@live.com +- minor rotation calculation fix - remove debug output - new face rotation calculations - cleanup diff --git a/demo/faces.json b/demo/facematch-faces.json similarity index 100% rename from demo/faces.json rename to demo/facematch-faces.json diff --git a/demo/facematch.js b/demo/facematch.js index 875b6024..68f7a8e4 100644 --- a/demo/facematch.js +++ b/demo/facematch.js @@ -43,7 +43,7 @@ function log(...msg) { async function getFaceDB() { // download db with known faces try { - const res = await fetch('/demo/faces.json'); + const res = await fetch('/demo/facematch-faces.json'); db = (res && res.ok) ? await res.json() : []; for (const rec of db) { rec.embedding = rec.embedding.map((a) => parseFloat(a.toFixed(4))); diff --git a/demo/favicon.ico b/demo/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1cbc04490dd7488fa515a98e243c113ac220d2f6 GIT binary patch literal 5063 zcmdUzc{J2-7r?*sov}BTM6!g!Sh7U6Aw-3gWyq4rnx%+|hViq_P?RW3ekh_WHA0hp z2~)DK{bY%ek!>^>M%kBlI`2R4Iq#qEU+?#OzUO)FbHC@F=iGDe=ef@X00`^-^FRP8 z;JqLK2(#u7tu0OA+@jp9Dcs!bJnE13&&SEm8qh&+ya7NEXMX;i9d2xCB0L%GmD9G$ zU@X13ESF_o>!U7{%*D9~a{YiGvCqHS{dXwZ?v}&#s#8#|b9U;4-^_Lul{!)ae_Yw`->;uG*~O)9-@l}yyS>u7;`!4&YpV~X5Q)}%LdJR`6e>Y@BO-A8C0|rX>j$3 z?cI%q*A2S;y7NmL*;$|jh!Dwv5;0DOY_qaTK z`vz{VxTvIJY5uEfi29lQ^Lu@iGcBsv#Y8icomClF=d!v3z~Q~}cXoddYqSQXCWsnJ?F7D(&aJ4{7VbDq}x z3R=`1fbPN^ZSg)#BZl-kCvUxae_e%S3u0;=LiHo-SN^a%q6+$v1EJwuA%j)E_HyUE ztIt9W5})VzZdQ@6k`1Q%sVECy3{FxJ;ec#WdB(n~XtU zh8t3C;SBm6P+GvZc$N(PVba4lowl+P(eYpPMzDS@jfU*bDSU2iMOh_#eVCH~zj zefg5~XpiS0dVX#MKh*2*T*HV1Fc)`J*wZeG@9<;JUfX)x$)Oe)T+vw?x-R(};TJ&v z+$*LwhUfF%`%&m&i!Xc}UHj7UMqBxB@^{dz;|u?K_WjkXU6TtIzd6Z1y?adbb&1y# z)$})Kzw~%XI38B3=_d3upPe-$awB4*z22yV+Dk#CDytbEIk8VoF-p(RN(o*OT)F=b zjkbv1m+xy0YB3HHUAf=buQ23uywBJwwSKOe7u4a3g3L0uu%{dvzr#Y<(&BGkKbyS$ z$$4zp_HrC%lgBJYwt;mM6qFR4R_u^Gs)=&6t&pof+h??I@d1~f__*O z;n3hj7Q$ks?}45ET_@{Mdwp!pwY&4$w$8K*j0v0lmN30pg(=jYiqetDkh};~Kc!^Q zOtDDx6sbVu8e`KLhr%i?9Q>}`vHWD~QXG6(4M9JOAR@J`4RT#?wc9;z!^;IJK6)u`dspiEo+q-Zz@R_{5U(mB|<-@0i z@MfRwfD;0?kO${4vq}BGEr3*~_~fq(8tDlzHyt{EYVl#UR4gZv7eebs-YY2fwTvE? zEStZkB74cyQLLs|&Qrd4TORbY zs8hRU_$m-Ly8?P!LH#OtPY_4JU8D?Y$|A|hCq8SPpxD*iYF>>PeUZJ{lE>yLjtrk9-f|b%eAxqt%9^`*CJoad1@snJS z1SJ|;@=`xpW@y%(+8|O`)_UcS{lh@LuoX0)w)~b5UcoEtSq|B(&%z>FW$33+UM_3b zzi@g_$&$nf92LBBLf^nsjl0W5?dA#obs>KZhZS@!D&fm6Aktth`U{{ibOSP0a2ahC zt4dTFQ;k}G7^S6bphDM2-CuvMTs~V&yj-eHxt;I+2=Dx*(^&8d*QU_QLfgyj+zhbE zrhPBy9&e^f^>XkPe;3LF6TSdfHfOW2dWe$s035(*UfMyu=WDaD)@I4YcwQ?=>-@VRQ>p2U=teQ^ zrHLy4#{6idzEape94EGNoT^L~cT=?Hm>D=yxvFU6G8M0ooBIW#&#v!5m={;|Z@Sd5 zllme;Hgs%fq8zGP`TffVuwv0uU7dtoI*bXBiJgAmsrOIDeuD}O7L3!ZruFgsq>`A*Lg#H z`M$*4IjTOD*^BMWDaI#f!kY{kS<{_aBjxgu|g4{e$d1auza;NcJ7guWGyS~%p}R+PuT8P#$;TC=y5snqW{LK5j$>@l{K1cmQSo5 z)@Uv`ocx~4`uIu(^Ys2<>Pe^g)YH0Ro2IE4McsbnBfBij&kVhfv z^U5-H!buz*BKKqfu0gyipi#~%V=4pWhScy(XdbmtJgP=^1Wt7z6BD~{k`a`&-5#wa zHZw2K8%{PQwEao;#>tKx!a7)B{Bfe6U8NKGpy0=uo=G82@zCkCf5SqB?b#oMbU+#M zsFGZCaW`u#1f#HLfsw=KWHgV$KHVu2)F=cYI*30cJC?alD^Q1I=3qI^uR>=9>(28k z0fXhd(!{QO!P)|2NM`mQ4R6wd*?lHW-9@wg3@9)3&qC9Gz&vMLDSmdg`w-0oTGd{~ zA(bv#xZA*n(u=zapomdp1I>6cL{@jZ1P-)HnqHU>;a+d(=qf1k=V?fwTl zlThahJ|e)Kd{Rv=;d76LB#B+uO^jdO9*@*624)`IeTU37mj7$gZQ&@{2Y+x88Y_6k z5TiFbB&&3G#M<9ur)zD!f#spcqmP~Eg32h z3hg}7AHyBcxKTDDAak`*X&!RKvbk*Sn<2f+aC|lHQ#1dfPPTWVa9-!-<_o7SAL^Nq zEn}BNR6Tw{3YTZs+A5`l@Zv(w0XZ8#H)2mdeRq-s&9T&<^5wVwpV;@`{PY96Z0@XI zZ_x2#0^=O7hxEjsIBVc|1~}{GX*#lG{uORg@09Gygwf5lS2sPcC3730G+#GL<^@!K z&b|#D6b7OpJscxm9|tQYy*|RVV)r1M6O{F)N!fc6ap5Dcidt06SnkUVZx1-sk5~@; zyqHGb8Q_Z*=NTjjQxSAn4ObCnymYBgV)W*W&GgpEAUorgtSwd{^*GE;DP zTAXfVFF7idwTH~!x?p^7uD^_H<%T;2lAVK<(=7lZ_;*A2df?{9emgun6Y{9{!$S?H zvxgft(21-4hx>=OAUC#8+$)wH228)kcxJElGE!HyF((oW0$bz{Rvw{<-7Eb;IFcEFdR&zXZyk> zMJ=TM@u1_?AfH#xMb!K6Q|~K}K0}APZ}HWb5`H^1o0+%9Zc&|0Ixlfy_-4-?C%Rmq zwqxt2B$gNY8S051WhCh4>i7B7pH=Y9n+oq`+>BOusR-X!rkdf0H*dZ?llA@Td|}hd zl}DnTh%kIO!O(lpWA=gWieS%+Pg1{1GC3X!i7$i5a!Z71K|gieJk`JZe!h0Yc$&Dh z!(Yc2?ayG)rAR!3>atj0PmEB(L$PfYYbyDw8i+F_pt8Zo-UjvPjq??$-^i7u4N@rhJ(`_zWde#qay@myFl zwU&?Y4z}FC-D=UwPPpp5USSSD>5tZt!1aE^H@=+{j1j`vLnn>+vQ*X*i-nFr5AL@;ma9KUb*?Q9+4xj+A!#RobP(O2bvuV@AXL#xR;S)88SI8| zlcO_(^QWK3%#JoOX-nIZJqv#99qE^FoTasshtRy2yS9^3po=j3teqt{=yPH1rO{_{H0@fRwA0>woTDgG@tMkI`MSguVmF+--nG>U%!wSYOvTvDX$cCOBI`k zNJ96yGkMO~GjYc<1oAi>Ew*+x;!9^D4LWIcVIC#B@19lF=L-JJ*^jvbRbeZm>@d9Z z4CoP>eF}k6S|DG{#Pk5y5iQkQ5fdEtAHbSZbfBZbnFn*46-D}aLOKGO;7oZGqBzsG ziFQ$vBs2=>6Do!ied4%dO%RuLA0|!eXwb9Y`3={^6LXPf@2yANFn{Z20D;gxh_~%` z4PPU%C#&){$4A4nm8RieR!@ae(;+%kyQ%ZZZD? D<0%g1 literal 0 HcmV?d00001 diff --git a/demo/gl-bench.js b/demo/helpers/gl-bench.js similarity index 100% rename from demo/gl-bench.js rename to demo/helpers/gl-bench.js diff --git a/demo/menu.js b/demo/helpers/menu.js similarity index 83% rename from demo/menu.js rename to demo/helpers/menu.js index bb68ee7d..999a1053 100644 --- a/demo/menu.js +++ b/demo/helpers/menu.js @@ -1,3 +1,5 @@ +// @ts-nocheck + let instance = 0; let CSScreated = false; @@ -80,7 +82,7 @@ class Menu { this.instance = instance; instance++; this._maxFPS = 0; - this.hidden = 0; + this.hidden = false; } createMenu(parent, title = '', position = { top: null, left: null, bottom: null, right: null }) { @@ -109,9 +111,11 @@ class Menu { if (title) elTitle.innerHTML = `${title}${svg}`; this.menu.appendChild(elTitle); elTitle.addEventListener('click', () => { - this.container.classList.toggle('menu-container-fadeout'); - this.container.classList.toggle('menu-container-fadein'); - this.menu.style.borderStyle = this.container.classList.contains('menu-container-fadeout') ? 'none' : 'solid'; + if (this.container && this.menu) { + this.container.classList.toggle('menu-container-fadeout'); + this.container.classList.toggle('menu-container-fadein'); + this.menu.style.borderStyle = this.container.classList.contains('menu-container-fadeout') ? 'none' : 'solid'; + } }); this.menu.appendChild(this.container); @@ -129,40 +133,42 @@ class Menu { } get width() { - return this.menu.offsetWidth; + return this.menu?.offsetWidth || 0; } get height() { - return this.menu.offsetHeight; + return this.menu?.offsetHeight || 0; } hide() { - if (this.container.classList.contains('menu-container-fadein')) { + if (this.container && this.container.classList.contains('menu-container-fadein')) { this.container.classList.toggle('menu-container-fadeout'); this.container.classList.toggle('menu-container-fadein'); } } visible() { - return (this.container.classList.contains('menu-container-fadein')); + return (this.container ? this.container.classList.contains('menu-container-fadein') : false); } toggle(evt) { - this.container.classList.toggle('menu-container-fadeout'); - this.container.classList.toggle('menu-container-fadein'); - if (this.container.classList.contains('menu-container-fadein') && evt) { - const x = evt.x || (evt.touches && evt.touches[0] ? evt.touches[0].pageX : null); - // const y = evt.y || (evt.touches && evt.touches[0] ? evt.touches[0].pageY : null); - if (x) this.menu.style.left = `${x - (this.menu.offsetWidth / 2)}px`; - // if (y) this.menu.style.top = '5.5rem'; // `${evt.y + 55}px`; - if (this.menu.offsetLeft < 0) this.menu.style.left = 0; - if ((this.menu.offsetLeft + this.menu.offsetWidth) > window.innerWidth) { - this.menu.style.left = null; - this.menu.style.right = 0; + if (this.container && this.menu) { + this.container.classList.toggle('menu-container-fadeout'); + this.container.classList.toggle('menu-container-fadein'); + if (this.container.classList.contains('menu-container-fadein') && evt) { + const x = evt.x || (evt.touches && evt.touches[0] ? evt.touches[0].pageX : null); + // const y = evt.y || (evt.touches && evt.touches[0] ? evt.touches[0].pageY : null); + if (x) this.menu.style.left = `${x - (this.menu.offsetWidth / 2)}px`; + // if (y) this.menu.style.top = '5.5rem'; // `${evt.y + 55}px`; + if (this.menu.offsetLeft < 0) this.menu.style.left = '0'; + if ((this.menu.offsetLeft + this.menu.offsetWidth) > window.innerWidth) { + this.menu.style.left = ''; + this.menu.style.right = '0'; + } + this.menu.style.borderStyle = 'solid'; + } else { + this.menu.style.borderStyle = 'none'; } - this.menu.style.borderStyle = 'solid'; - } else { - this.menu.style.borderStyle = 'none'; } } @@ -171,7 +177,7 @@ class Menu { el.className = 'menu-title'; el.id = this.newID; el.innerHTML = title; - this.menu.appendChild(el); + if (this.menu) this.menu.appendChild(el); el.addEventListener('click', () => { this.hidden = !this.hidden; const all = document.getElementsByClassName('menu'); @@ -187,7 +193,7 @@ class Menu { el.className = 'menu-item menu-label'; el.id = this.newID; el.innerHTML = title; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); return el; } @@ -195,10 +201,10 @@ class Menu { const el = document.createElement('div'); el.className = 'menu-item'; el.innerHTML = `
${title}`; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); el.addEventListener('change', (evt) => { - object[variable] = evt.target.checked; - if (callback) callback(evt.target.checked); + object[variable] = evt.target?.checked; + if (callback) callback(evt.target?.checked); }); return el; } @@ -215,9 +221,9 @@ class Menu { el.style.fontFamily = document.body.style.fontFamily; el.style.fontSize = document.body.style.fontSize; el.style.fontVariant = document.body.style.fontVariant; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); el.addEventListener('change', (evt) => { - if (callback) callback(items[evt.target.selectedIndex]); + if (callback) callback(items[evt.target?.selectedIndex]); }); return el; } @@ -226,11 +232,13 @@ class Menu { const el = document.createElement('div'); el.className = 'menu-item'; el.innerHTML = `${title}`; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); el.addEventListener('change', (evt) => { - object[variable] = parseInt(evt.target.value) === parseFloat(evt.target.value) ? parseInt(evt.target.value) : parseFloat(evt.target.value); - evt.target.setAttribute('value', evt.target.value); - if (callback) callback(evt.target.value); + if (evt.target) { + object[variable] = parseInt(evt.target?.value) === parseFloat(evt.target?.value) ? parseInt(evt.target?.value) : parseFloat(evt.target?.value); + evt.target.setAttribute('value', evt.target.value); + if (callback) callback(evt.target?.value); + } }); el.input = el.children[0]; return el; @@ -241,7 +249,7 @@ class Menu { el.className = 'menu-item'; el.id = this.newID; if (html) el.innerHTML = html; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); return el; } @@ -254,7 +262,7 @@ class Menu { el.type = 'button'; el.id = this.newID; el.innerText = titleOn; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); el.addEventListener('click', () => { if (el.innerText === titleOn) el.innerText = titleOff; else el.innerText = titleOn; @@ -268,7 +276,7 @@ class Menu { el.className = 'menu-item'; el.id = `menu-val-${title}`; el.innerText = `${title}: ${val}${suffix}`; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); return el; } @@ -285,7 +293,7 @@ class Menu { el.className = 'menu-item menu-chart-title'; el.id = this.newID; el.innerHTML = `${title}`; - this.container.appendChild(el); + if (this.container) this.container.appendChild(el); return el; } diff --git a/demo/worker.js b/demo/index-worker.js similarity index 100% rename from demo/worker.js rename to demo/index-worker.js diff --git a/demo/index.html b/demo/index.html index 507d334c..6f4821c4 100644 --- a/demo/index.html +++ b/demo/index.html @@ -14,9 +14,9 @@ - + - +