From 016661423b302199183211347bfe391e9d229938 Mon Sep 17 00:00:00 2001
From: Junya Ishihara <junya@champierre.com>
Date: Wed, 17 Jul 2024 17:45:27 +0900
Subject: [PATCH] fixup

---
 sample_projects/handpose.sb3                  | Bin 39520 -> 41110 bytes
 .../scratch3_handpose2scratch/index.js        |  75 +++++++++---------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/sample_projects/handpose.sb3 b/sample_projects/handpose.sb3
index 06b6e97e045a44e09943be5b2c7bc1fcd3bd58e8..3ef4869258dca0672b6a7676c7ea847db78302cc 100644
GIT binary patch
delta 3992
zcma)9XHXN|whc|HBuG(u@5M+*dKJL{5eQQJLXAif5C~wD(2-suARQ!tbT#xQNbkK!
z550&WQUnQH{N9`S?!EJVynW`(K4;I`=bV|fX3ngoO5)^JVziMy2`Lo-0H6SPtNwTt
z$R|<yf(8KiEeil#C4l>LHzx->F9|14w`aSS`o;$f%$Fi8@F%qqtF(<PIb2jcK3XH{
z{cEH=+^u|bBii#`1@k`jo5k~96W&kGTr;)~?G8yz-t9$zRu@gp1O&r9v-<W<GX;m}
z1>g2;L9AKOj}8$*Jvv`k(*RLvFMy=rq@5OL7Zs+KvkVE(M&hNp9y@@secQ{XRqq&j
zvS%I@jvBv@EQas0=QJzRy{M<%yOCydT-u>I8S?eWDridl^5=OM`tp=he$Hg|!FR1O
z#SF^u7=L<Nk1(SCN{T(QgqEinH#DUq^xyIQAXN_$LW78jueXCcT6@?Nu4#IP*0r84
z*CU=6lonA6@efyg5K<3SiJSZ&#6hb(N%A)L$mB=x>g^%4pP#?K-^CcYdK=$Oo3>J2
zN+sR|rM`Gl!-#jJz7hGlVT97nfSoq(t=-AQC@K7bi9AEl@-3^vk^s^<HkA&KpvtW}
zmy(>SYBWCzZj6v<DPv@OMtayNLHuf+p5CjTg~?&b0nQW%8&R0pd_L^`g(7OytqsJS
zZ1T3icG4{jp)Kk|1hUx3nE5skk3D8syJH=k+%DWnZ0TVDRZ*wbN9;Lr-@*e>9&kE|
zbbeeTIfTZ+q=UAw<|9CT+>Dfq>D;`hYcz#`R+ILE70D1ne`*b|Ow|VoSlkFuIecn2
zOk9k0ho~on%7Surx92i^N^4?NqYW^IM~<(R^CODoD6<D$Yz8N&tv}7|Ho1!TsL{bI
zVweP-f_*X}WhmMj<Ar5siV^LHL^Nq$!0<6b#Fx1Kzk+l(kUt33SWq*rhumB|TAB-8
zu+Z<|M6E8>%yj2lm#ttZ!FIJ0)He#Kp^OZTHTCQcr3HrghtWlA)Vp_C%Z_~99y!&%
zF~ba;TN-YahgHl@1P<wM<^A$I$P*o2C`RX>y8sN-^z6-Q$b7b(u5r;2eStfg7pIiU
zTRFx^r$TlfMVDK7cD4@Uu~J5n3nu8L`)4`cTkjJGhblWGw>SfB!QI*~CiVlwf6pc?
z-GRX;^4%=B%}yVR>c%yNJ=;nOHQTEn$gTQxsq)L|Ba0VPNMKd+yrAbfK}6}sE)vfO
zab`{Cr13i^@)taD9Xc}ES2_2sJvNP2+^$~4DH1b>Bk#Q#o2u9hrc)17$#p|B_VMzz
zNHpdY6_g8KXZIpnH6_<nRCD5f%AW~I-gqZT6#apiKOpJ$@>(yHhomb4a81On=Ub@X
zLVvK<>`fCYd^1Xj+e}@UZ_|i#7{mY}yAHAN%@0N4Qe17^q?b>nWYI90C`f}Do3351
z^RiO5zU%?nExtOxH^YWRBTDGz+)%|F$R5jV5`+2k3YO<dj3()1QJ9VR<L6WfhG{l2
zgWZ70@kh#!;yVeU<z%<^Ap4!u=Z=r@yXOxGw>O#ZXZCH@o#|Ka$7+)kqvQfef~S|u
zz21o4jMeMO@DBMrW5fPV?fYRq;wPW3vn=BWqi(#5pIJAz_Xj`eR~h|iIWAX|b^nf+
zD-R_h***_HQr~BdA&lLPZHN<J73nj~NsWbPs`arQ62(SMaB-BKyHC8YFQ)Hk{VF{q
zWoX_USlG@`#FN?@;3k0xmRg_t;NCavh^tyU^~hgm78Jm%)s8~t-hK>4oU&+!F1f72
zgv@OOfGH!HVo~F#ZTMQW{A25KRj0?PX;78KPO?b5!~lg&a;9s@P{!4VLf7q!h?Wd9
zq}{>wyIegRv11ih)TZ)vZ0iER6^itd7pN8EqOBu7xGBZUQRLpI6Yx=cO?FnXYyO@c
zInZ=BrKtU7c_I0CJ!tmgO|i4nFfT-}@heCl7k{Ot&JOV{<+KGf0I2+nRj@B7(*gIO
zIX<Kv89gM!MaFCTnzrp1qv!h3?w$<Eg{16I_Y=R)9T(e#_m;oQ)PuTXn(ZS5z!hwD
zL|caG$-+Wjygmsrg8H82=}g8Q_){UcY{Nk=5_8L2M3_dzmsSuFr{}q`xTIx$`jn|f
zPw~X*q_Djp)i?|-`K5-@$-><*LpLFrzECD@$J;kYF$l10O1@oLA*a7+mJ7j>CHFnU
z?VgaK;VuqE2|prz7ad!*7byJ;%f>bs#@xI)-Zo%{8I^yK-?>S*!Nk-}_@;rBE|DE~
zbSjYb>fak4w~vZ1Q6T!(mzx>c>8m`NfBB(lZ0p(=s^cv5HtC0%mlj460s=`<MW4%4
z(!#}yIeN4{R!Q-!7C2)9gM*v7g6~VhX*hkqMlW!pXw}jeB)TRAf*<Vv7)SZCoy?7X
z{CMYZvFiBM_a1=os7^Ov7Y|7!8YNy7BrywW5G3KlrUZVdRsa>7eLWt`&3T})CMwLH
zZ%{tnSEW9U?)8Lt8miL5Y#ViMktd-n+<_WcT~;FQG*wwj4J=tRP~++la&F1l^CK;%
z)~R%FDHR{CM>V0grjsY7v=q0~*~=}7!wL>dJ*lFW^=Cw|Eg%LC$}uJO&Im9WsZx+W
z9o@}9z6dTCw-T}RooN_1=rLoEyHoKwe(kj4>L<B88#kfT)u9Q$1$_<TYdxTA342d*
zPpYzIKk+cLfQr%f%dhbA-YJy$UNHzZ)E@8WFhb&oPOn6!bnO#SR%n@%f0={Q?Z7tD
zAcGe;Ib6~}f=s0PJvWbf2Wgl4g`vOZoa*9=1?SJT9aby6^316GZlb%(=A9y9f^MY8
zNTM<GY|6G-v6$^4YPm8dB@1zZ+Xg5lKw(C_G<jjqOecJ<Z0b0qnv(|DokxJea|e)5
zz2djap_fqJ@L9aBK06{QJ3OtHAn!ZA>-Rob1wM}M>@tpv){kLZp<FyUx{tG1pXX%h
zHkCEHR8MnVIpV~ceug4l9t`wvzEN;MyZO{a_)?v~6TSOGVd<iZ&w~pa&NMGpmw3K%
zB$Axfk4II^Ehv^$joIOg7R0=LQ29=gx0Ab&GHm1LNEEOKBsvk7aHGy;j~jv*o8cx+
z*j47_&{uXSkJQ_fWzfIV)^N?O6l$ei_9^gqLGscS+Z1k(O`1W`LO*Td-qoVfxLsv?
z(ptAY1+`vNR2<8b?S^)BF?H;Zz`uZ~wR>Nb-^7>HI_;U#8=fS&lqV>;+RqB6+_%f1
z{@S#x#saT8iFJGM{bIp$7MRqKzoYqZzOa0*B+P29VOJU3<lk`2F<R?fbCOK?8G&+p
z^+H0YYeMKwB$ak^{}Y}kGteV+r)hTnMxJoC|CjA8OpD|1WifnetXx+4z;ChcvdK*x
zmp5_~*8&F0wz^6h{1VZcuuSiC4)1CJez(In-+JXF+C19vwQ{2A+pg739A~<gXc91+
zC1Ka1AnPue11Ukt?Oil42VHCHMK&AhIpVFp!t;5yW^u<R+HZg>7whQnnamsq{k1Di
zowtkX<KUlPzMk{iJ>VX-hQppkrn05*j*CH^t5<pmF#mfy;$?F=nt}n!Z&e3)6gloR
zwAm!)5`x~3PyV8z;2+fyk#huA!0NbRg{oNQW_Ys)KcVYjp!XebYZH=tM42suQurJD
zNLJI0SJTQ{&QoMVgEMIN{%?97fqg=|*3qj-OYtggcx^cELu^b7-2fkJIPWOUVtAhD
z)>MeynAxzCAYoRQKP?JT*@hnyew58#u>#o+i@2n?*D-%+)V!ZTxmAJpmEB@L*X=HS
zURGoe^Ygu{M>82_*QiTYP`K=^B0{dK)YcxIr+nhB6<J9q&x4L>@{{Ko*msrpPmro3
zTU@4I*;m5YJ|#A|_wGqd1xtKU!cVj7juq$E;4)leScmHl<Y91g^BN7FDa(~S)^M6R
z;mr9g-(b}CgzJ|Iq2BLt-_@H1%(-1JrNi9=bO|ekvLV6wkAG7OV;Ycsh^C)qNb1k9
zhERHQXpTo9Mhl%xY7-O_vII|D)eKm<pLl`(t(DD8H=<&*#T7G_3pS9ViMhvvXP$s+
zfi*xhnsf{U@pQ@ak5FWK(<3I#2P<<epB!}Usi)KAD{cTHc7$OH+jjV+GJCKfOZm?&
zadhhm6QZHsC1|ch4t+9|vZ30fbV*qAL8JUGlvQ@N&_c>!+=v>}z$6V;oJ-Df{o4(e
z$Smfti;34^#G3j;z1xk{GM`t%Dmda}?3g*MTV4{f!F_<?JT;k|K*W>v4bMT_NLsLh
zJ}Ze=Y03{FookxvCE$s@>1Va;O8&T+M=*wG*|cHRO6CUfrp8hhsx_maiC!kQ>E4u@
z^6GsfJ(5D!QlFjo)E-F6U(qh#$M{(JQpF7gOnb7(s~PI9R~rNlPc~XcB$s=)s2G4J
z{oQvZ1=TU1FGx`@&u{;SdBIszcoCCaxft9ORZ`TS1;#CT^zVXJN*EFP-+j)#soRB6
zA^<>=7y#hA@;Ns4a`tvIckFBs_Ht4V@{)22;HxYpWeaw&v6YgNk?=%5aedh5)CLAM
zo`{A#e+nFFLoQEGE4)cG5;_EpI=i!VFhTiwg^>p*k5%=ANdu7y2p<Hj*UB<?wq{hK
ztLg*|(R(`OjirwG$awvh9RtWW1S`jXv_=;%cwZyjGTOo>Q~GXK1~__ExQnyn@ia-e
zgaTsVdfsmaMZW{@*gSrns(91guEwNyC>cPO)F-tzCUGd5*UQ7i)?chw-(kR1(^LFz
zyR|mJf=0u5iXp$-!!DG*n$edKVgx%<)Urfp*ymQi0?h!=knq`)8WL4&6XK`w@$#>8
zO(`Y)bba3fa04E-JW*Wt!Nmp3P01YVNV4R|hNnd*&+J*>X2@Na+`!Q<QS0E(9|x9R
z`2NM>;BwdUBc$@H^;vD0YN?G_?4^_B+2XL5g`TBI;NU}HkmJP9Z&Ry%tCC!pjypJs
z&k;W-t=eC{U{N`+XXs2hg4+;CjP!|!836y6|HLf675ke*x>QzTEDgquLO|@l(ds|e
zGGI{vfLP-Huy{q}{{|}%6Oby&^~ch_9t06#uFAbv^AFYk1TGEZpDcj+l}htBP#MeQ
wY4~rN_y_np9mAI<g!s>={<nnwfiq|R{{&^EPj>B3*R`uLesyta)}P(K055P=I{*Lx

delta 2379
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
aBuqM$Gfz$c0{yuPIr2y_2-K7Dv-=yWSY8?c

diff --git a/scratch-vm/src/extensions/scratch3_handpose2scratch/index.js b/scratch-vm/src/extensions/scratch3_handpose2scratch/index.js
index 4590360..b3c8ae2 100644
--- a/scratch-vm/src/extensions/scratch3_handpose2scratch/index.js
+++ b/scratch-vm/src/extensions/scratch3_handpose2scratch/index.js
@@ -3,18 +3,19 @@ const BlockType = require('../../extension-support/block-type');
 const Cast = require('../../util/cast');
 const formatMessage = require('format-message');
 
+// eslint-disable-next-line max-len
 const blockIconURI = 'data:image/png;base64,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';
 
 const Message = {
   getX: {
-    'ja': '[HAND_NUMBER] つ目の [LANDMARK] のx座標',
-    'ja-Hira': '[HAND_NUMBER] つめの [LANDMARK] のxざひょう',
-    'en': 'x of [LANDMARK] of hand no. [HAND_NUMBER]'
+    'ja': '[HAND] つ目の [KEYPOINT] のx座標',
+    'ja-Hira': '[HAND] つめの [KEYPOINT] のxざひょう',
+    'en': 'x of [KEYPOINT] of hand no. [HAND]'
   },
   getY: {
-    'ja': '[HAND_NUMBER] つ目の [LANDMARK] のy座標',
-    'ja-Hira': 'みぎ [LANDMARK] のyざひょう',
-    'en': 'y of [LANDMARK] of hand no. [HAND NUMBER]'
+    'ja': '[HAND] つ目の [KEYPOINT] のy座標',
+    'ja-Hira': 'みぎ [KEYPOINT] のyざひょう',
+    'en': 'y of [KEYPOINT] of hand no. [HAND NUMBER]'
   },
   videoToggle: {
     'ja': 'ビデオを [VIDEO_STATE] にする',
@@ -51,7 +52,7 @@ const Message = {
     'ja-Hira': 'じゅんびにじかんがかかります。すこしのあいだ、そうさができなくなりますがおまちください。',
     'en': 'Setup takes a while. The browser will get stuck, but please wait.'
   },
-  landmarks: [
+  keypoints: [
     {
       'ja': '手首',
       'ja-Hira': 'てくび',
@@ -162,7 +163,7 @@ const Message = {
 const AvailableLocales = ['en', 'ja', 'ja-Hira'];
 
 class Scratch3Handpose2ScratchBlocks {
-  get HAND_NUMBERS_MENU() {
+  get HANDS_MENU() {
     return [
       {
         text: '1',
@@ -207,12 +208,12 @@ class Scratch3Handpose2ScratchBlocks {
     ]
   }
 
-  get LANDMARK_MENU() {
-    const landmark_menu = [];
+  get KEYPOINTS_MENU() {
+    const keypoints = [];
     for (let i = 1; i <= 21; i++) {
-      landmark_menu.push({ text: `${Message.landmarks[i - 1][this._locale]} (${i})`, value: String(i) })
+      keypoints.push({ text: `${Message.keypoints[i - 1][this._locale]} (${i})`, value: String(i) })
     }
-    return landmark_menu;
+    return keypoints;
   }
 
   get VIDEO_MENU() {
@@ -281,7 +282,7 @@ class Scratch3Handpose2ScratchBlocks {
   constructor(runtime) {
     this.runtime = runtime;
 
-    this.landmarks = [];
+    this.keypoints = [];
     this.ratio = 0.75;
 
     const loadScriptSynchronously = (url) => {
@@ -301,7 +302,7 @@ class Scratch3Handpose2ScratchBlocks {
       console.log("Model loaded!")
       handpose.detectStart(this.video, (results) => {
         this.hands = results;
-      });  
+      });
     });
 
     this.runtime.ioDevices.video.enableVideo().then(() => {
@@ -324,14 +325,14 @@ class Scratch3Handpose2ScratchBlocks {
           blockType: BlockType.REPORTER,
           text: Message.getX[this._locale],
           arguments: {
-            HAND_NUMBER: {
+            HAND: {
               type: ArgumentType.STRING,
-              menu: 'handNumbers',
+              menu: 'handsMenu',
               defaultValue: '1'
             },
-            LANDMARK: {
+            KEYPOINT: {
               type: ArgumentType.STRING,
-              menu: 'landmark',
+              menu: 'keypointsMenu',
               defaultValue: '1'
             }
           }
@@ -341,14 +342,14 @@ class Scratch3Handpose2ScratchBlocks {
           blockType: BlockType.REPORTER,
           text: Message.getY[this._locale],
           arguments: {
-            HAND_NUMBER: {
+            HAND: {
               type: ArgumentType.STRING,
-              menu: 'handNumbers',
+              menu: 'handsMenu',
               defaultValue: '1'
             },
-            LANDMARK: {
+            KEYPOINT: {
               type: ArgumentType.STRING,
-              menu: 'landmark',
+              menu: 'keypointsMenu',
               defaultValue: '1'
             }
           }
@@ -393,9 +394,9 @@ class Scratch3Handpose2ScratchBlocks {
         }
       ],
       menus: {
-        landmark: {
+        keypointsMenu: {
           acceptReporters: true,
-          items: this.LANDMARK_MENU
+          items: this.KEYPOINTS_MENU
         },
         videoMenu: {
           acceptReporters: true,
@@ -409,35 +410,35 @@ class Scratch3Handpose2ScratchBlocks {
           acceptReporters: true,
           items: this.INTERVAL_MENU
         },
-        handNumbers: {
+        handsMenu: {
           acceptReporters: true,
-          items: this.HAND_NUMBERS_MENU
+          items: this.HANDS_MENU
         },
       }
     };
   }
 
   getX(args) {
-    let landmark = parseInt(args.LANDMARK, 10) - 1;
-    let hand = parseInt(args.HAND_NUMBER, 10) - 1;
-    if (this.hands?.[hand]?.keypoints?.[landmark]) {
+    let keypoint = parseInt(args.KEYPOINT, 10) - 1;
+    let hand = parseInt(args.HAND, 10) - 1;
+    if (this.hands?.[hand]?.keypoints?.[keypoint]) {
       if (this.runtime.ioDevices.video.mirror === false) {
-        return -1 * (240 - this.hands[hand].keypoints[landmark].x * this.ratio);
+        return -1 * (240 - this.hands[hand].keypoints[keypoint].x * this.ratio);
       } else {
-        return 240 - this.hands[hand].keypoints[landmark].x * this.ratio;
+        return 240 - this.hands[hand].keypoints[keypoint].x * this.ratio;
       }
     } else {
-      return null;
+      return '';
     }
   }
 
   getY(args) {
-    let landmark = parseInt(args.LANDMARK, 10) - 1;
-    let hand = parseInt(args.HAND_NUMBER, 10) - 1;
-    if (this.hands?.[hand]?.keypoints?.[landmark]) {
-      return 180 - this.hands[hand].keypoints[landmark].y * this.ratio;
+    let keypoint = parseInt(args.KEYPOINT, 10) - 1;
+    let hand = parseInt(args.HAND, 10) - 1;
+    if (this.hands?.[hand]?.keypoints?.[keypoint]) {
+      return 180 - this.hands[hand].keypoints[keypoint].y * this.ratio;
     } else {
-      return null;
+      return '';
     }
   }