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

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

diff --git a/static/js/app.js b/static/js/app.js
index 9e5eebe..7b05551 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -5,6 +5,7 @@
 import {OBJLoader} from './lib/OBJLoader.js';
 import {StoreShelf} from './object/StoreShelf.js';
 import {StoreCrn} from './object/StoreCrn.js';
+import {StoreConvey} from './object/StoreConvey.js';
 import { Sky } from './object/Sky.js';
 
 
@@ -29,7 +30,7 @@
 		this.direction = new THREE.Vector3();
 		this.raycaster = null;
 		this.prevTime = performance.now();//涓婁竴娆ender鐨勬椂闂�
-		this.backgroundType = false;
+		this.backgroundType = true;
 
 		this.start = function () {
 			this.initMain();
@@ -47,7 +48,7 @@
 			this.initPointLockControl(this);
 			this.initFloor();
 			this.initBuilding();
-			this.initTransporter(this);
+			this.initConvey();
 		}
 		this.animate = function () {
 			requestAnimationFrame(this.animate.bind(this));
@@ -78,12 +79,12 @@
 				// this.camera.position.z = 600;
 				// //鐩告満鐨勬湞鍚�
 				// this.camera.lookAt(0, 0, 0);
-				this.camera.position.set( - 350, 1070, 1550 );
+				this.camera.position.set( -350, 600, 1100 );
 				this.camera.lookAt( this.scene.position );
 				//灏嗙浉鏈烘斁鍒板満鏅腑
 				this.scene.add(this.camera);
 			} else {
-				this.camera.position.set( - 350, 1070, 1550 );
+				this.camera.position.set( -350, 600, 1100 );
 				this.camera.lookAt( this.scene.position );
 			}
 		}
@@ -200,7 +201,7 @@
 		}
 		this.initPointLockControl = function(object){
 			this.controls = new PointerLockControls( this.camera, document.body );
-			this.raycaster = new THREE.Raycaster( new THREE.Vector3(), new THREE.Vector3( 0, - 1, 0 ), 0, 10 );
+			this.raycaster = new THREE.Raycaster( new THREE.Vector3(), new THREE.Vector3( 0, - 1, 0 ), 0,  50 );
 
 			const onKeyDown = function ( event ) {
 				switch ( event.code ) {
@@ -338,7 +339,9 @@
 				}
 			}
 		}
-		this.initTransporter = function (object) {
+		this.initConvey = function () {
+			let storeConvey = new StoreConvey(this, conveyObjects.objects)
+			storeConvey.load();
 		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
@@ -376,7 +379,6 @@
 						this.crnTasks.push(new CrnTask(crnData, this));
 					} else {
 						if(!crnTask.run) {
-							// console.log(2)
 							crnTask.modify(crnData);
 						}
 					}
@@ -413,11 +415,26 @@
 		this.lockControl = function () {
 			this.camera.position.y = 100;
 			this.camera.lookAt(900,1100,0);
-			this.controls.getObject().position.x = 0;
+			this.controls.getObject().position.x = -200;
 			this.controls.getObject().position.y = 200;
-			this.controls.getObject().position.z = 180;
+			this.controls.getObject().position.z = 200;
 			this.controls.lock();
 		}
+		this.mainView = function () {
+			this.camera.position.set( 1400, 400, 2000 );
+			this.camera.lookAt( 1400, 500, 0 );
+		}
+		this.leftView = function () {
+			this.camera.position.set( -3000, 300, -2000 );
+			this.camera.lookAt(0, 500, -2000);
+		}
+		this.verticalView = function () {
+			this.camera.position.set( 1400, 6000, -1800 );
+			this.camera.lookAt( 1400, 0, -1800 );
+		}
+		this.backlView = function () {
+			this.initCamera();
+		}
 	},
 
 };

--
Gitblit v1.9.1