From 08b7ae05c0e4a3e27b856e5b623e0530ce07f38c Mon Sep 17 00:00:00 2001 From: Doruk Eker Date: Tue, 11 Aug 2015 16:08:18 +0200 Subject: [PATCH 1/3] FullTilt upgraded to latest version --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index f56053b..a6bcfaa 100644 --- 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": "*" } } From f077522703bd0de9b33ccb499bcd432d39ba078f Mon Sep 17 00:00:00 2001 From: Doruk Eker Date: Tue, 11 Aug 2015 17:30:33 +0200 Subject: [PATCH 2/3] isAvailable function updated for the new version of FullTilt --- lib/gyronorm.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/gyronorm.js b/lib/gyronorm.js index c288436..e32e6d2 100644 --- 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; } From 7da04ea150c1b9c0cb4a0aca58c45a88030b7caf Mon Sep 17 00:00:00 2001 From: Doruk Eker Date: Tue, 11 Aug 2015 17:31:03 +0200 Subject: [PATCH 3/3] 'catch' phrase added to the init function on demo --- demo/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/demo/index.html b/demo/index.html index 46018cd..0044ea8 100644 --- a/demo/index.html +++ b/demo/index.html @@ -191,6 +191,10 @@ } start_gn(); + }).catch(function(e){ + + console.log(e); + }); }