Touch input now properly registers obit, zoom and pan. There is now a…

… basic help dialog option. Removing a stream also refocusses the camera view. Updated readme file.

README.md

@@ -17,5 +17,4 @@ In this repository you will find the source code, assets and project settings of
 | ~0.1~   | ~Material UI framework and orbiting streamed objects~   						 |
 | ~0.2~   | ~Touch support and focussing view on streams~       							 |
 | 0.3     | Select objects and inspect their data			                                 |
-| 0.4     | Scale some UI panels according to screen dimensions		    	                 |
 | 1.0     | Toggle Augmented Reality view to place, move and scale a world anchor in AR      |

Speckle Viewer/Assets/Scripts/Camera System/CameraSystem.cs

@@ -13,10 +13,13 @@ public class CameraSystem : MonoBehaviour
     protected Vector3 eulerRotation = new Vector3 (15, 30, 0);
     protected float distanceFromPivot = 30f;
 
-    public float mouseSensitivity = 4f;
     public float touchSensitivity = 0.2f;
-    public float scrollSensitvity = 2f;
     public float pinchSensitvity = 0.2f;
+    public float panSensitivity = 0.5f;
+
+    [Space, Space]
+    public float mouseSensitivity = 4f;
+    public float scrollSensitvity = 2f;
     public float orbitDampening = 20f;
     public float scrollDampening = 20f;
 
@@ -47,7 +50,8 @@ void LateUpdate ()
         if (cameraDisabled) return;
         if (InputValidation.IsPointerOverUIObject ()) return;
 
-        RegisterDesktopInput ();
+        if (Application.platform != RuntimePlatform.Android)
+            RegisterDesktopInput ();
         RegisterTouchInput ();                
 
         //Actual Camera Rig Transformations
@@ -103,15 +107,16 @@ private void RegisterTouchInput ()
         {
             float currentPinchDistance = Vector2.Distance (Input.GetTouch (0).position, Input.GetTouch (1).position);
 
-            if (Input.GetTouch (1).phase == TouchPhase.Began)
-            {
-                previousPinchDistance = currentPinchDistance;
-            }
-            else if (Input.GetTouch (1).phase == TouchPhase.Moved)
-            {
-                distanceFromPivot += (previousPinchDistance - currentPinchDistance) * pinchSensitvity;
-            }
+            distanceFromPivot += currentPinchDistance * pinchSensitvity * (currentPinchDistance > previousPinchDistance ? -1 : 1);
+            previousPinchDistance = currentPinchDistance;
+        }
+
+        if (Input.touchCount == 3 && Input.GetTouch (0).phase == TouchPhase.Moved)
+        {
+            pivotTransform.Translate (Vector3.right * Input.GetTouch (0).deltaPosition.x * panSensitivity * -1);
+            pivotTransform.Translate (transform.up * Input.GetTouch (0).deltaPosition.y * panSensitivity * -1, Space.World);
         }
+
         /*
         if (Touch.activeTouches.Count == 1)
         {

Speckle Viewer/Assets/Scripts/UI/LoginBehaviour.cs

@@ -73,7 +73,12 @@ private void UpdateLoginButtonState ()
         loginButton.interactable = serverFieldHasInput && emailFieldHasInput && passwordFieldHasInput;
     }
 
-    public async void AttemptLogin ()
+    public void AttemptLogin ()
+    {
+        _ = RunAsyncLogin ();
+    }
+
+    private async Task RunAsyncLogin ()
     {
         manager.SetServerUrl (serverURL);
 

Speckle Viewer/Assets/Scripts/UI/NavDrawerBehaviour.cs

@@ -9,6 +9,7 @@ public class NavDrawerBehaviour : MonoBehaviour
     public StreamSelectionBehaviour streamSelector;
     public StreamRemoverBehaviour streamRemover;
 
+    public DialogBoxConfig helpDialog;
     private NavDrawerConfig navDrawer;
 
 
@@ -30,6 +31,11 @@ public void OnRemoveStream ()
         navDrawer.Close ();
     }
 
+    public void OnHelp ()
+    {
+        helpDialog.Open ();
+    }
+
     public void OnLogout ()
     {
         SceneManager.LoadScene (0);

Speckle Viewer/Assets/Scripts/UI/StreamRemoverBehaviour.cs

@@ -5,6 +5,8 @@
 
 public class StreamRemoverBehaviour : StreamSelectionBehaviour
 {
+    public CameraSystem cameraSystem;
+
     public override void Initialize ()
     {
         dialogBox.Open ();
@@ -16,5 +18,8 @@ public override void SelectStream (SpeckleStream stream)
     {
         dialogBox.Close ();
         manager.RemoveReceiver (stream.StreamId);
+
+        Bounds modelBounds = manager.GetBoundsForAllReceivedStreams ();
+        cameraSystem.FocusOnModel (modelBounds);
     }
 }