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 | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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 dc61e26..a1fc0e9 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -174,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);
}
@@ -186,19 +190,24 @@
generateMesh = (fn) => {
// fn(this.addObject);
const loader = new FBXLoader();
- loader.load('model/001-5.fbx', (mesh) => {
- console.log(mesh);
- mesh.position.set(0, 10, 0);
- mesh.scale.set(5, 5, 5);
- // mesh.rotation.x = Utils.rotationParseNum(270);
- mesh.traverse(function (child) {
- if (child.isMesh) {
- child.castShadow = true;
- child.receiveShadow = true;
- }
- });
- this.addObject(mesh);
+ 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) => {
@@ -259,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