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

---
 static/js/app.js |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 288ebe8..4c26fdd 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';
 
 
@@ -46,6 +47,8 @@
 			this.initReSize(this);
 			this.initPointLockControl(this);
 			this.initFloor();
+			this.initBuilding();
+			this.initConvey();
 		}
 		this.animate = function () {
 			requestAnimationFrame(this.animate.bind(this));
@@ -76,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 );
 			}
 		}
@@ -324,6 +327,22 @@
 
 			// this.addObject(new Floor({position: {}}))
 		}
+		this.initBuilding = function () {
+			let buildingData = buildingObjects.objects;
+			for (let i = 0; i < buildingData.length; i++) {
+				let objectOption = buildingData[i];
+				switch (objectOption.objectType) {
+					case "cube":
+						let cube = new Cube(objectOption);
+						this.addObject(cube);
+						break;
+				}
+			}
+		}
+		this.initConvey = function () {
+			let storeConvey = new StoreConvey(this, conveyObjects.objects)
+			storeConvey.load();
+		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
 				if (Store3DData !== undefined && Store3DData !== null) {
@@ -397,11 +416,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