Properly implement enableOneHandMovement

Fixes #2021
microsoft · Jul 18, 2018 · 06751c1 · 06751c1
1 parent d874b25
commit 06751c1
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TwoHandManipulatable.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Interactions/TwoHandManipulatable.cs
@@ -237,9 +237,9 @@ private void UpdateStateMachine()
                     {
                         newState = ManipulationMode.None;
                     }
-                    else if (handsPressedCount == 1 && enableOneHandMovement)
+                    else if (handsPressedCount == 1)
                     {
-                        newState = ManipulationMode.Move;
+                        newState = enableOneHandMovement ? ManipulationMode.Move : ManipulationMode.None;
                     }
                     else if (handsPressedCount > 1)
                     {
@@ -252,14 +252,13 @@ private void UpdateStateMachine()
                 case ManipulationMode.MoveAndRotate:
                 case ManipulationMode.RotateAndScale:
                 case ManipulationMode.MoveScaleAndRotate:
-                    // TODO: if < 2, make this go to start state ('drop it')
                     if (handsPressedCount == 0)
                     {
                         newState = ManipulationMode.None;
                     }
                     else if (handsPressedCount == 1)
                     {
-                        newState = ManipulationMode.Move;
+                        newState = enableOneHandMovement ? ManipulationMode.Move : ManipulationMode.None;
                     }
                     break;
             }