From f9bad0ac4a11a56f2ab3048d19e7caf01cd9aa2d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 05 一月 2022 10:07:36 +0800
Subject: [PATCH] #

---
 static/js/app.js |   66 ++++----------------------------
 1 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 3600009..0520b6a 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -11,8 +11,7 @@
 import {StoreShelf} from './object/StoreShelf.js';
 import {StoreCrn} from './object/StoreCrn.js';
 import {StoreConvey} from './object/StoreConvey.js';
-import { Sky } from './object/Sky.js';
-
+import {StoreGoods} from './object/StoreGoods.js';
 
 
 var APP = {
@@ -109,27 +108,14 @@
 			ambient.position.set(0, 0, 0);
 			this.addObject(ambient);
 
-			// 娣诲姞骞宠鍏�,骞宠鍏夌被浼间簬澶槼鍏�
-			// let directionalLight = new THREE.DirectionalLight(0xffffff, 0.3);//妯℃嫙杩滃绫讳技澶槼鐨勫厜婧�
-			// directionalLight.position.set(0, 200, 0);
-			// this.addObject(directionalLight);
-			// //璁剧疆鐐瑰厜婧�
-			// let pointLight1 = new THREE.PointLight(0xffffff, 0.3);
-			// pointLight1.position.set(-500, 200, 0);
-			// this.addObject(pointLight1);
-			// let pointLight2 = new THREE.PointLight(0xffffff, 0.3);
-			// pointLight2.position.set(500, 200, 0);
-			// this.addObject(pointLight2);
-
 			// 闃村奖鑱氬厜鐏�
 			let pointLight = new THREE.SpotLight(0xFFFAFA,1);
 			pointLight.position.set(0, 1500, 2500);
 			pointLight.castShadow = true;
 			pointLight.shadow.camera.near = 2000;
 			pointLight.shadow.camera.far = 10000;
-			pointLight.shadow.mapSize.height = 100000;
-			pointLight.shadow.mapSize.width = 100000;
-			// 灏嗘墍鏈夊垱寤虹殑鐗╀綋鍔犲叆鍒板満鏅腑鍘�
+			pointLight.shadow.mapSize.height = 200000;
+			pointLight.shadow.mapSize.width = 200000;
 			this.addObject(pointLight);
 		}
 		this.initOrbitControl = function () {
@@ -161,29 +147,6 @@
 					"pz.jpg", "nz.jpg"
 				]);
 			}
-			// 澶槼
-			// let sky = new Sky();
-			// sky.scale.setScalar( 450000 );
-			// this.addObject( sky );
-			// let sun = new THREE.Vector3();
-			// const effectController = {
-			// 	turbidity: 10,
-			// 	rayleigh: 3,
-			// 	mieCoefficient: 0.005,
-			// 	mieDirectionalG: 0.7,
-			// 	elevation: 2,
-			// 	azimuth: 180,
-			// 	exposure: this.renderer.toneMappingExposure
-			// };
-			// const uniforms = sky.material.uniforms;
-			// uniforms[ 'turbidity' ].value = effectController.turbidity;
-			// uniforms[ 'rayleigh' ].value = effectController.rayleigh;
-			// uniforms[ 'mieCoefficient' ].value = effectController.mieCoefficient;
-			// uniforms[ 'mieDirectionalG' ].value = effectController.mieDirectionalG;
-			// const phi = THREE.MathUtils.degToRad( 90 - effectController.elevation );
-			// const theta = THREE.MathUtils.degToRad( effectController.azimuth );
-			// sun.setFromSphericalCoords( 1, phi, theta );
-			// uniforms[ 'sunPosition' ].value.copy( sun );
 		}
 		this.initReSize = function(object){
 			window.addEventListener('resize', function () {
@@ -365,25 +328,14 @@
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
 				if (Store3DData !== undefined && Store3DData !== null) {
-					for(var group of Store3DData.data.store.groups) {
+					for(let group of Store3DData.data.store.groups) {
 						new StoreCrn(group.crn, object);
-						for (var line of group.lines) {
+						for (let line of group.lines) {
 							let shelf = new StoreShelf(line);
-							object.addObject(shelf);
-							//鏄剧ず搴撲綅涓婄殑璐х墿
-							// for (var bin of line.bins) {
-							// 	let existGoods=this.getExistedGoodType(bin.State);
-							// 	let storeGoods = new StoreGoods(optionGroup, bin);
-							// 	if(existGoods==null) {
-							// 		let goods=storeGoods.create();
-							// 		object.addObject(goods);
-							// 		this.goodTypes.push({type: bin.State, object: goods});
-							// 	} else {
-							// 		let goods= storeGoods.clone(existGoods);
-							// 		object.addObject(goods);
-							// 	}
-							// }
-
+							object.addObject(shelf.mesh);
+							if (line.bins !== null) {
+								new StoreGoods(object, line.bins, shelf);
+							}
 						}
 					}
 					this.firstTime = 0;

--
Gitblit v1.9.1