Merge pull request #549 from cadenasgmbh/HandDraggableLockRotation

Added possibility to lock the objects rotation while dragging it

Author: StephenHodgson

Assets/HoloToolkit/Input/Scripts/Interactions/HandDraggable.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
@@ -31,12 +31,16 @@ public class HandDraggable : MonoBehaviour,
 
         [Tooltip("Scale by which hand movement in z is multipled to move the dragged object.")]
         public float DistanceScale = 2f;
+        
+        public enum RotationModeEnum
+        {
+            Default,
+            LockObjectRotation,
+            OrientTowardUser,
+            OrientTowardUserAndKeepUpright
+        }
 
-        [Tooltip("Should the object be kept upright as it is being dragged?")]
-        public bool IsKeepUpright = false;
-
-        [Tooltip("Should the object be oriented towards the user as it is being dragged?")]
-        public bool IsOrientTowardsUser = true;
+        public RotationModeEnum RotationMode = RotationModeEnum.Default;
 
         public bool IsDraggingEnabled = true;
 
@@ -194,11 +198,15 @@ private void UpdateDragging()
 
             draggingPosition = pivotPosition + (targetDirection * targetDistance);
 
-            if (IsOrientTowardsUser)
+            if (RotationMode == RotationModeEnum.OrientTowardUser || RotationMode == RotationModeEnum.OrientTowardUserAndKeepUpright) 
             {
                 draggingRotation = Quaternion.LookRotation(HostTransform.position - pivotPosition);
             }
-            else
+            else if (RotationMode == RotationModeEnum.LockObjectRotation)
+            {
+                draggingRotation = HostTransform.rotation;
+            }
+            else // RotationModeEnum.Default
             {
                 Vector3 objForward = mainCamera.transform.TransformDirection(objRefForward); // in world space
                 Vector3 objUp = mainCamera.transform.TransformDirection(objRefUp);   // in world space
@@ -207,12 +215,12 @@ private void UpdateDragging()
 
             // Apply Final Position
             HostTransform.position = draggingPosition + mainCamera.transform.TransformDirection(objRefGrabPoint);
+            // Apply Final Rotation
             HostTransform.rotation = draggingRotation;
-
-            if (IsKeepUpright)
-            {
-                Quaternion upRotation = Quaternion.FromToRotation(HostTransform.up, Vector3.up);
-                HostTransform.rotation = upRotation * HostTransform.rotation;
+            if (RotationMode == RotationModeEnum.OrientTowardUserAndKeepUpright)		
+            {		
+                Quaternion upRotation = Quaternion.FromToRotation(HostTransform.up, Vector3.up);		
+                HostTransform.rotation = upRotation * HostTransform.rotation;		
             }
         }