From 3ff78473653985d0e7ac96b87bd31bcb9250a762 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 18 十二月 2021 15:05:48 +0800
Subject: [PATCH] #

---
 static/js/app.js |   76 ++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 457c884..a428ab9 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -52,8 +52,8 @@
 			requestAnimationFrame(this.animate.bind(this));
 			this.stats.begin();
 			this.renderer.render(this.scene, this.camera);
-			this.stats.end();
 			this.firstPersonMove();
+			this.stats.end();
 			this.queryCrn();
 			this.crnMove();
 		}
@@ -61,24 +61,29 @@
 			this.scene = new THREE.Scene();
 		}
 		this.initCamera = function () {
-			//澹版槑涓�涓�忚鐩告満锛�
-			// 瑙嗚锛�60锛�
-			// 绾垫í姣攁spect:鍏ㄥ睆锛屼娇鐢ㄧ殑鏄祻瑙堝櫒鐨勫搴�/楂樺害
-			//杩戝钩闈ear锛�0.1
-			//杩滃钩闈㈣瑙抐ar:10000
-			this.camera = new THREE.PerspectiveCamera(60, window.innerWidth / window.innerHeight, 0.1, 50000);
-			/*
-            璁剧疆鐩告満浣嶇疆锛屾敞鎰弔hreejs涓殑鍧愭爣绯婚噰鐢ㄧ殑鏄彸鎵嬪潗鏍囩郴
-             */
-			// this.camera.position.x = 0;
-			// this.camera.position.y = 1000;
-			// this.camera.position.z = 600;
-			// //鐩告満鐨勬湞鍚�
-			// this.camera.lookAt(0, 0, 0);
-			this.camera.position.set( - 350, 1070, 1550 );
-			this.camera.lookAt( this.scene.position );
-			//灏嗙浉鏈烘斁鍒板満鏅腑
-			this.scene.add(this.camera);
+			if (this.camera === null) {
+				//澹版槑涓�涓�忚鐩告満锛�
+				// 瑙嗚锛�60锛�
+				// 绾垫í姣攁spect:鍏ㄥ睆锛屼娇鐢ㄧ殑鏄祻瑙堝櫒鐨勫搴�/楂樺害
+				//杩戝钩闈ear锛�0.1
+				//杩滃钩闈㈣瑙抐ar:10000
+				this.camera = new THREE.PerspectiveCamera(60, window.innerWidth / window.innerHeight, 0.1, 50000);
+				/*
+                璁剧疆鐩告満浣嶇疆锛屾敞鎰弔hreejs涓殑鍧愭爣绯婚噰鐢ㄧ殑鏄彸鎵嬪潗鏍囩郴
+                 */
+				// this.camera.position.x = 0;
+				// this.camera.position.y = 1000;
+				// this.camera.position.z = 600;
+				// //鐩告満鐨勬湞鍚�
+				// this.camera.lookAt(0, 0, 0);
+				this.camera.position.set( - 350, 1070, 1550 );
+				this.camera.lookAt( this.scene.position );
+				//灏嗙浉鏈烘斁鍒板満鏅腑
+				this.scene.add(this.camera);
+			} else {
+				this.camera.position.set( - 350, 1070, 1550 );
+				this.camera.lookAt( this.scene.position );
+			}
 		}
 		this.initRenderer = function () {
 			this.renderer = new THREE.WebGLRenderer();
@@ -211,7 +216,9 @@
 						object.moveRight = true;
 						break;
 					case 'Space':
-						if ( object.canJump === true ) object.velocity.y += 350;
+						if ( object.canJump === true )  {
+							object.velocity.y += 350;
+						}
 						object.canJump = false;
 						break;
 				}
@@ -237,59 +244,48 @@
 						break;
 				}
 			};
-
+			this.controls.addEventListener( 'lock', function () {
+				console.log("绗竴浜虹О瑙嗚")
+			} );
+			this.controls.addEventListener( 'unlock', function () {
+				console.log("涓婂笣瑙嗚");
+				object.initCamera();
+			} );
 			document.addEventListener( 'keydown', onKeyDown );
 			document.addEventListener( 'keyup', onKeyUp );
-
 
 			this.addObject( this.controls.getObject() );
 		}
 		this.firstPersonMove=function(){
+			const time = performance.now();
 			if ( this.controls.isLocked === true ) {
-
 				this.raycaster.ray.origin.copy( this.controls.getObject().position );
 				this.raycaster.ray.origin.y -= 10;
-
 				const intersections = this.raycaster.intersectObjects( this.objects, false );
-
 				const onObject = intersections.length > 0;
-				var time = performance.now();
 				const delta = ( time - this.prevTime ) / 1000;
-
 				this.velocity.x -= this.velocity.x * 10.0 * delta;
 				this.velocity.z -= this.velocity.z * 10.0 * delta;
-
 				this.velocity.y -= 9.8 * 100.0 * delta; // 100.0 = mass
-
 				this.direction.z = Number( this.moveForward ) - Number( this.moveBackward );
 				this.direction.x = Number( this.moveRight ) - Number( this.moveLeft );
 				this.direction.normalize(); // this ensures consistent movements in all directions
-
 				if ( this.moveForward || this.moveBackward ) this.velocity.z -= this.direction.z * 400.0 * delta;
 				if ( this.moveLeft || this.moveRight ) this.velocity.x -= this.direction.x * 400.0 * delta;
-
 				if ( onObject === true ) {
-
 					this.velocity.y = Math.max( 0, this.velocity.y );
 					this.canJump = true;
-
 				}
-
 				this.controls.moveRight( - this.velocity.x * delta );
 				this.controls.moveForward( - this.velocity.z * delta );
-
 				this.controls.getObject().position.y += ( this.velocity.y * delta ); // new behavior
-
 				if ( this.controls.getObject().position.y < 10 ) {
-
 					this.velocity.y = 0;
 					this.controls.getObject().position.y = 10;
-
 					this.canJump = true;
-
 				}
-				this.prevTime = time;
 			}
+			this.prevTime = time;
 		}
 		this.lockControl = function () {
 			this.camera.position.y = 100;

--
Gitblit v1.9.1