From 42ea17f5bf747669ee315da64379d69dca0f0665 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 三月 2024 13:22:18 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/player.js | 71 +++++++++++++++++++++--
zy-asrs-flow/src/pages/map/index.jsx | 2
zy-asrs-flow/src/pages/map/utils.js | 61 --------------------
3 files changed, 64 insertions(+), 70 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 102dc9f..033675a 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -264,7 +264,7 @@
<FloatButton
icon={<CompressOutlined />}
onClick={() => {
- Utils.adaptScreen();
+ player.adaptScreen();
}}
/>
<FloatButton.BackTop visibilityHeight={0} />
diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index f7503c9..ac503af 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -146,20 +146,32 @@
}
activateMapScale = () => {
- this.scale = 1; // 缂╂斁
+ 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;
- }
+ const mousePosition = new PIXI.Point();
+ this.app.renderer.plugins.interaction.mapPositionToPoint(mousePosition, event.clientX, event.clientY);
+
+ const diffPositionX = mousePosition.x - this.mapContainer.x;
+ const diffPositionY = mousePosition.y - this.mapContainer.y;
+
+ const newScale = this.scale * (delta === 1 ? 0.9 : 1.1);
+ const scaleFactor = newScale / this.scale;
+
+ this.mapContainer.x = mousePosition.x - diffPositionX * scaleFactor;
+ this.mapContainer.y = mousePosition.y - diffPositionY * scaleFactor;
+
+ this.scale = newScale;
+
this.mapContainer.scale.set(this.scale);
+ console.log(this.scale);
+
this.mapContainer.children.forEach(child => {
// child.scale.set(1 / this.scale); // 闃叉鍥炬爣鍙樺皬
- })
+ });
});
}
@@ -258,7 +270,6 @@
warpSpeed = warpSpeed > 0 ? 0 : 1;
}, 5000);
-
this.starryTicker = (delta) => {
speed += (warpSpeed - speed) / 20;
cameraZ += delta * 10 * (speed + baseSpeed);
@@ -311,6 +322,50 @@
}
}
+ adaptScreen = () => {
+ if (!this.mapContainer || !this.app) {
+ return;
+ }
+ 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) {
+ if (sprite?.data?.uuid) {
+ let bounds = sprite.getBounds();
+ minX = minX !== undefined ? Math.min(minX, bounds.x) : bounds.x;
+ minY = minY !== undefined ? Math.min(minY, bounds.y) : bounds.y;
+ maxX = maxX !== undefined ? Math.max(maxX, bounds.x + bounds.width) : bounds.x + bounds.width;
+ maxY = maxY !== undefined ? Math.max(maxY, bounds.y + bounds.height) : bounds.y + bounds.height;
+ }
+ }
+
+ this.scale = Math.min(
+ this.app.renderer.width / (maxX - minX) * 0.8,
+ this.app.renderer.height / (maxY - minY) * 0.8
+ );
+
+ let centerPoint = {
+ x: (minX + maxX) / 2 * this.mapContainer.scale.x,
+ y: (minY + maxY) / 2 * this.mapContainer.scale.y
+ };
+
+ new TWEEDLE.Tween(this.mapContainer.scale).easing(TWEEDLE.Easing.Quadratic.Out)
+ .to({
+ x: this.scale,
+ y: this.scale
+ }, 200).start();
+
+ new TWEEDLE.Tween(this.mapContainer.position).easing(TWEEDLE.Easing.Quadratic.Out)
+ .to({
+ x: this.app.renderer.width / 2 - centerPoint.x * this.scale,
+ y: this.app.renderer.height / 2 - centerPoint.y * this.scale
+ }, 200).start();
+ }
+
updateDidClickSprite = (value) => {
this.didClickSprite = value;
}
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index fcb9d12..02d5833 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -277,65 +277,4 @@
})
return options;
-}
-
-/**
- * //
- let sprite = mapContainer.children[0];
- let bounds = sprite.getBounds();
- console.log(bounds, sprite.getLocalBounds());
- console.log(sprite.position);
-
- console.log('-');
-
- console.log(mapContainer.scale, mapContainer.position);
-
- console.log('===========');
-
-
- return;
- */
-
-export const adaptScreen = () => {
- if (!mapContainer || !app) {
- return;
- }
- if (mapContainer.children.length === 0) {
- return;
- }
- mapContainer.scale.set(1);
- mapContainer.position.set(0, 0);
-
- let minX, maxX, minY, maxY;
- for (let sprite of mapContainer.children) {
- if (sprite?.data?.uuid) {
- let bounds = sprite.getBounds();
- minX = minX !== undefined ? Math.min(minX, bounds.x) : bounds.x;
- minY = minY !== undefined ? Math.min(minY, bounds.y) : bounds.y;
- maxX = maxX !== undefined ? Math.max(maxX, bounds.x + bounds.width) : bounds.x + bounds.width;
- maxY = maxY !== undefined ? Math.max(maxY, bounds.y + bounds.height) : bounds.y + bounds.height;
- }
- }
-
- let newScale = Math.min(
- app.renderer.width / (maxX - minX) * 0.8,
- app.renderer.height / (maxY - minY) * 0.8
- );
-
- let centerPoint = {
- x: (minX + maxX) / 2 * mapContainer.scale.x,
- y: (minY + maxY) / 2 * mapContainer.scale.y
- };
-
- new TWEEDLE.Tween(mapContainer.scale).easing(TWEEDLE.Easing.Quadratic.Out)
- .to({
- x: newScale,
- y: newScale
- }, 200).start();
-
- new TWEEDLE.Tween(mapContainer.position).easing(TWEEDLE.Easing.Quadratic.Out)
- .to({
- x: app.renderer.width / 2 - centerPoint.x * newScale,
- y: app.renderer.height / 2 - centerPoint.y * newScale
- }, 200).start();
}
\ No newline at end of file
--
Gitblit v1.9.1