Merge branch 'master' of github.com:borismus/webvr-polyfill

README.md

@@ -48,4 +48,6 @@ are supported:
       //K_FILTER: 0.98, // Default: 0.98.
       // How far into the future to predict during fast motion.
       //PREDICTION_TIME_S: 0.050, // Default: 0.050s.
+      // Flag to disable touch panner. In case you have your own touch controls
+      //TOUCH_PANNER_DISABLED: true, // Default: false.
     }

package.json

@@ -0,0 +1,15 @@
+{
+  "name": "webvr-polyfill",
+  "version": "0.2.0",
+  "homepage": "https://github.com/borismus/webvr-polyfill",
+  "authors": [
+    "Boris Smus <[email protected]>"
+  ],
+  "description": "Use WebVR today, on mobile or desktop, without requiring a special browser build.",
+  "main": "build/webvr-polyfill.js",
+  "keywords": [
+    "vr",
+    "webvr"
+  ],
+  "license": "Apache2"
+}

src/fusion-position-sensor-vr-device.js

@@ -35,7 +35,9 @@ function FusionPositionSensorVRDevice() {
 
   this.filter = new ComplementaryFilter(WebVRConfig.K_FILTER || 0.98);
   this.posePredictor = new PosePredictor(WebVRConfig.PREDICTION_TIME_S || 0.050);
-  this.touchPanner = new TouchPanner();
+  if (!WebVRConfig.TOUCH_PANNER_DISABLED) {
+    this.touchPanner = new TouchPanner();
+  }
 
   this.filterToWorldQ = new THREE.Quaternion();
 
@@ -51,6 +53,9 @@ function FusionPositionSensorVRDevice() {
 
   // Keep track of a reset transform for resetSensor.
   this.resetQ = new THREE.Quaternion();
+
+  this.isFirefoxAndroid = Util.isFirefoxAndroid();
+  this.isIOS = Util.isIOS();
 }
 FusionPositionSensorVRDevice.prototype = new PositionSensorVRDevice();
 
@@ -79,7 +84,9 @@ FusionPositionSensorVRDevice.prototype.getOrientation = function() {
   var out = new THREE.Quaternion();
   out.copy(this.filterToWorldQ);
   out.multiply(this.resetQ);
-  out.multiply(this.touchPanner.getOrientation());
+  if (this.touchPanner) {
+    out.multiply(this.touchPanner.getOrientation());
+  }
   out.multiply(this.predictedQ);
   out.multiply(this.worldToScreenQ);
   return out;
@@ -91,14 +98,21 @@ FusionPositionSensorVRDevice.prototype.resetSensor = function() {
   var yaw = euler.y;
   console.log('resetSensor with yaw: %f', yaw);
   this.resetQ.setFromAxisAngle(new THREE.Vector3(0, 0, 1), -yaw);
-  this.touchPanner.resetSensor();
+  if (this.touchPanner) {
+    this.touchPanner.resetSensor();
+  }
 };
 
 FusionPositionSensorVRDevice.prototype.onDeviceMotionChange_ = function(deviceMotion) {
   var accGravity = deviceMotion.accelerationIncludingGravity;
   var rotRate = deviceMotion.rotationRate;
   var timestampS = deviceMotion.timeStamp / 1000;
 
+  // Firefox Android timeStamp returns one thousandth of a millisecond.
+  if (this.isFirefoxAndroid) {
+    timestampS /= 1000;
+  }
+
   var deltaS = timestampS - this.previousTimestampS;
   if (deltaS <= Util.MIN_TIMESTEP || deltaS > Util.MAX_TIMESTEP) {
     console.warn('Invalid timestamps detected. Time step between successive ' +
@@ -109,9 +123,9 @@ FusionPositionSensorVRDevice.prototype.onDeviceMotionChange_ = function(deviceMo
   this.accelerometer.set(-accGravity.x, -accGravity.y, -accGravity.z);
   this.gyroscope.set(rotRate.alpha, rotRate.beta, rotRate.gamma);
 
-  // In iOS, rotationRate is reported in degrees, so we first convert to
-  // radians.
-  if (Util.isIOS()) {
+  // With iOS and Firefox Android, rotationRate is reported in degrees,
+  // so we first convert to radians.
+  if (this.isIOS || this.isFirefoxAndroid) {
     this.gyroscope.multiplyScalar(Math.PI / 180);
   }
 
@@ -134,7 +148,7 @@ FusionPositionSensorVRDevice.prototype.setScreenTransform_ = function() {
     case 90:
       this.worldToScreenQ.setFromAxisAngle(new THREE.Vector3(0, 0, 1), -Math.PI/2);
       break;
-    case -90: 
+    case -90:
       this.worldToScreenQ.setFromAxisAngle(new THREE.Vector3(0, 0, 1), Math.PI/2);
       break;
     case 180:

src/util.js

@@ -25,6 +25,10 @@ Util.isIOS = function() {
   return /iPad|iPhone|iPod/.test(navigator.platform);
 };
 
+Util.isFirefoxAndroid = function() {
+  return navigator.userAgent.indexOf('Firefox') !== -1 && navigator.userAgent.indexOf('Android') !== -1;
+}
+
 // Helper method to validate the time steps of sensor timestamps.
 Util.isTimestampDeltaValid = function(timestampDeltaS) {
   if (isNaN(timestampDeltaS)) {