Renamed ManualHandControl to EditorInputControl.

Moved ManualGazeControl and HandGuidance.

Author: Stephen Hodgson

Assets/HoloToolkit/Input/Scripts/InputSources/EditorHandsInputSource.cs

@@ -12,7 +12,7 @@ namespace HoloToolkit.Unity.InputModule
     /// than the standard GestureRecognizer.
     /// </summary>
     /// <remarks>This input source only triggers SourceUp and SourceDown for the hands. Everything else is handled by InteractionInputSource.</remarks>
-    [RequireComponent(typeof(ManualHandControl))]
+    [RequireComponent(typeof(EditorInputControl))]
     public class EditorHandsInputSource : BaseInputSource
     {
         /// <summary>
@@ -47,7 +47,7 @@ public EditorHandData(uint handId)
             public Vector3 CumulativeDelta;
         }
 
-        private ManualHandControl manualHandControl;
+        private EditorInputControl editorInputControl;
 
         /// <summary>
         /// Dispatched each frame that a hand is moving.
@@ -182,7 +182,7 @@ private void Awake()
 #if !UNITY_EDITOR
             Destroy(this);
 #else
-            manualHandControl = GetComponent<ManualHandControl>();
+            editorInputControl = GetComponent<EditorInputControl>();
             for (uint i = 0; i < editorHandsData.Length; i++)
             {
                 editorHandsData[i] = new EditorHandData(i);
@@ -209,7 +209,7 @@ private void UpdateHandData()
             float time;
             float deltaTime;
 
-            if (manualHandControl.UseUnscaledTime)
+            if (editorInputControl.UseUnscaledTime)
             {
                 time = Time.unscaledTime;
                 deltaTime = Time.unscaledDeltaTime;
@@ -220,19 +220,19 @@ private void UpdateHandData()
                 deltaTime = Time.deltaTime;
             }
 
-            if (manualHandControl.LeftHandInView)
+            if (editorInputControl.LeftHandInView)
             {
                 GetOrAddHandData(0);
                 currentHands.Add(0);
 
-                UpdateHandState(manualHandControl.LeftHandSourceState, editorHandsData[0], deltaTime, time);
+                UpdateHandState(editorInputControl.LeftHandSourceState, editorHandsData[0], deltaTime, time);
             }
 
-            if (manualHandControl.RightHandInView)
+            if (editorInputControl.RightHandInView)
             {
                 GetOrAddHandData(1);
                 currentHands.Add(1);
-                UpdateHandState(manualHandControl.RightHandSourceState, editorHandsData[1], deltaTime, time);
+                UpdateHandState(editorInputControl.RightHandSourceState, editorHandsData[1], deltaTime, time);
             }
         }
 

…t/Scripts/Utilities/ManualHandControl.cs …ities/Interactions/EditorInputControl.csAssets/HoloToolkit/Input/Scripts/Utilities/ManualHandControl.cs renamed to Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/EditorInputControl.cs Assets/HoloToolkit/Input/Scripts/Utilities/ManualHandControl.cs renamed to Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/EditorInputControl.cs

@@ -83,7 +83,7 @@ public bool TryGetVelocity(out Vector3 velocity)
     /// <summary>
     /// Class for manually controlling the hand(s) when not running on HoloLens (in editor).
     /// </summary>
-    public class ManualHandControl : MonoBehaviour
+    public class EditorInputControl : MonoBehaviour
     {
         public float HandReturnFactor = 0.25f;  /// [0.0,1.0] the closer this is to one the faster it brings the hand back to center
         public float HandTimeBeforeReturn = 0.5f;