[WIP] Initial attempt to solve transition between controls

src/lib/controls/DeviceOrientationControls.js

@@ -1,4 +1,5 @@
 import * as THREE from 'three';
+import { isAndroid } from '../../utils/Utility';
 
 /**
  * @classdesc Device Orientation Control
@@ -17,14 +18,27 @@ function DeviceOrientationControls ( object ) {
 
     this.enabled = true;
 
-    this.deviceOrientation = {};
+    this.deviceOrientation = null;
     this.screenOrientation = 0;
 
     this.alphaOffset = 0; // radians
+    this.initialOffset = null;
 
-    const onDeviceOrientationChangeEvent = function ( event ) {
+    const onDeviceOrientationChangeEvent = function ( { alpha, beta, gamma } ) {
 
-        scope.deviceOrientation = event;
+        if( isAndroid ) {
+
+            if( scope.initialOffset === null ) {
+                scope.initialOffset = alpha;
+            }
+
+            alpha = alpha - scope.initialOffset;
+
+            if(alpha < 0) alpha += 360;
+
+        }
+
+        scope.deviceOrientation = { alpha, beta, gamma };
 
     };
 
@@ -36,8 +50,8 @@ function DeviceOrientationControls ( object ) {
 
     const onRegisterEvent = function() {
 
-        window.addEventListener( 'orientationchange', onScreenOrientationChangeEvent, { passive: false } );
-        window.addEventListener( 'deviceorientation', onDeviceOrientationChangeEvent, { passive: false } );
+        window.addEventListener( 'orientationchange', onScreenOrientationChangeEvent, false );
+        window.addEventListener( 'deviceorientation', onDeviceOrientationChangeEvent, false );
 
     }.bind( this );
 
@@ -109,7 +123,7 @@ function DeviceOrientationControls ( object ) {
 
     };
 
-    this.update = function (thetaDamping = 0) {
+    this.update = function ({ theta }) {
 
         if ( scope.enabled === false ) return;
 
@@ -125,9 +139,7 @@ function DeviceOrientationControls ( object ) {
 
             const orient = scope.screenOrientation ? THREE.Math.degToRad( scope.screenOrientation ) : 0; // O
 
-            scope.thetaOffsetSum += thetaDamping;
-
-            setObjectQuaternion( scope.object.quaternion, alpha + scope.thetaOffsetSum, beta, gamma, orient );
+            setObjectQuaternion( scope.object.quaternion, alpha + theta, beta, gamma, orient );
 
         }
 

src/lib/controls/OrbitControls.js

@@ -345,12 +345,13 @@ function OrbitControls ( object, domElement ) {
             thetaDelta = THREE.Math.clamp(thetaDelta, -this.speedLimit, this.speedLimit);
             phiDelta = THREE.Math.clamp(phiDelta, -this.speedLimit, this.speedLimit);
         }
-
-        scope.publicSphericalDelta.theta = thetaDelta; // DeviceOrientationControl support
-
+
         theta += thetaDelta;
         phi += phiDelta;
 
+        // DeviceOrientationControl support
+        scope.publicSphericalDelta.data = { theta }; 
+
         // restrict theta to be between desired limits
         theta = Math.max( this.minAzimuthAngle, Math.min( this.maxAzimuthAngle, theta ) );
 

src/utils/Utility.js

@@ -0,0 +1,25 @@
+
+/**
+ * User Agent
+ */
+const ua = navigator.userAgent || navigator.vendor || window.opera;
+
+/**
+ * Check if mobile device
+ */
+const isMobile = (() => {
+
+    return /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(ua)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(ua.substr(0,4));
+
+})();
+
+/**
+ * Check if Android
+ */
+const isAndroid = (() => {
+
+    return /(android)/i.test(ua);
+
+})();
+
+export { isMobile, isAndroid };

src/viewer/Viewer.js

@@ -1788,7 +1788,7 @@ Viewer.prototype = Object.assign( Object.create( THREE.EventDispatcher.prototype
         // Control Update
         OrbitControls.update();
         if ( control === DeviceOrientationControls ) {
-            DeviceOrientationControls.update(OrbitControls.publicSphericalDelta.theta);
+            DeviceOrientationControls.update(OrbitControls.publicSphericalDelta.data);
         }
 
         // Infospot Update