From ff2b7ebf99e8aedccb3859ed9f049e49a9a613f1 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 03 四月 2024 16:56:56 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 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 26f3309..a1fc0e9 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -7,7 +7,8 @@
 import { OutlinePass } from 'three/examples/jsm/postprocessing/OutlinePass';
 import { ShaderPass } from 'three/examples/jsm/postprocessing/ShaderPass';
 import { FXAAShader } from 'three/examples/jsm/shaders/FXAAShader';
-
+import { FBXLoader } from 'three/examples/jsm/loaders/FBXLoader'
+import * as Utils from '../../utils'
 
 const help = false;
 
@@ -128,7 +129,7 @@
         controls.minPolarAngle = 0; // 鏈�灏忎刊浠拌搴︼紙鍚戜笅鐪嬶級
         controls.maxPolarAngle = Math.PI / 2.1; // 鏈�澶т刊浠拌搴︼紙鍚戜笂鐪嬶級
         controls.rotateSpeed = 0.6; // 瑙嗚绉诲姩閫熷害鍑忔參
-        controls.autoRotate = false; // 鑷姩鏃嬭浆
+        controls.autoRotate = true; // 鑷姩鏃嬭浆
 
         controls.target = new THREE.Vector3(0, 250, 0)  // 灞忓箷涓績鐐� 骞虫浛 camera鐨刲ookAt
         return controls;
@@ -173,8 +174,12 @@
             if (intersects.length === 0) {
                 return;
             }
-            this.outlinePass.selectedObjects = [intersects[0].object];
             let objName = intersects[0].object.name;
+            this.objects.forEach(obj => {
+                if (obj.name === objName) {
+                    this.outlinePass.selectedObjects = [obj];
+                }
+            })
             if (objName && this.handleClick) {
                 this.handleClick(objName, x, y);
             }
@@ -183,7 +188,35 @@
     }
 
     generateMesh = (fn) => {
-        fn(this.addObject);
+        // fn(this.addObject);
+        const loader = new FBXLoader();
+        const promise = new Promise((resolve) => {
+            loader.load('model/001-5.fbx', (mesh) => {
+                mesh.position.set(0, 10, 0);
+                mesh.scale.set(5, 5, 5);
+                mesh.name = '1-1-1';
+                // mesh.rotation.x = Utils.rotationParseNum(270);
+                mesh.traverse(function (child) {
+                    if (child.isMesh) {
+                        child.name = '1-1-1';
+                        child.castShadow = true;
+                        child.receiveShadow = true;
+                    }
+                });
+                this.addObject(mesh);
+                resolve();
+            })
+        })
+        return promise;
+    }
+
+    setNewSelectedMesh = (objName) => {
+        for (const mesh of this.objects) {
+            if (mesh.name === objName) {
+                this.outlinePass.selectedObjects = [mesh];
+                break;
+            }
+        }
     }
 
     destroy = () => {
@@ -235,7 +268,7 @@
     directionalLight.position.set(1, 1, 1);
     scene.add(directionalLight);
 
-    const ambientLight = new THREE.AmbientLight(0xf0f0f0, 18);
+    const ambientLight = new THREE.AmbientLight(0xf0f0f0, 10);
     scene.add(ambientLight);
 
     const spotLight = new THREE.SpotLight(0xffffff, 8);

--
Gitblit v1.9.1