From f91133296e15158d69d4af21b8b5ed363d29ea75 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 21 十二月 2021 12:25:57 +0800
Subject: [PATCH] #

---
 static/js/app.js |   64 +++-----------------------------
 1 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 450a51e..04ed3c5 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();
@@ -333,8 +332,8 @@
 		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
-				initStore();
-				if (Store3DData !== null) {
+				// initStore();
+				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,6 +355,7 @@
 
 						}
 					}
+					this.firstTime = 0;
 				}
 			}
 		}
@@ -383,59 +383,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 +401,7 @@
 			this.backgroundType = !this.backgroundType;
 			this.initBackground();
 		}
+
 	},
 
 };

--
Gitblit v1.9.1