From 7cec4983a3a1881dd8c0b4a4366441ce828d37be Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 19 十月 2024 10:53:17 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/tool.js | 106 ++++++++++++++++++++++++-----------------------------
1 files changed, 48 insertions(+), 58 deletions(-)
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 9bb38d2..bac077c 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -4,6 +4,7 @@
DEVICE_TYPE,
DEVICE_Z_INDEX,
AGV_STATUS_MODE,
+ DEVICE_SELECTED_EFFECT_PADDING,
} from './constants';
import shelf from '/map/shelf.svg';
@@ -20,7 +21,7 @@
import ctuLoadedFullBattery from '/map/agv/ctuLoadedFullBattery.svg';
let app, mapContainer, themeMode;
-let selectedSprite, effectTick, effectHalfCircle, effectRectangle;
+let selectedSprite, effectCircle, effectTicker;
export function getApp() {
return app;
@@ -102,7 +103,7 @@
break;
}
if (sprite && deviceType !== DEVICE_TYPE.AGV) {
- sprite.blendMode = PIXI.BLEND_MODES.MULTIPLY;
+ // sprite.blendMode = PIXI.BLEND_MODES.MULTIPLY;
}
return sprite;
}
@@ -334,79 +335,68 @@
if (!sprite?.texture || !sprite?.texture?.valid) {
return;
}
+
const { width, height } = sprite;
- const scale = sprite.scale.x;
- const sideLen = (Math.max(width, height) + 10) * scale;
- const color = themeMode === 'light' ? 0x273c75 : 0xffffff;
+ const maxDimension = Math.max(width, height);
+ const radius = (maxDimension / 2) + (DEVICE_SELECTED_EFFECT_PADDING[sprite.data?.type] || 10);
- effectHalfCircle = new PIXI.Graphics();
- effectHalfCircle.beginFill(color);
- effectHalfCircle.lineStyle(2 * scale, color);
- effectHalfCircle.arc(0, 0, sideLen, 0, Math.PI);
- effectHalfCircle.endFill();
- effectHalfCircle.position.set(sprite.x, sprite.y);
- effectHalfCircle.scale.set(1 / scale);
- effectHalfCircle.zIndex = 9999;
+ const color = themeMode === 'light' ? '#40739e' : '#718093';
+ const alpha = 1;
- effectRectangle = new PIXI.Graphics();
- effectRectangle.lineStyle(5 * scale, color, 1);
- effectRectangle.drawRoundedRect(0, 0, sideLen, sideLen, 16 * scale);
- effectRectangle.endFill();
- effectRectangle.mask = effectHalfCircle;
- effectRectangle.zIndex = 9999;
+ effectCircle = new PIXI.Graphics();
+ effectCircle.beginFill(color, alpha);
+ effectCircle.drawCircle(0, 0, radius);
+ effectCircle.endFill();
+ effectCircle.position.set(sprite.x, sprite.y);
+ effectCircle.zIndex = -1;
+ effectCircle.blendMode = PIXI.BLEND_MODES.NORMAL;
- const scaledWidth = sideLen * (1 / scale);
- const scaledHeight = sideLen * (1 / scale);
-
- effectRectangle.scale.set(1 / scale);
- effectRectangle.position.set(sprite.x - scaledWidth / 2, sprite.y - scaledHeight / 2);
-
- mapContainer.addChild(effectRectangle);
- mapContainer.addChild(effectHalfCircle);
+ mapContainer.addChild(effectCircle);
selectedSprite = sprite;
- let phase = 0;
- effectTick = (delta) => {
- phase += delta / 10;
- phase %= (Math.PI * 2);
- if (effectHalfCircle) {
- effectHalfCircle.rotation = phase;
+ let pulseScale = 1;
+ let scalingUp = true;
+ effectTicker = (delta) => {
+ const pulseSpeed = 0.003 * delta;
+ if (scalingUp) {
+ pulseScale += pulseSpeed;
+ if (pulseScale >= 1.1) {
+ scalingUp = false;
+ }
+ } else {
+ pulseScale -= pulseSpeed;
+ if (pulseScale <= 1) {
+ scalingUp = true;
+ }
}
+ effectCircle.scale.set(pulseScale);
+ effectCircle.position.set(sprite.x, sprite.y);
};
- app.ticker.add(effectTick);
-}
+ app.ticker.add(effectTicker);
+};
export const removeSelectedEffect = () => {
- if (effectTick) {
- app.ticker.remove(effectTick);
+ if (effectTicker) {
+ app.ticker.remove(effectTicker);
+ effectTicker = null;
}
- if (effectHalfCircle) {
- mapContainer.removeChild(effectHalfCircle);
- effectHalfCircle = null;
- }
- if (effectRectangle) {
- mapContainer.removeChild(effectRectangle);
- effectRectangle = null;
+ if (effectCircle) {
+ mapContainer.removeChild(effectCircle);
+ effectCircle.destroy();
+ effectCircle = null;
}
selectedSprite = null;
-}
+};
-export const updateEffect = (sprite) => {
- if (!sprite || sprite !== selectedSprite || !effectRectangle || !effectHalfCircle) {
- return
+export const updateEffect = () => {
+ if (!selectedSprite || !effectCircle) {
+ return;
}
- const { width, height } = sprite;
- const scale = sprite?.scale.x;
- const sideLen = (Math.max(width, height) + 10) * scale;
- const scaledWidth = sideLen * (1 / scale);
- const scaledHeight = sideLen * (1 / scale);
-
- effectRectangle.position.set(sprite.x - scaledWidth / 2, sprite.y - scaledHeight / 2);
-
- effectHalfCircle.position.set(sprite.x, sprite.y);
-}
+ // 鏇存柊鍦嗙殑浣嶇疆锛岀‘淇濊窡闅弒prite
+ effectCircle.position.set(selectedSprite.x, selectedSprite.y);
+};
export const multipleSelectEnhancer = (selectedSprites, setCurSprite, setBatchSprites) => {
selectedSprites = selectedSprites.filter(sprite => sprite.data?.type);
--
Gitblit v1.9.1