js/playerFpsControl.js update to get fullscreen+mouselock on chrome

jeromeetienne · Jan 29, 2012 · dad2164 · dad2164
1 parent 20d7152
commit dad2164
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/js/playerFpsControl.js b/js/playerFpsControl.js
@@ -14,8 +14,8 @@ Marble.PlayerFpsControl = function()
  }
  console.log("mouse lock supported!!");
 
- document.addEventListener('mozfullscreenchange', this._$onFullscreenChange, false);
- document.addEventListener('webkitfullscreenchange', this._$onFullscreenChange, false);
+ document.addEventListener('mozfullscreenchange' , this._$onFullscreenChange, false);
+ document.addEventListener('webkitfullscreenchange' , this._$onFullscreenChange, false);
 }
 
 Marble.PlayerFpsControl.prototype.destroy = function()
@@ -40,13 +40,11 @@ Marble.PlayerFpsControl.prototype._onFullscreenChange = function()
 
  navigator.pointer.lock(document.body, function(){
  console.log("navigator.pointer.lock() succeed", navigator.pointer.islocked())
+
  },function(){
  console.log("navigator.pointer.lock() failled")
  });
 
- //console.log("after pointer lock, isLocked is", navigator.pointer.islocked());
- //console.assert(navigator.pointer.islocked());
-
  document.addEventListener('mousemove', this._$onMouseMove, false);
 
  // accelerator for keyboard control
@@ -58,6 +56,9 @@ Marble.PlayerFpsControl.prototype._onFullscreenChange = function()
  });
  microphysics.world().add(this._fpsAcc);
 
+ //console.log("after pointer lock, isLocked is", navigator.pointer.islocked());
+ //console.assert(navigator.pointer.islocked());
+
  }else{
  navigator.pointer.unlock(); 
  document.removeEventListener('mousemove', this._$onMousemove);

diff --git a/js/threex.fullScreen.js b/js/threex.fullScreen.js
@@ -49,7 +49,7 @@ THREEx.FullScreen.request = function(element)
 {
  element = element || document.body;
  if( this._hasWebkitFullScreen ){
- element.webkitRequestFullScreen();
+ element.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
  }else if( this._hasMozFullScreen ){
  element.mozRequestFullScreen();
  }else{