Minor cleanup of ET related nav scripts

- Removed some deprecated parameters in the scroll scripts that were still shown in the Editor.
- Updated hand zoom parameter that was specific to zoom, but was shown for scroll.

Author: sostel

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/BaseClasses/PanZoomBase.cs

@@ -121,7 +121,7 @@ public abstract class PanZoomBase : MonoBehaviour,
         private Vector3 navPos = Vector3.zero;
         private bool isFocused = false;
         internal bool isZooming = false;
-        public bool handZoomEnabledOnStartup = false;
+        internal bool ZoomGestureEnabledOnStartup = false;
         private bool handZoomEnabled = false;
 
         protected Vector3 originalRatio;
@@ -145,7 +145,7 @@ protected virtual void Start()
         {
             // Init children
             Initialize();
-            handZoomEnabled = handZoomEnabledOnStartup;
+            handZoomEnabled = ZoomGestureEnabledOnStartup;
             Initialize();
 
             // Init eye tracking target

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/BaseClasses/PanZoomBase_Texture.cs

@@ -26,6 +26,7 @@ public string TextureShaderProperty
             }
         }
 
+        [Tooltip("Underlying aspect ratio of the loaded texture to correctly determine scaling.")]
         [SerializeField]
         private float DefaultAspectRatio = 1.0f;
 

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/PanZoom_RectTransf.cs

@@ -70,6 +70,10 @@ public class PanZoom_RectTransf : PanZoomBase_RectTransf
         [SerializeField]
         private MixedRealityInputAction Zoom_Gesture = MixedRealityInputAction.None;
 
+        [Tooltip("Enable or disable hand gestures for zooming on startup.")]
+        [SerializeField]
+        private bool Zoom_GestureEnabledOnStartup = false;
+
         // The base PanAndZoom class can also be used with UV textures for which the dimensions are different to a RectTransform.
         // To allow to keep the speed values that users can assign consistent, let's internally convert the values.
         private float convertSpeedToUVSpace = -200.0f;
@@ -96,6 +100,7 @@ protected override void Start()
             ZoomMinScale = Zoom_MinScale;
             ZoomMaxScale = Zoom_MaxScale;
             ZoomGesture = Zoom_Gesture;
+            ZoomGestureEnabledOnStartup = Zoom_GestureEnabledOnStartup;
             timeInSecondsToZoom = Zoom_TimeInSecToZoom;
 
             base.Start();

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/PanZoom_Texture.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking;
 using Microsoft.MixedReality.Toolkit.Input;
 using UnityEngine;
 
@@ -10,7 +9,6 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
     /// <summary>
     /// This script allows to scroll a texture both horizontally and vertically.
     /// </summary>
-    [RequireComponent(typeof(EyeTrackingTarget))]
     public class PanZoom_Texture : PanZoomBase_Texture
     {
         [Tooltip("Referenced renderer of the texture to be navigated.")]
@@ -42,6 +40,10 @@ public class PanZoom_Texture : PanZoomBase_Texture
         [SerializeField]
         private MixedRealityInputAction Zoom_Gesture = MixedRealityInputAction.None;
 
+        [Tooltip("Enable or disable hand gestures for zooming on startup.")]
+        [SerializeField]
+        private bool Zoom_GestureEnabledOnStartup = false;
+
         // Pan
         [Tooltip("Ability to scroll using your eye gaze without any additional input (e.g., air tap or button presses).")]
         [SerializeField]
@@ -78,6 +80,7 @@ protected override void Start()
             ZoomMinScale = Zoom_MinScale;
             ZoomMaxScale = Zoom_MaxScale;
             ZoomGesture = Zoom_Gesture;
+            ZoomGestureEnabledOnStartup = Zoom_GestureEnabledOnStartup;
             timeInSecondsToZoom = Zoom_TimeInSecToZoom;
 
             AutoGazePanIsActive = Pan_AutoScrollIsActive;

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/Scroll_RectTransf.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
 {
@@ -50,13 +49,8 @@ public class Scroll_RectTransf : PanZoomBase_RectTransf
         // To allow to keep the speed values that users can assign consistent, let's internally convert the values.
         private float convertSpeedToUVSpace = -200.0f;
 
+        [Tooltip("Custom anchor start position.")]
         [SerializeField]
-        private ContentSizeFitter contentSizeFitter;
-
-        [SerializeField]
-        private AspectRatioFitter aspectRatioFitter;
-
-        private Vector2 lastUpdatedScrollExtent = new Vector2(-1, -1);
         public Vector2 CustomStartPos;
 
         protected override void Start()

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/mrtk_eyes_03_Navigation.unity

@@ -347,7 +347,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   limitPanning: 1
-  handZoomEnabledOnStartup: 0
   RectTransfToNavigate: {fileID: 127185898}
   RefToViewPort: {fileID: 1554205715}
   AutoGazeScrollIsActive: 1
@@ -365,6 +364,7 @@ MonoBehaviour:
     id: 9
     description: Manipulate Action
     axisConstraint: 0
+  Zoom_GestureEnabledOnStartup: 0
 --- !u!114 &6659677
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2041,7 +2041,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   limitPanning: 1
-  handZoomEnabledOnStartup: 0
   DefaultAspectRatio: 1
   TextureRendererToBeScrolled: {fileID: 151708624}
   AutoGazeScrollIsActive: 1
@@ -5744,7 +5743,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   limitPanning: 0
-  handZoomEnabledOnStartup: 1
   DefaultAspectRatio: 0.5
   RendererOfTextureToBeNavigated: {fileID: 1198226481}
   Zoom_Acceleration: 10
@@ -5756,12 +5754,13 @@ MonoBehaviour:
     id: 9
     description: Manipulate Action
     axisConstraint: 0
+  Zoom_GestureEnabledOnStartup: 1
   Pan_AutoScrollIsActive: 1
   Pan_Speed_x: 0.3
   Pan_Speed_y: 0.3
   Pan_MinDistFromCenter: {x: 0.2, y: 0.2}
   UseSkimProofing: 1
-  SkimProofUpdateSpeed: 8.5
+  SkimProofUpdateSpeed: 5
 --- !u!114 &1198226478
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6855,17 +6854,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   limitPanning: 1
-  handZoomEnabledOnStartup: 0
   RectTransfToNavigate: {fileID: 1852894734}
   RefToViewPort: {fileID: 1295463316}
   AutoGazeScrollIsActive: 1
   ScrollSpeed_x: 0
   ScrollSpeed_y: 0.3
   MinDistFromCenterForAutoScroll: {x: 0.2, y: 0.2}
   UseSkimProofing: 1
-  SkimProofUpdateSpeed: 8
-  contentSizeFitter: {fileID: 1852894737}
-  aspectRatioFitter: {fileID: 0}
+  SkimProofUpdateSpeed: 5
   CustomStartPos: {x: 0, y: 0}
 --- !u!114 &1380263302
 MonoBehaviour:
@@ -9993,7 +9989,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   limitPanning: 1
-  handZoomEnabledOnStartup: 0
   RectTransfToNavigate: {fileID: 1465011397}
   RefToViewPort: {fileID: 240345431}
   AutoGazeScrollIsActive: 1
@@ -10002,8 +9997,6 @@ MonoBehaviour:
   MinDistFromCenterForAutoScroll: {x: 0.2, y: 0.2}
   UseSkimProofing: 1
   SkimProofUpdateSpeed: 5
-  contentSizeFitter: {fileID: 0}
-  aspectRatioFitter: {fileID: 0}
   CustomStartPos: {x: 0, y: 0}
 --- !u!114 &2086128682
 MonoBehaviour:
@@ -10076,7 +10069,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   limitPanning: 1
-  handZoomEnabledOnStartup: 0
   RectTransfToNavigate: {fileID: 1465011397}
   RefToViewPort: {fileID: 0}
   AutoGazeScrollIsActive: 1
@@ -10094,3 +10086,4 @@ MonoBehaviour:
     id: 9
     description: Manipulate Action
     axisConstraint: 0
+  Zoom_GestureEnabledOnStartup: 0

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2018.3.9f1
+m_EditorVersion: 2018.3.8f1