GestureManipulator.cs fixed PascalCasing. GstureManager.cs fixed regression of current Interaction Source in manipulation update

Author: Stephen Hodgson

Assets/HoloToolkit/Input/Scripts/GestureManager.cs

@@ -18,8 +18,9 @@ namespace HoloToolkit.Unity
     /// information about the manipulation gesture via ManipulationOffset and ManipulationHandPosition.
     /// 
     /// Editor and Companion App Input can also be used by assigning a keyboard select key and
-    /// using the right mouse button to select the currently focused object.  Using Gestures with 
-    /// mouse is currently not supported.
+    /// using the right mouse button to select the currently focused object.
+    /// 
+    /// Using Gestures with mouse is currently not supported.
     /// </remarks>
     [RequireComponent(typeof(GazeManager))]
     public partial class GestureManager : Singleton<GestureManager>
@@ -218,14 +219,13 @@ private void InteractionManager_SourcePressed(InteractionSourceState state)
                     pressedInteractionSource.Add(state.source.id);
                 }
 
-                // If we're not currently processing a manipulation then start.
+                // Don't start another manipulation gesture if one is already underway.
                 if (!ManipulationInProgress)
                 {
                     // Cache our current source state for use later.
                     currentInteractionSourceState = state;
 
                     // Gesture Support for Controllers: (i.e. Clicker, Xbox Controller, etc.)
-                    // Don't start another manipulation gesture if one is already underway.
                     if (state.source.kind == InteractionSourceKind.Controller)
                     {
                         OnManipulation(inProgress: true, offset: ManipulationPosition);
@@ -249,6 +249,8 @@ private void InteractionManager_SourceUpdated(InteractionSourceState state)
             // Check the current interaction source matches our cached value.
             if (ManipulationInProgress && state.source.id == currentInteractionSourceState.source.id)
             {
+                currentInteractionSourceState = state;
+
                 // Gesture Support for Controllers: (i.e. Clicker, Xbox Controller, etc.)
                 if (state.source.kind == InteractionSourceKind.Controller)
                 {

Assets/HoloToolkit/Input/Scripts/GestureManipulator.cs

@@ -22,7 +22,7 @@ namespace HoloToolkit.Unity
     public class GestureManipulator : MonoBehaviour
     {
         [Tooltip("How much to scale each axis of movement (camera relative) when manipulating the object")]
-        public Vector3 positionScale = new Vector3(2.0f, 2.0f, 4.0f);  // Default tuning values, expected to be modified per application
+        public Vector3 PositionScale = new Vector3(2.0f, 2.0f, 4.0f);  // Default tuning values, expected to be modified per application
 
         private Vector3 initialManipulationPosition;
 
@@ -95,7 +95,7 @@ private void Update()
                 // the source is lost and the gesture completes.  To improve the usability of the gesture we scale each
                 // axis of movement by some amount (camera relative).  This value can be changed in the editor or
                 // at runtime based on the needs of individual movement scenarios.
-                Vector3 scaledLocalPositionDelta = Vector3.Scale(initialToCurrentPosition, positionScale);
+                Vector3 scaledLocalPositionDelta = Vector3.Scale(initialToCurrentPosition, PositionScale);
 
                 // Once we've figured out how much the object should move relative to the camera we apply that to the initial
                 // camera relative position.  This ensures that the object remains in the appropriate location relative to the camera