From 9f9caa7f80efd00bda9e445973b30a4d60eaed12 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 11 十二月 2021 16:06:35 +0800
Subject: [PATCH] #

---
 static/js/app.js |  159 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 109 insertions(+), 50 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index b5d9039..6bede19 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -29,13 +29,14 @@
 			this.initLight();
 			this.initFloor();
 			this.initModel();
+			this.initModel0();
+			this.initStoreObjects(this);
 		}
 		this.animate = function () {
 			requestAnimationFrame(this.animate.bind(this));
 			this.stats.begin();
 			this.renderer.render(this.scene, this.camera);
 			this.stats.end();
-			this.initStoreObjects(this);
 			this.modelMove();
 		}
 		this.initScene = function () {
@@ -56,7 +57,7 @@
 			// this.camera.position.z = 600;
 			// //鐩告満鐨勬湞鍚�
 			// this.camera.lookAt(0, 0, 0);
-			this.camera.position.set( - 550, 670, 950 );
+			this.camera.position.set( - 350, 1070, 1550 );
 			this.camera.lookAt( this.scene.position );
 			//灏嗙浉鏈烘斁鍒板満鏅腑
 			this.scene.add(this.camera);
@@ -73,12 +74,29 @@
 			this.dom.appendChild( this.renderer.domElement );
 		}
 		this.initLight = function () {
+
+			//棣栧厛娣诲姞涓幆澧冨厜
+			let ambient = new THREE.AmbientLight(0xffffff, 1); //AmbientLight,褰卞搷鏁翠釜鍦烘櫙鐨勫厜婧�
+			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);
+
 			// ---
-			var bulbLight = new THREE.PointLight( 0xffee88, 1, 2000, 2 );
-			bulbLight.position.set( 600, 600, 500 );
-			bulbLight.castShadow = true;
-			bulbLight.power = 100;
-			this.addObject(bulbLight);
+			// var bulbLight = new THREE.PointLight( 0xffee88, 1, 2000, 2 );
+			// bulbLight.position.set( 600, 600, 500 );
+			// bulbLight.castShadow = true;
+			// bulbLight.power = 100;
+			// this.addObject(bulbLight);
 			// ---
 			// var bulbLight1 = new THREE.PointLight( 0xffee88, 1, 2000, 2 );
 			// bulbLight1.position.set( -600, 600, 500 );
@@ -102,12 +120,12 @@
 			// hemiLight.intensity = 0.0001;
 			// this.addObject(hemiLight);
 
-			const ambientLight = new THREE.AmbientLight( 0xcccccc, 0.4 );
-			this.addObject( ambientLight );
-
-			const directionalLight = new THREE.DirectionalLight( 0xffffff, 0.6 );
-			directionalLight.position.set( - 1, 1, 1 );
-			this.addObject( directionalLight );
+			// const ambientLight = new THREE.AmbientLight( 0xcccccc, 0.4 );
+			// this.addObject( ambientLight );
+			//
+			// const directionalLight = new THREE.DirectionalLight( 0xffffff, 0.6 );
+			// directionalLight.position.set( - 1, 1, 1 );
+			// this.addObject( directionalLight );
 		}
 		this.initOrbitControl = function () {
 			this.orbitControl = new OrbitControls(this.camera, this.renderer.domElement);
@@ -122,7 +140,7 @@
 		}
 		this.initStats = function () {
 			this.stats = new Stats();
-			this.dom.appendChild( this.stats.dom );
+			// this.dom.appendChild( this.stats.dom );
 		}
 		this.initBackground = function () {
 			const cubeTextureLoader = new THREE.CubeTextureLoader();
@@ -132,7 +150,7 @@
 				"posy.jpg", "negy.jpg",
 				"posz.jpg", "negz.jpg"
 			]);
-			// this.scene.background = new THREE.Color( 0xf0f0f0 );
+			this.scene.background = new THREE.Color( 0xf0f0f0 );
 		}
 		this.removeObject = function (nameorid) {
 			for (let i = 0; i < this.objects.length; i++) {
@@ -157,7 +175,7 @@
 			// this.addObject(plane);
 			//
 			// const helper = new THREE.PolarGridHelper( 2000, 100 );
-			const helper = new THREE.GridHelper( 5000, 300 );
+			const helper = new THREE.GridHelper( 8000, 300 );
 			helper.position.y = - 0;
 			helper.material.opacity = 0.25;
 			helper.material.transparent = true;
@@ -165,47 +183,85 @@
 		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
+				initStore();
 				if (Store3DData !== null) {
-					//鏄剧ず浠撳簱鍖哄煙
-					for (let i = 0; i < Store3DData.Areas.length; i++) {
-						let optionArea = Store3DData.Areas[i];
-						let area = new StoreArea(optionArea);
-						object.addObject(area);
-						//鏄剧ず浠撳簱
-						for (let j = 0; j < optionArea.Stores.length; j++) {
-							let optionStore = optionArea.Stores[j];
-							optionStore.Position = CommonFunction.transPosition(optionStore.Position, optionArea.Position);
-							let store = new Store(optionStore);
-							// object.addObject(store);
-							//鏄剧ず姣忚淇℃伅
-							for (let k = 0; k < optionStore.Groups.length; k++) {
-								let optionGroup = optionStore.Groups[k];
-								optionGroup.Position = CommonFunction.transPosition(optionGroup.Position, optionStore.Position);
-								let shelf = new StoreShelf(optionGroup);
-								let group=new StoreGroup(optionGroup,1);
-								object.addObject(shelf);
-								// object.addObject(group);
-								//鏄剧ず搴撲綅涓婄殑璐х墿
-								for (let m = 0; m < optionGroup.Bins.length; m++) {
-								    let optionBin = optionGroup.Bins[m];
-								    let existGoods=this.getExistedGoodType(optionBin.State);
-								    let storeGoods = new StoreGoods(optionGroup, optionBin);
-								    if(existGoods==null) {
-								        let goods=storeGoods.create();
-								        object.addObject(goods);
-								        this.goodTypes.push({type: optionBin.State, object: goods});
-								    } else {
-								        let goods= storeGoods.clone(existGoods);
-								        object.addObject(goods);
-								    }
-								}
-							}
+					for(var group of Store3DData.data.store.groups) {
+						let crn = new StoreCrn(group.crn, object);
+						for (var 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);
+							// 	}
+							// }
 
 						}
 					}
+
+
+
+
+
+
+
+
+
+
+
+
+
+					//鏄剧ず浠撳簱鍖哄煙
+					// for (let i = 0; i < Store3DData.Areas.length; i++) {
+					// 	let optionArea = Store3DData.Areas[i];
+					// 	let area = new StoreArea(optionArea);
+					// 	object.addObject(area);
+					// 	//鏄剧ず浠撳簱
+					// 	for (let j = 0; j < optionArea.Stores.length; j++) {
+					// 		let optionStore = optionArea.Stores[j];
+					// 		optionStore.Position = CommonFunction.transPosition(optionStore.Position, optionArea.Position);
+					// 		let store = new Store(optionStore);
+					// 		// object.addObject(store);
+					// 		//鏄剧ず姣忚淇℃伅
+					// 		for (let k = 0; k < optionStore.Groups.length; k++) {
+					// 			let optionGroup = optionStore.Groups[k];
+					// 			optionGroup.Position = CommonFunction.transPosition(optionGroup.Position, optionStore.Position);
+					// 			let shelf = new StoreShelf(optionGroup);
+					// 			let group=new StoreGroup(optionGroup,1);
+					// 			object.addObject(shelf);
+					// 			// object.addObject(group);
+					// 			//鏄剧ず搴撲綅涓婄殑璐х墿
+					// 			for (let m = 0; m < optionGroup.Bins.length; m++) {
+					// 			    let optionBin = optionGroup.Bins[m];
+					// 			    let existGoods=this.getExistedGoodType(optionBin.State);
+					// 			    let storeGoods = new StoreGoods(optionGroup, optionBin);
+					// 			    if(existGoods==null) {
+					// 			        let goods=storeGoods.create();
+					// 			        object.addObject(goods);
+					// 			        this.goodTypes.push({type: optionBin.State, object: goods});
+					// 			    } else {
+					// 			        let goods= storeGoods.clone(existGoods);
+					// 			        object.addObject(goods);
+					// 			    }
+					// 			}
+					// 		}
+					//
+					// 	}
+					// }
 					this.firstTime = 0;
 				}
 			}
+		}
+		this.initModel0 = function () {
+
 		}
 		this.getExistedGoodType=function(state){
 			for (let i=0;i<this.goodTypes.length;i++) {
@@ -252,6 +308,9 @@
 						.load( '璐у弶.obj', function ( object ) {
 							object.position.z = -500;
 							object.position.x = -2060;
+							// object.position.z = 0;
+							// object.position.x = 0;
+							// object.position.y = 0;
 							object.scale.set(0.025, 0.025, 0.025);
 							object.rotateY(- Math.PI / 2)
 							that.addObject( object );

--
Gitblit v1.9.1