From c087c4b39244d8da62aa4119258500b411b79ffc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 17 十二月 2021 14:58:38 +0800
Subject: [PATCH] #

---
 static/js/app.js |  204 +++++++++++++-------------------------------------
 1 files changed, 54 insertions(+), 150 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index d21848e..9911ce3 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2,6 +2,8 @@
 import Stats from './lib/stats.module.js';
 import {MTLLoader} from './lib/MTLLoader.js';
 import {OBJLoader} from './lib/OBJLoader.js';
+import {StoreShelf} from './object/StoreShelf.js';
+import {StoreCrn} from './object/StoreCrn.js';
 
 var APP = {
 
@@ -40,9 +42,7 @@
 			this.stats.begin();
 			this.renderer.render(this.scene, this.camera);
 			this.stats.end();
-			// this.queryTask();
 			this.queryCrn();
-			// this.modelMove();
 			this.crnMove();
 		}
 		this.initScene = function () {
@@ -179,13 +179,16 @@
 			// plane.position.y = - 200;
 			// plane.receiveShadow = true;
 			// this.addObject(plane);
-			//
+
 			// const helper = new THREE.PolarGridHelper( 2000, 100 );
+
 			const helper = new THREE.GridHelper( 8000, 300 );
 			helper.position.y = - 0;
 			helper.material.opacity = 0.25;
 			helper.material.transparent = true;
 			this.addObject( helper );
+
+			// this.addObject(new Floor({position: {}}))
 		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
@@ -211,67 +214,6 @@
 							// }
 
 						}
-					}
-
-
-
-
-
-
-
-
-
-
-
-
-
-					//鏄剧ず浠撳簱鍖哄煙
-					// 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.queryTask = function () {
-			if (TaskDatas !== null) {
-				for (let TaskData of TaskDatas) {
-					let wrkTask = getArrVal(this.wrkTasks, "wrkNo", TaskData.wrkNo);
-					if (null == wrkTask) {
-						this.wrkTasks.push(TaskData);
 					}
 				}
 			}
@@ -302,81 +244,56 @@
 		}
 		this.initModel = function () {
 			let that = this;
-			// let object;
-			// const onProgress = function ( xhr ) {
-			// 	if ( xhr.lengthComputable ) {
-			// 		const percentComplete = xhr.loaded / xhr.total * 100;
-			// 		console.log( Math.round( percentComplete, 2 ) + '% downloaded' );
-			// 	}
-			// };
-			// const onError = function () { };
-			// function loadModel() {
-			// 	object.traverse( function ( child ) {
-			// 		if ( child.isMesh ) child.material.map = texture;
-			// 	} );
-			// 	object.position.y = 195;
-			// 	that.addObject( object );
-			// }
-			// const manager = new THREE.LoadingManager(loadModel);
-			// const textureLoader = new THREE.TextureLoader( manager );
-			// const texture = textureLoader.load( '../static/model/obj/uv_grid_opengl.jpg' );
-			// const loader = new OBJLoader( manager );
-			// loader.load( '../static/model/obj/AGV.obj', function ( obj ) {
-			// 	object = obj;
-			// }, onProgress, onError );
 			const manager = new THREE.LoadingManager();
 			// manager.addHandler( /\.dds$/i, new DDSLoader() );
-			new MTLLoader(manager)
-				.setPath( '../static/model/obj/' )
-				.load( '璐у弶.mtl', function ( materials ) {
-					materials.preload();
-					new OBJLoader( manager )
-						.setMaterials( materials )
-						.setPath( '../static/model/obj/' )
-						.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 );
-						}, null, null );
-				});
-			new MTLLoader(manager)
-				.setPath( '../static/model/obj/' )
-				.load( '杞借揣鍙�.mtl', function ( materials ) {
-					materials.preload();
-					new OBJLoader( manager )
-						.setMaterials( materials )
-						.setPath( '../static/model/obj/' )
-						.load( '杞借揣鍙�.obj', function ( object ) {
-							object.position.z = -500;
-							object.position.x = -2060;
-							object.scale.set(0.025, 0.025, 0.025);
-							object.rotateY(- Math.PI / 2)
-							that.addObject( object );
-						}, null, null );
-				});
-			new MTLLoader(manager)
-				.setPath( '../static/model/obj/' )
-				.load( '鍫嗗灈鏈烘湰浣�.mtl', function ( materials ) {
-					materials.preload();
-					new OBJLoader( manager )
-						.setMaterials( materials )
-						.setPath( '../static/model/obj/' )
-						.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 );
-						}, null, null );
-				});
+			// new MTLLoader(manager)
+			// 	.setPath( '../static/model/obj/' )
+			// 	.load( '璐у弶.mtl', function ( materials ) {
+			// 		materials.preload();
+			// 		new OBJLoader( manager )
+			// 			.setMaterials( materials )
+			// 			.setPath( '../static/model/obj/' )
+			// 			.load( '璐у弶.obj', function ( object ) {
+			// 				object.position.z = -480;
+			// 				object.position.x = -1735;
+			// 				object.scale.set(0.03, 0.03, 0.03);
+			// 				object.rotateY(- Math.PI / 2)
+			// 				that.addObject( object );
+			// 			}, null, null );
+			// 	});
+			// new MTLLoader(manager)
+			// 	.setPath( '../static/model/obj/' )
+			// 	.load( '杞借揣鍙�.mtl', function ( materials ) {
+			// 		materials.preload();
+			// 		new OBJLoader( manager )
+			// 			.setMaterials( materials )
+			// 			.setPath( '../static/model/obj/' )
+			// 			.load( '杞借揣鍙�.obj', function ( object ) {
+			// 				object.position.z = -480;
+			// 				object.position.x = -1735;
+			// 				object.scale.set(0.03, 0.03, 0.03);
+			// 				object.rotateY(- Math.PI / 2)
+			// 				that.addObject( object );
+			// 			}, null, null );
+			// 	});
+			// new MTLLoader(manager)
+			// 	.setPath( '../static/model/obj/' )
+			// 	.load( '鍫嗗灈鏈烘湰浣�.mtl', function ( materials ) {
+			// 		materials.preload();
+			// 		new OBJLoader( manager )
+			// 			.setMaterials( materials )
+			// 			.setPath( '../static/model/obj/' )
+			// 			.load( '鍫嗗灈鏈烘湰浣�.obj', function ( object ) {
+			// 				object.position.z = -480;
+			// 				object.position.x = -1735;
+			// 				// object.position.z = 0;
+			// 				// object.position.x = 0;
+			// 				// object.position.y = 0;
+			// 				object.scale.set(0.03, 0.03, 0.03);
+			// 				object.rotateY(- Math.PI / 2)
+			// 				that.addObject( object );
+			// 			}, null, null );
+			// 	});
 		}
 		this.initModelMove = function () {
 			console.log(this.crnTasks)
@@ -388,19 +305,6 @@
 			// 	this.curve = new Route(points);
 			// }
 
-		}
-		this.modelMove = function () {
-			if (this.curve) {
-				this.progress += 0.001;
-				if (this.progress>1.0) {
-					this.curve = null;
-				} else {
-					let point = this.curve.getPoint(this.progress);
-					if(point&&point.x){
-						this.crnBody.position.set(point.x,point.y,point.z);
-					}
-				}
-			}
 		}
 		this.crnMove = function (object) {
 			for (let crnTask of this.crnTasks) {

--
Gitblit v1.9.1