Leap motion integration. HTML interface redesign. Merge all controls into a single index.

Author: Thibaut Despoulain

bkcore/hexgl/HexGL.js

@@ -1,7 +1,7 @@
  /*
  * HexGL
  * @author Thibaut 'BKcore' Despoulain <http://bkcore.com>
- * @license This work is licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported License. 
+ * @license This work is licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported License.
  *          To view a copy of this license, visit http://creativecommons.org/licenses/by-nc/3.0/.
  */
 
@@ -73,9 +73,9 @@ bkcore.hexgl.HexGL = function(opts)
 
 	this.initRenderer();
 
-	function onKeyPress(event) 
+	function onKeyPress(event)
 	{
-		if(event.keyCode == 27/*escape*/) 
+		if(event.keyCode == 27/*escape*/)
 		{
 			self.reset();
 		}
@@ -155,6 +155,7 @@ bkcore.hexgl.HexGL.prototype.initGameplay = function()
 		pixelRatio: this.track.pixelRatio,
 		track: this.track,
 		onFinish: function() {
+			self.components.shipControls.terminate();
 			self.displayScore(this.finishTime, this.lapTimes);
 		}
 	});
@@ -173,12 +174,12 @@ bkcore.hexgl.HexGL.prototype.displayScore = function(f, l)
 		bkcore.Timer.msToTimeString(l[2])
 	];
 
-	if(this.mobile)
+	if(this.gameover !== null)
 	{
 		this.gameover.style.display = "block";
-		this.gameover.innerHTML = tf.m + "'" + tf.s + "''" + tf.ms;
-		this.containers.main.style.display = "none";
-		return; 
+		this.gameover.children[0].innerHTML = tf.m + "'" + tf.s + "''" + tf.ms;
+		this.containers.main.parentElement.style.display = "none";
+		return;
 	}
 
 	var t = this.track;
@@ -286,7 +287,7 @@ bkcore.hexgl.HexGL.prototype.initRenderer = function()
 	renderer.setSize( this.width, this.height );
 	renderer.domElement.style.position = "relative";
 
-	this.containers.main.appendChild( renderer.domElement );	
+	this.containers.main.appendChild( renderer.domElement );
 	this.canvas = renderer.domElement;
 	this.renderer = renderer;
 	this.manager = new bkcore.threejs.RenderManager(renderer);
@@ -302,7 +303,7 @@ bkcore.hexgl.HexGL.prototype.initHUD = function()
 		bg: this.track.lib.get("images", "hud.bg"),
 		speed: this.track.lib.get("images", "hud.speed"),
 		shield: this.track.lib.get("images", "hud.shield")
-	});	
+	});
 	this.containers.overlay.appendChild(this.hud.canvas);
 }
 
@@ -311,16 +312,16 @@ bkcore.hexgl.HexGL.prototype.initGameComposer = function()
 	var renderTargetParameters = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat, stencilBuffer: false };
 	var renderTarget = new THREE.WebGLRenderTarget( this.width, this.height, renderTargetParameters );
 
-	// GAME COMPOSER	
+	// GAME COMPOSER
 	var renderSky = new THREE.RenderPass( this.manager.get("sky").scene, this.manager.get("sky").camera );
 
 	var renderModel = new THREE.RenderPass( this.manager.get("game").scene, this.manager.get("game").camera );
 	renderModel.clear = false;
 
 	this.composers.game = new THREE.EffectComposer( this.renderer, renderTarget );
 
-	var effectScreen = new THREE.ShaderPass( THREE.ShaderExtras[ "screen" ] );	
-	effectScreen.renderToScreen = true;			
+	var effectScreen = new THREE.ShaderPass( THREE.ShaderExtras[ "screen" ] );
+	effectScreen.renderToScreen = true;
 	var effectVignette = new THREE.ShaderPass( THREE.ShaderExtras[ "vignette" ] );
 
 	var effectHex = new THREE.ShaderPass( bkcore.threejs.Shaders[ "hexvignette" ] );
@@ -335,17 +336,17 @@ bkcore.hexgl.HexGL.prototype.initGameComposer = function()
 	this.composers.game.addPass( renderSky );
 	this.composers.game.addPass( renderModel );
 
-	if(this.quality > 0 && !this.mobile)
-	{
-		var effectFXAA = new THREE.ShaderPass( THREE.ShaderExtras[ "fxaa" ] );
-		effectFXAA.uniforms[ 'resolution' ].value.set( 1 / this.width, 1 / this.height );
+	// if(this.quality > 0 && !this.mobile)
+	// {
+	// 	var effectFXAA = new THREE.ShaderPass( THREE.ShaderExtras[ "fxaa" ] );
+	// 	effectFXAA.uniforms[ 'resolution' ].value.set( 1 / this.width, 1 / this.height );
 
-		this.composers.game.addPass( effectFXAA );
-		
-		this.extras.fxaa = effectFXAA;
-	}
+	// 	this.composers.game.addPass( effectFXAA );
+
+	// 	this.extras.fxaa = effectFXAA;
+	// }
 	if(this.quality > 1 && !this.mobile)
-	{	
+	{
 		var effectBloom = new THREE.BloomPass( 0.8, 25, 4 , 256);
 
 		this.composers.game.addPass( effectBloom );
@@ -358,10 +359,10 @@ bkcore.hexgl.HexGL.prototype.initGameComposer = function()
 	else
 		this.composers.game.addPass( effectScreen );
 
-	
+
 }
 
-bkcore.hexgl.HexGL.prototype.createMesh = function(parent, geometry, x, y, z, mat) 
+bkcore.hexgl.HexGL.prototype.createMesh = function(parent, geometry, x, y, z, mat)
 {
 	geometry.computeTangents();
 
@@ -422,4 +423,4 @@ bkcore.hexgl.HexGL.prototype.tweakShipControls = function()
 
 	if(this.godmode)
 		c.shieldDamage = 0.0;
-}
+}