Merge pull request #11 from dorukeker/FullTilt_upgrade

Full tilt upgrade
dorukeker · Aug 11, 2015 · 1d6e17d · 1d6e17d
2 parents f2df4d9 + 7da04ea
commit 1d6e17d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -24,7 +24,7 @@
   "license": "MIT",
   "devDependencies": {
     "bootstrap": "~3.3.2",
-    "fulltilt": "0.5.2",
+    "fulltilt": "0.7",
     "es6-promise": "*"
   }
 }
diff --git a/demo/index.html b/demo/index.html
@@ -191,6 +191,10 @@
         }
 
         start_gn();
+      }).catch(function(e){
+
+        console.log(e);
+
       });
     }
 

diff --git a/lib/gyronorm.js b/lib/gyronorm.js
@@ -231,29 +231,34 @@
   */
   GyroNorm.prototype.isAvailable = function(_eventType) {
 
+    var doSnapShot = _do.getScreenAdjustedEuler();
+    var accSnapShot = _dm.getScreenAdjustedAcceleration();
+    var accGraSnapShot = _dm.getScreenAdjustedAccelerationIncludingGravity();
+    var rotRateSnapShot = _dm.getScreenAdjustedRotationRate();
+
     switch (_eventType) {
       case DEVICE_ORIENTATION:
-        return (_do.isAvailable(_do.ALPHA) && _do.isAvailable(_do.BETA) && _do.isAvailable(_do.GAMMA));
+        return ((doSnapShot.alpha && doSnapShot.alpha !== null) && (doSnapShot.beta && doSnapShot.beta !== null) && (doSnapShot.gamma && doSnapShot.gamma !== null));
         break;
 
       case ACCELERATION:
-        return (_dm.isAvailable(_dm.ACCELERATION_X) && _dm.isAvailable(_dm.ACCELERATION_Y) && _dm.isAvailable(_dm.ACCELERATION_Z));
+        return (accSnapShot && accSnapShot.x && accSnapShot.y && accSnapShot.z);
         break;
 
       case ACCELERATION_INCLUDING_GRAVITY:
-        return (_dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_X) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Y) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Z));
+        return (accGraSnapShot && accGraSnapShot.x && accGraSnapShot.y && accGraSnapShot.z);
         break;
 
       case ROTATION_RATE:
-        return (_dm.isAvailable(_dm.ROTATION_RATE_ALPHA) && _dm.isAvailable(_dm.ROTATION_RATE_BETA) && _dm.isAvailable(_dm.ROTATION_RATE_GAMMA));
+        return (rotRateSnapShot && rotRateSnapShot.alpha && rotRateSnapShot.beta && rotRateSnapShot.gamma);
         break;
 
       default:
         return {
-          deviceOrientationAvailable: (_do.isAvailable(_do.ALPHA) && _do.isAvailable(_do.BETA) && _do.isAvailable(_do.GAMMA)),
-          accelerationAvailable: (_dm.isAvailable(_dm.ACCELERATION_X) && _dm.isAvailable(_dm.ACCELERATION_Y) && _dm.isAvailable(_dm.ACCELERATION_Z)),
-          accelerationIncludingGravityAvailable: (_dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_X) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Y) && _dm.isAvailable(_dm.ACCELERATION_INCLUDING_GRAVITY_Z)),
-          rotationRateAvailable: (_dm.isAvailable(_dm.ROTATION_RATE_ALPHA) && _dm.isAvailable(_dm.ROTATION_RATE_BETA) && _dm.isAvailable(_dm.ROTATION_RATE_GAMMA))
+          deviceOrientationAvailable: ((doSnapShot.alpha && doSnapShot.alpha !== null) && (doSnapShot.beta && doSnapShot.beta !== null) && (doSnapShot.gamma && doSnapShot.gamma !== null)),
+          accelerationAvailable: (accSnapShot && accSnapShot.x && accSnapShot.y && accSnapShot.z),
+          accelerationIncludingGravityAvailable: (accGraSnapShot && accGraSnapShot.x && accGraSnapShot.y && accGraSnapShot.z),
+          rotationRateAvailable: (rotRateSnapShot && rotRateSnapShot.alpha && rotRateSnapShot.beta && rotRateSnapShot.gamma)
         }
         break;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,6 +191,10 @@ @@
             }
             start_gn();
+          }).catch(function(e){
+            console.log(e);
           });
         }
@@ Expand Down @@