From 922cf71b78fc4a243b9a214e95729e747e65c87d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 30 三月 2024 13:14:17 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js |   55 +++++++++++++++----------------------------------------
 1 files changed, 15 insertions(+), 40 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 6436449..7d6262f 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -24,7 +24,6 @@
         initLight(this.scene);
 
         this.animate();
-        this.build();
     }
 
     animate = () => {
@@ -67,7 +66,7 @@
 
     initCamera = () => {
         const camera = new THREE.PerspectiveCamera(70, this.getFullWidth() / this.getFullHeight(), 1, 60000);
-        camera.position.set(-300, 300, 300);
+        camera.position.set(-400, 400, 400);
         this.scene.add(camera);
         return camera;
     }
@@ -98,9 +97,9 @@
         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, 0, 0)  // 骞虫浛 camera鐨刲ookAt
+        controls.target = new THREE.Vector3(0, 250, 0)  // 灞忓箷涓績鐐� 骞虫浛 camera鐨刲ookAt
         return controls;
     }
 
@@ -126,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;
@@ -139,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);
     }
 
-    build = () => {
-        buildDemo(this.scene);
-    }
-
-    handleClick = () => {
-
+    generateMesh = (fn) => {
+        fn(this.addObject);
     }
 
     destroy = () => {
@@ -190,6 +175,7 @@
             this.controls.dispose();
             this.controls = null;
         }
+        this.dom.removeEventListener("click", this.handleClickEvent);
         this.camera = null;
         this.objects = [];
         while (this.dom?.firstChild) {
@@ -214,7 +200,7 @@
     scene.add(ambientLight);
 
     const spotLight = new THREE.SpotLight(0xffffff, 8);
-    spotLight.position.set(-300, 300, 0);
+    spotLight.position.set(-300, 1000, 0);
     spotLight.angle = Math.PI / 4;  // 瑙掑害
     spotLight.distance = 800;  // 璺濈
     spotLight.decay = 0;    // 鍏夎“
@@ -231,15 +217,4 @@
     if (help) {
         scene.add(new THREE.SpotLightHelper(spotLight));
     }
-}
-
-const buildDemo = (scene) => {
-    const boxGeometry = new THREE.BoxGeometry(100, 100, 100);
-    const boxMaterial = new THREE.MeshStandardMaterial({
-        color: '#222f3e',
-    });
-    const boxMesh = new THREE.Mesh(boxGeometry, boxMaterial);
-    boxMesh.position.set(0, 0, 0);
-    scene.add(boxMesh)
-    return boxMesh;
 }
\ No newline at end of file

--
Gitblit v1.9.1