From 80df92086c27146d992fa8cb91c4d154a6c2c45c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 05 三月 2024 16:56:22 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/player.js |   99 +++++++++++++++++++++++++++++++------------------
 1 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index 55784c0..9f3cbee 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -1,10 +1,12 @@
 import * as PIXI from 'pixi.js';
 import * as TWEEDLE from 'tweedle.js';
+import * as Utils from './utils'
 
 export default class Player {
 
-    constructor(dom, dark) {
+    constructor(dom, dark, didClickSprite) {
         this.darkModel = dark;
+        this.didClickSprite = didClickSprite;
         // init
         this.app = generatePixiApp(dark);
         dom.appendChild(this.app.view);
@@ -17,23 +19,43 @@
             event.preventDefault();
         });
 
-        this.scale = 1; // 缂╂斁
         this.pan = false; // 骞崇Щ
 
-        // func
-        this.app.view.addEventListener('mousedown', (event) => {
-            // left
-            if (event.button === 0) {
-                this.mapSelect(event);
-            }
-            // right
-            if (event.button === 2) {
-                this.mapPan(event);
-            }
-        })
+        this.activateMapEvent(null, Utils.MapEvent.PAN);
         this.activateMapScale();
         this.showCoordinates();
         this.appTicker();
+    }
+
+    activateMapEvent = (leftEvent, rightEvent) => {
+        if (this.mapEvent) {
+            this.app.view.removeEventListener('mousedown', this.mapEvent);
+        }
+
+        this.mapEvent = (event) => {
+            // left
+            if (event.button === 0 && leftEvent) {
+                switch (leftEvent) {
+                    case Utils.MapEvent.SELECTION_BOX:
+                        this.mapSelect(event);
+                        break
+                    default:
+                        break
+                }
+            }
+            // right
+            if (event.button === 2 && rightEvent) {
+                switch (rightEvent) {
+                    case Utils.MapEvent.PAN:
+                        this.mapPan(event);
+                        break
+                    default:
+                        break
+                }
+            }
+        }
+
+        this.app.view.addEventListener('mousedown', this.mapEvent)
     }
 
     mapSelect = (event) => {
@@ -49,10 +71,8 @@
 
         isSelecting = true;
 
-        this.app.view.addEventListener('mousemove', (event) => {
-            console.log(1);
-            if (isSelecting) {
-
+        const handleMouseMove = (event) => {
+            if (isSelecting && !this.didClickSprite) {
                 // end
                 const endPoint = new PIXI.Point();
                 this.app.renderer.events.mapPositionToPoint(endPoint, event.clientX, event.clientY);
@@ -67,7 +87,9 @@
                 selectionBox.drawRect(Math.min(selectionStart.x, selectionEnd.x), Math.min(selectionStart.y, selectionEnd.y), width, height);
                 selectionBox.endFill();
             }
-        });
+        }
+
+        this.app.view.addEventListener('mousemove', handleMouseMove);
 
         this.app.view.addEventListener('mouseup', (event) => {
             if (isSelecting) {
@@ -83,24 +105,7 @@
                 // console.log('Selected Sprites:', selectedSprites);
             }
 
-            this.app.view.removeEventListener('mousemove'); 
-        });
-    }
-
-    activateMapScale = () => {
-        this.app.view.addEventListener('wheel', (event) => {
-            event.preventDefault();
-            const delta = Math.sign(event.deltaY);
-
-            if (delta === 1) {
-                this.scale *= 0.9;
-            } else if (delta === -1) {
-                this.scale *= 1.1;
-            }
-            this.mapContainer.scale.set(this.scale);
-            this.mapContainer.children.forEach(child => {
-                // child.scale.set(1 / this.scale); // 闃叉鍥炬爣鍙樺皬
-            })
+            this.app.view.removeEventListener('mousemove', handleMouseMove);
         });
     }
 
@@ -122,6 +127,24 @@
         this.app.view.addEventListener('mouseup', () => {
             this.app.view.removeEventListener('mousemove', mouseMoveHandler);
             this.pan = false;
+        });
+    }
+
+    activateMapScale = () => {
+        this.scale = 1; // 缂╂斁
+        this.app.view.addEventListener('wheel', (event) => {
+            event.preventDefault();
+            const delta = Math.sign(event.deltaY);
+
+            if (delta === 1) {
+                this.scale *= 0.9;
+            } else if (delta === -1) {
+                this.scale *= 1.1;
+            }
+            this.mapContainer.scale.set(this.scale);
+            this.mapContainer.children.forEach(child => {
+                // child.scale.set(1 / this.scale); // 闃叉鍥炬爣鍙樺皬
+            })
         });
     }
 
@@ -182,6 +205,10 @@
         }
     }
 
+    updateDidClickSprite = (value) => {
+        this.didClickSprite = value;
+    }
+
     appTicker = () => {
         TWEEDLE.Group.shared.update();
     }

--
Gitblit v1.9.1