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 |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 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 0ed9899..7d6262f 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -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,10 +125,7 @@
         let that = this;
         const raycaster = new THREE.Raycaster();
         const mouse = new THREE.Vector2();
-
-        this.dom.addEventListener("dblclick", (event) => {
-        })
-        this.dom.addEventListener("click", (event) => {
+        this.handleClickEvent = (event) => {
             let x, y;
             if (event.changedTouches) {
                 x = event.changedTouches[0].pageX;
@@ -137,24 +134,21 @@
                 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 / this.getFullWidth()) * 2 - 1;
-            // mouse.y = -(y / this.getFullHeight()) * 2 + 1;
-            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);
-            console.log(intersects);
             if (intersects.length === 0) {
                 return;
             }
             let objName = intersects[0].object.name;
-            if (objName.startsWith("locNo")) {
-                if (this.handleClick) {
-                    this.handleClick(objName, x, y);
-                }
+            if (objName && this.handleClick) {
+                this.handleClick(objName, x, y);
             }
-        }, false);
+        }
+        this.dom.addEventListener("click", this.handleClickEvent, false);
     }
 
     generateMesh = (fn) => {
@@ -181,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