From babcf4f0462ed0945fcefe59b1666d709910872c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 三月 2024 16:00:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master
---
zy-asrs-flow/src/pages/map/player.js | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index abe51e4..4b5a39b 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -5,9 +5,8 @@
constructor(dom, dark) {
this.darkModel = dark;
-
// init
- this.app = generatePixiApp();
+ this.app = generatePixiApp(dark);
dom.appendChild(this.app.view);
globalThis.__PIXI_APP__ = this.app;
@@ -28,10 +27,8 @@
this.mapPan(event);
}
})
-
this.activateMapScale();
this.showCoordinates();
-
this.appTicker();
}
@@ -45,9 +42,7 @@
} 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); // 闃叉鍥炬爣鍙樺皬
})
@@ -57,7 +52,6 @@
mapPan = (event) => {
this.pan = true;
let previousPosition = { x: event.clientX, y: event.clientY };
-
const mouseMoveHandler = (event) => {
if (this.pan) {
const dx = event.clientX - previousPosition.x;
@@ -69,14 +63,11 @@
previousPosition = { x: event.clientX, y: event.clientY };
}
};
-
this.app.view.addEventListener('mousemove', mouseMoveHandler);
-
this.app.view.addEventListener('mouseup', () => {
this.app.view.removeEventListener('mousemove', mouseMoveHandler);
this.pan = false;
});
-
}
showCoordinates = () => {
@@ -86,6 +77,7 @@
fontFamily: 'MicrosoftYaHei',
fontWeight: 'bold',
});
+ coordinatesText.name = 'xyStr'
coordinatesText.position.set(10, 10);
this.app.stage.addChild(coordinatesText);
@@ -94,9 +86,45 @@
const mouseY = (event.clientY - this.mapContainer.position.y) / this.scale;
coordinatesText.text = `{ x: ${mouseX.toFixed(2)}, y: ${mouseY.toFixed(2)} }`;
};
-
this.app.view.addEventListener('mousemove', mouseMoveInfoTextHandler);
+ }
+ showGridlines = () => {
+ if (!this.gridLineContainer) {
+ this.gridLineContainer = generatePixiContainer('gridLineContainer');
+ this.app.stage.addChild(this.gridLineContainer);
+ }
+
+ const inte = 30;
+ const lineDefaultAlpha = .5;;
+ 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.beginFill(lineDefaultColor);
+ graphics.moveTo(i * inte, 0);
+ graphics.lineTo(i * inte, this.app.view.height);
+ graphics.endFill();
+ this.gridLineContainer.addChild(graphics);
+ }
+
+ for (let i = 0; i < this.app.view.height / inte; i++) {
+ const graphics = new PIXI.Graphics();
+ graphics.lineStyle(.3, lineDefaultColor, lineDefaultAlpha);
+ graphics.beginFill(lineDefaultColor);
+ graphics.moveTo(0, i * inte);
+ graphics.lineTo(this.app.view.width, i * inte);
+ graphics.endFill();
+
+ this.gridLineContainer.addChild(graphics);
+ }
+ }
+
+ hideGridlines = () => {
+ if (this.gridLineContainer) {
+ this.app.stage.removeChild(this.gridLineContainer);
+ this.gridLineContainer = null;
+ }
}
appTicker = () => {
@@ -105,12 +133,12 @@
}
-function generatePixiApp() {
+function generatePixiApp(dark) {
const app = new PIXI.Application({
- background: '#F8FAFB',
+ background: dark ? '#f1f2f6' : '#f1f2f6',
antialias: true,
})
- app.stage.eventMode = 'auto';
+ app.stage.eventMode = 'static';
app.stage.hitArea = app.screen;
return app;
}
--
Gitblit v1.9.1