From ff74c131cbbdbd12e717ed2cc36bac2645c31d18 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 22 十二月 2021 09:14:00 +0800
Subject: [PATCH] #

---
 static/js/app.js |   84 ++++++++----------------------------------
 1 files changed, 16 insertions(+), 68 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 450a51e..79b5599 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -29,7 +29,7 @@
 		this.direction = new THREE.Vector3();
 		this.raycaster = null;
 		this.prevTime = performance.now();//涓婁竴娆ender鐨勬椂闂�
-		this.backgroundType = true;
+		this.backgroundType = false;
 
 		this.start = function () {
 			this.initMain();
@@ -46,14 +46,13 @@
 			this.initReSize(this);
 			this.initPointLockControl(this);
 			this.initFloor();
-			this.initModel();
-			this.initStoreObjects(this);
 		}
 		this.animate = function () {
 			requestAnimationFrame(this.animate.bind(this));
 			this.stats.begin();
 			this.renderer.render(this.scene, this.camera);
 			this.firstPersonMove();
+			this.initStoreObjects(this);
 			this.stats.end();
 			this.queryCrn();
 			this.crnMove();
@@ -159,7 +158,7 @@
 				this.scene.background = new THREE.Color( 0xf0f0f0 );
 			} else {
 				const cubeTextureLoader = new THREE.CubeTextureLoader();
-				cubeTextureLoader.setPath( '../static/img/skybox/' );
+				cubeTextureLoader.setPath( '../static/img/skybox0/' );
 				this.scene.background = cubeTextureLoader.load([
 					"px.jpg", "nx.jpg",
 					"py.jpg", "ny.jpg",
@@ -254,6 +253,8 @@
 			this.controls.addEventListener( 'unlock', function () {
 				console.log("涓婂笣瑙嗚");
 				object.initCamera();
+				addClass(document.getElementById("ship-info-btn"), "show");
+				document.getElementById("ship-type-ul").style.transform = 'translateY(-40px)';
 			} );
 			document.addEventListener( 'keydown', onKeyDown );
 			document.addEventListener( 'keyup', onKeyUp );
@@ -291,14 +292,6 @@
 			}
 			this.prevTime = time;
 		}
-		this.lockControl = function () {
-			this.camera.position.y = 100;
-			this.camera.lookAt(0,100,0);
-			this.controls.getObject().position.x =0;
-			this.controls.getObject().position.y =100;
-			this.controls.getObject().position.z =580;
-			this.controls.lock();
-		}
 		this.removeObject = function (nameorid) {
 			for (let i = 0; i < this.objects.length; i++) {
 				let tmpObject = this.objects[i];
@@ -333,8 +326,7 @@
 		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
-				initStore();
-				if (Store3DData !== null) {
+				if (Store3DData !== undefined && Store3DData !== null) {
 					for(var group of Store3DData.data.store.groups) {
 						new StoreCrn(group.crn, object);
 						for (var line of group.lines) {
@@ -356,11 +348,12 @@
 
 						}
 					}
+					this.firstTime = 0;
 				}
 			}
 		}
 		this.queryCrn = function () {
-			if (CrnDatas !== null) {
+			if (CrnDatas !== null && this.firstTime === 0) {
 				for (let crnData of CrnDatas) {
 					let crnTask = getArrVal(this.crnTasks, "crnNo", crnData.crnNo);
 					if (null == crnTask) {
@@ -383,59 +376,6 @@
 			}
 			return null;
 		}
-		this.initModel = function () {
-			let that = this;
-			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 = -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.crnMove = function (object) {
 			for (let crnTask of this.crnTasks) {
 				crnTask.move();
@@ -454,6 +394,14 @@
 			this.backgroundType = !this.backgroundType;
 			this.initBackground();
 		}
+		this.lockControl = function () {
+			this.camera.position.y = 100;
+			this.camera.lookAt(0,100,0);
+			this.controls.getObject().position.x =0;
+			this.controls.getObject().position.y =100;
+			this.controls.getObject().position.z =580;
+			this.controls.lock();
+		}
 	},
 
 };

--
Gitblit v1.9.1