From 1a27e848577a95d68baaed3eb3c0b04fe4140df0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 三月 2024 17:04:26 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
index 09babda..7d6262f 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -57,7 +57,7 @@
initScene = () => {
const scene = new THREE.Scene();
// scene.background = new THREE.Color(0xf0f0f0);
- // scene.background = new THREE.Color(0x333333);
+ scene.background = new THREE.Color(0x333333);
if (help) {
scene.add(new THREE.AxesHelper(1000));
}
@@ -97,7 +97,7 @@
controls.minPolarAngle = 0; // 鏈�灏忎刊浠拌搴︼紙鍚戜笅鐪嬶級
controls.maxPolarAngle = Math.PI / 2.1; // 鏈�澶т刊浠拌搴︼紙鍚戜笂鐪嬶級
controls.rotateSpeed = 0.6; // 瑙嗚绉诲姩閫熷害鍑忔參
- controls.autoRotate = true; // 鑷姩鏃嬭浆
+ controls.autoRotate = false; // 鑷姩鏃嬭浆
controls.target = new THREE.Vector3(0, 250, 0) // 灞忓箷涓績鐐� 骞虫浛 camera鐨刲ookAt
return controls;
@@ -125,11 +125,7 @@
let that = this;
const raycaster = new THREE.Raycaster();
const mouse = new THREE.Vector2();
-
- this.dom.addEventListener("click", (event) => {
- this.handleClick("null");
- })
- this.dom.addEventListener("dblclick", (event) => {
+ this.handleClickEvent = (event) => {
let x, y;
if (event.changedTouches) {
x = event.changedTouches[0].pageX;
@@ -138,35 +134,25 @@
x = event.clientX;
y = event.clientY;
}
+ let rect = this.dom.getBoundingClientRect();
+ mouse.x = ((x - rect.left) / rect.width) * 2 - 1;
+ mouse.y = -((y - rect.top) / rect.height) * 2 + 1;
event.preventDefault();
- mouse.x = (x / window.innerWidth) * 2 - 1;
- mouse.y = -(y / window.innerHeight) * 2 + 1;
raycaster.setFromCamera(mouse, that.camera);
let intersects = raycaster.intersectObjects(that.objects, true);
if (intersects.length === 0) {
- this.handleClick("null");
return;
}
let objName = intersects[0].object.name;
- if (objName.startsWith("locNo")) {
-
- if (this.handleClick) {
- this.handleClick(objName, x, y);
- }
-
- } else {
- this.handleClick("null");
+ if (objName && this.handleClick) {
+ this.handleClick(objName, x, y);
}
-
- }, false);
+ }
+ this.dom.addEventListener("click", this.handleClickEvent, false);
}
generateMesh = (fn) => {
- fn(this.scene);
- }
-
- handleClick = () => {
-
+ fn(this.addObject);
}
destroy = () => {
@@ -189,6 +175,7 @@
this.controls.dispose();
this.controls = null;
}
+ this.dom.removeEventListener("click", this.handleClickEvent);
this.camera = null;
this.objects = [];
while (this.dom?.firstChild) {
--
Gitblit v1.9.1