From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/player.js | 101 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index ac503af..ea4a8dc 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -5,10 +5,9 @@
export default class Player {
- constructor(dom, dark, didClickSprite) {
+ constructor(dom, dark) {
// not dynamic
this.darkModel = dark;
- this.didClickSprite = didClickSprite;
// init
this.app = generatePixiApp(dark);
dom.appendChild(this.app.view);
@@ -18,35 +17,28 @@
this.mapContainer = generatePixiContainer('mapContainer');
this.app.stage.addChild(this.mapContainer);
- // this.activateMapEvent(null);
this.activateMapScale();
this.activateMapPan();
this.showCoordinates();
this.getStartedTicker();
}
- activateMapEvent = (leftEvent, rightEvent) => {
+ activateMapEvent = (eventType, fn) => {
if (this.mapEvent) {
this.mapContainer.parent.off('mousedown');
this.mapEvent = null;
- if (this.selectedSprites && this.selectedSprites.length > 0) {
- this.selectedSprites.forEach(child => {
- Utils.unMarkSprite(child);
- })
- }
+ // if (this.selectedSprites && this.selectedSprites.length > 0) {
+ // this.selectedSprites.forEach(child => {
+ // Utils.unMarkSprite(child);
+ // })
+ // }
}
this.mapEvent = (event) => {
- if (leftEvent && event.button === 0) {
- switch (leftEvent) {
+ if (eventType && event.button === 0) {
+ switch (eventType) {
case Utils.MapEvent.SELECTION_BOX:
- this.mapSelect(event);
+ this.mapSelect(event, fn);
break
- default:
- break
- }
- }
- if (rightEvent && event.button === 2) {
- switch (rightEvent) {
default:
break
}
@@ -55,7 +47,7 @@
this.mapContainer.parent.on('mousedown', this.mapEvent)
}
- mapSelect = (event) => {
+ mapSelect = (event, fn) => {
let isSelecting = false;
if (!this.selectionBox) {
this.selectionBox = new PIXI.Graphics();
@@ -67,10 +59,22 @@
this.app.renderer.events.mapPositionToPoint(startPoint, event.clientX, event.clientY);
let selectionStart = { x: startPoint.x, y: startPoint.y };
- isSelecting = true;
+ // avoid trigger sprite event
+ let hasHitSprite = false;
+ for (let child of this.mapContainer.children) {
+ if (child.data?.uuid) {
+ if (child.getBounds().contains(selectionStart.x, selectionStart.y)) {
+ hasHitSprite = true; break;
+ }
+ }
+ }
+
+ if (!hasHitSprite) {
+ isSelecting = true;
+ }
const handleMouseMove = (event) => {
- if (isSelecting && !this.didClickSprite) {
+ if (isSelecting) {
// select end pos
const endPoint = new PIXI.Point();
this.app.renderer.events.mapPositionToPoint(endPoint, event.clientX, event.clientY);
@@ -91,14 +95,9 @@
this.mapContainer.parent.on('mouseup', (event) => {
if (isSelecting) {
- // sprite show style which be selected
- if (this.selectedSprites && this.selectedSprites.length > 0) {
- this.selectedSprites.forEach(child => {
- Utils.unMarkSprite(child);
- })
- }
- this.selectedSprites = [];
+ this.clearSelectedSprites();
+ // sprite show style which be selected
this.mapContainer.children.forEach(child => {
if (Utils.isSpriteInSelectionBox(child, this.selectionBox)) {
this.selectedSprites.push(child);
@@ -108,15 +107,28 @@
isSelecting = false;
this.selectionBox.clear();
- // sprites batch move
- Utils.spriteListBeMovable(this.selectedSprites, this.scale, () => {
- this.activateMapEvent(Utils.MapEvent.SELECTION_BOX);
- });
+ // after selectbox complete
+ if (fn) {
+ fn(this.selectedSprites, () => {
+ // trigger at end of selectionBox when fn happen mouseup
+ this.selectedSprites = [];
+ this.activateMapEvent(Utils.MapEvent.SELECTION_BOX, fn);
+ });
+ }
}
this.mapContainer.parent.off('mousemove', handleMouseMove);
});
+ }
+
+ clearSelectedSprites = () => {
+ if (this.selectedSprites && this.selectedSprites.length > 0) {
+ this.selectedSprites.forEach(child => {
+ Utils.unMarkSprite(child);
+ })
+ }
+ this.selectedSprites = [];
}
activateMapPan = () => {
@@ -149,6 +161,9 @@
this.scale = 1;
this.app.view.addEventListener('wheel', (event) => {
event.preventDefault();
+ if (this.scale !== this.mapContainer.scale.x) {
+ this.scale = this.mapContainer.scale.x;
+ }
const delta = Math.sign(event.deltaY);
@@ -167,7 +182,6 @@
this.scale = newScale;
this.mapContainer.scale.set(this.scale);
- console.log(this.scale);
this.mapContainer.children.forEach(child => {
// child.scale.set(1 / this.scale); // 闃叉鍥炬爣鍙樺皬
@@ -177,7 +191,7 @@
showCoordinates = () => {
const coordinatesText = new PIXI.Text('{ x: 0, y: 0 }', {
- fill: 0x000000,
+ fill: this.darkModel ? 0xffffff : 0x000000,
fontSize: 13,
fontFamily: 'MicrosoftYaHei',
fontWeight: 'bold',
@@ -195,17 +209,18 @@
}
showGridlines = () => {
+ this.hideGridlines();
if (!this.gridLineContainer) {
this.gridLineContainer = generatePixiContainer('gridLineContainer');
this.app.stage.addChild(this.gridLineContainer);
}
const inte = 30;
- const lineDefaultAlpha = .5;;
+ const lineDefaultAlpha = .1;;
const lineDefaultColor = 0x000000;
for (let i = 0; i < this.app.view.width / inte; i++) {
const graphics = new PIXI.Graphics();
- graphics.lineStyle(.3, lineDefaultColor, lineDefaultAlpha);
+ graphics.lineStyle(1, lineDefaultColor, lineDefaultAlpha);
graphics.beginFill(lineDefaultColor);
graphics.moveTo(i * inte, 0);
graphics.lineTo(i * inte, this.app.view.height);
@@ -215,7 +230,7 @@
for (let i = 0; i < this.app.view.height / inte; i++) {
const graphics = new PIXI.Graphics();
- graphics.lineStyle(.3, lineDefaultColor, lineDefaultAlpha);
+ graphics.lineStyle(1, lineDefaultColor, lineDefaultAlpha);
graphics.beginFill(lineDefaultColor);
graphics.moveTo(0, i * inte);
graphics.lineTo(this.app.view.width, i * inte);
@@ -326,11 +341,12 @@
if (!this.mapContainer || !this.app) {
return;
}
+
+ this.mapContainer.scale.set(1);
+ this.mapContainer.position.set(0, 0);
if (this.mapContainer.children.length === 0) {
return;
}
- this.mapContainer.scale.set(1);
- this.mapContainer.position.set(0, 0);
let minX, maxX, minY, maxY;
for (let sprite of this.mapContainer.children) {
@@ -366,10 +382,6 @@
}, 200).start();
}
- updateDidClickSprite = (value) => {
- this.didClickSprite = value;
- }
-
getStartedTicker = () => {
this.app.ticker.add((delta) => {
TWEEDLE.Group.shared.update();
@@ -380,7 +392,7 @@
function generatePixiApp(dark) {
const app = new PIXI.Application({
- background: dark ? '#f1f2f6' : '#f1f2f6',
+ background: dark ? '#2f3542' : '#f1f2f6',
antialias: true,
})
app.stage.eventMode = 'static';
@@ -393,6 +405,7 @@
function generatePixiContainer(name) {
const mapContainer = new PIXI.Container();
+ mapContainer.sortableChildren = true;
mapContainer.name = name;
mapContainer.data = {};
return mapContainer;
--
Gitblit v1.9.1