more on virtualjoystick.js

jeromeetienne · Dec 29, 2011 · a58d4a3 · a58d4a3
1 parent 06588aa
commit a58d4a3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/index.html b/index.html
@@ -8,7 +8,6 @@
 
  <link rel='stylesheet' href="css/main.css" />
  <link rel='stylesheet' href="css/osd.css" />
- <link rel='stylesheet' href="css/virtualjoystick.css" />
  <link rel='stylesheet' href="css/pageLandingMain.css" />
  <link rel='stylesheet' href="css/embedded.css" />
 

diff --git a/js/pageGameLife.js b/js/pageGameLife.js
@@ -2,6 +2,7 @@
 var gameLevel;
 var camera, scene, renderer;
 
+
 //////////////////////////////////////////////////////////////////////////////////
 // ctor/dtor //
 //////////////////////////////////////////////////////////////////////////////////

diff --git a/js/pageGameMain.js b/js/pageGameMain.js
@@ -9,22 +9,21 @@ Marble.PageGameMain = function()
  osdLayer = new Marble.OsdLayer();
  osdLayer.livesSet( this._playerLives );
 
- if( true || !VirtualJoystick.touchScreenAvailable() ){
+ var needCanvas = jQuery.url().param('render') ? true : false;
+ if( needCanvas || VirtualJoystick.touchScreenAvailable() ){
  this._virtualJoystick = new VirtualJoystick({
  mouseSupport : true
- }); 
+ });
  vJoystick = this._virtualJoystick;
  }
 
-
  this._gameLifeCtor();
 }
 
 Marble.PageGameMain.prototype.destroy = function()
 {
  this._gameLifeDtor();
 
-
  this._virtualJoystick && this._virtualJoystick.destroy();
  this._virtualJoystick = null;
  vJoystick = this._virtualJoystick;