From 46887b3db52f011cdf740ead100e7ae467b5c5a6 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 03 四月 2024 08:51:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 3feb447..a1fc0e9 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -190,20 +190,24 @@
generateMesh = (fn) => {
// fn(this.addObject);
const loader = new FBXLoader();
- loader.load('model/001-5.fbx', (mesh) => {
- mesh.position.set(0, 10, 0);
- mesh.scale.set(5, 5, 5);
- mesh.name = '0100101';
- // mesh.rotation.x = Utils.rotationParseNum(270);
- mesh.traverse(function (child) {
- if (child.isMesh) {
- child.name = '0100101';
- 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) => {
--
Gitblit v1.9.1