From ce9da384d05f0b6b50aeeb5c3a00e53694695976 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 25 十二月 2021 16:23:52 +0800
Subject: [PATCH] #

---
 static/js/object/StoreConvey.js |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/static/js/object/StoreConvey.js b/static/js/object/StoreConvey.js
index 2eed2d4..dd1b3f0 100644
--- a/static/js/object/StoreConvey.js
+++ b/static/js/object/StoreConvey.js
@@ -37,9 +37,9 @@
         new THREE.ObjectLoader().load( "../static/model/json/閾炬潯杈撻�佹満.json", function (obj) {
             obj.traverse (function (child) {
                 if (child instanceof THREE.Mesh) {
-                    child.scale.set(1, 1, 1.8);
+                    child.scale.set(1, 1, 1.6);
                     child.material = new THREE.MeshLambertMaterial({
-                        color: 0xAAAAAA
+                        color: 0x8B8378
                     });
                     if (child.name === "Box034" || child.name === "Box035") {
                         child.material = new THREE.MeshLambertMaterial({
@@ -55,9 +55,9 @@
         new THREE.ObjectLoader().load( "../static/model/json/杈婄瓛杈撻�佹満.json", function (obj) {
             obj.traverse (function (child) {
                 if (child instanceof THREE.Mesh) {
-                    child.scale.set(1, 1, 1.8);
+                    child.scale.set(0.5, 1, 1);
                     child.material = new THREE.MeshLambertMaterial({
-                        color: 0xAAAAAA
+                        color: 0x8B8378
                     });
                 }
             });
@@ -68,9 +68,9 @@
         new THREE.ObjectLoader().load( "../static/model/json/椤跺崌绉绘牻.json", function (obj) {
             obj.traverse (function (child) {
                 if (child instanceof THREE.Mesh) {
-                    child.scale.set(1, 1, 1.8);
+                    child.scale.set(1, 1, 1);
                     child.material = new THREE.MeshLambertMaterial({
-                        color: 0xAAAAAA
+                        color: 0x8B8378
                     });
                 }
             });
@@ -81,16 +81,26 @@
     }
 
     function customize(clone, info) {
-        clone.position.x = 0 + info.position.x;
-        clone.position.y = 0 + info.position.y;
-        clone.position.z = 0 + info.position.z;
-        clone.rotateY(info.rotateY);
+        let positionX = info.position.x || 0;
+        let positionY = info.position.y || 0;
+        let positionZ = info.position.z || 0;
+        let rotateY = info.rotateY || 0;
+
+        clone.position.x = 0 + positionX;
+        clone.position.y = 0 + positionY;
+        clone.position.z = 0 + positionZ;
+        clone.rotateY(rotateY);
         if (info.traverse !== undefined) {
             let traverse = info.traverse;
             clone.traverse (function (child) {
                 if (child instanceof THREE.Mesh) {
                     // 鎷変几
-                    child.scale.set(traverse.scale.x, traverse.scale.y, traverse.scale.z);
+                    if (traverse.scale !== undefined) {
+                        let scaleX = traverse.scale.x || 1;
+                        let scaleY = traverse.scale.y || 1;
+                        let scaleZ = traverse.scale.z || 1;
+                        child.scale.set(scaleX, scaleY, scaleZ);
+                    }
                     // 棰滆壊
                     if (traverse.color !== undefined) {
                         child.material = new THREE.MeshLambertMaterial({

--
Gitblit v1.9.1