Merge pull request #2670 from entrylabs/issue/8013

이슈 8013 처리
entrylabs · Mar 13, 2024 · b69246f · b69246f
2 parents 2eecb19 + f1c9517
commit b69246f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/util/mediaPipeUtils.ts b/src/util/mediaPipeUtils.ts
@@ -454,9 +454,10 @@ class MediaPipeUtils {
                     return;
                 }
 
+                const id = Entry.generateHash();
                 if (sprite) {
                     const returnMessage = ({ data }: MessageEvent) => {
-                        if (data.action === 'sprite_return') {
+                        if (data.action === 'sprite_return' && data.id === id) {
                             this.motionWorker.removeEventListener('message', returnMessage);
                             resolve(data.result);
                         }
@@ -484,6 +485,8 @@ class MediaPipeUtils {
                         maxY,
                     },
                     imageBitmap,
+                    flipState: this.flipState,
+                    id,
                 });
 
                 if (!sprite) {

diff --git a/src/util/workers/newmotion.worker.ts b/src/util/workers/newmotion.worker.ts
@@ -25,7 +25,8 @@ type ImageRange = {
 };
 
 type TMessageData = {
-    action: String;
+    id: string;
+    action: string;
     width?: number;
     height?: number;
     range?: ImageRange;
@@ -99,6 +100,7 @@ function calcMotion(data: TMessageData) {
             motionCanvas.width,
             motionCanvas.height
         ).data;
+        const id = data.id;
         const sprite = data.sprite;
         const flipState = data.flipState;
         let { minX, maxX, minY, maxY } = data.range;
@@ -109,7 +111,7 @@ function calcMotion(data: TMessageData) {
             maxX = motionCanvas.width / 2 + x + (width * scaleX) / 2;
             minY = motionCanvas.height / 2 - y - (height * scaleY) / 2;
             maxY = motionCanvas.height / 2 - y + (height * scaleY) / 2;
-            if (isFlipState(flipState, 'horizontal')) {
+            if (!isFlipState(flipState, 'horizontal')) {
                 const tempMinX = minX;
                 minX = motionCanvas.width - maxX;
                 maxX = motionCanvas.width - tempMinX;
@@ -220,9 +222,9 @@ function calcMotion(data: TMessageData) {
             },
         };
         if (sprite) {
-            ctx.postMessage({ action: 'sprite_return', result });
+            ctx.postMessage({ id, action: 'sprite_return', result });
         } else {
-            ctx.postMessage({ action: 'next_detect_motion', result });
+            ctx.postMessage({ id, action: 'next_detect_motion', result });
         }
     } catch (e) {
         console.error(e);

diff --git a/types/entry.d.ts b/types/entry.d.ts
@@ -110,6 +110,7 @@ export declare interface IEntry extends EntryOptions {
     expansionBlocks: any;
     aiUtilizeBlocks: any;
     hardwareLiteBlocks: any;
+    generateHash: () => string;
 }
 
 declare type IHardwareType = 'serial' | 'bluetooth' | 'hid' | 'ble';