Tidy ConstraintManager

Author: MenelvagorMilsom

Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/Constraints/ConstraintManager.cs

@@ -23,58 +23,41 @@ public ConstraintManager(GameObject gameObject)
 
         public void ApplyScaleConstraints(ref MixedRealityTransform transform, bool isOneHanded, bool isNear)
         {
-            ManipulationHandFlags handMode = isOneHanded ? ManipulationHandFlags.OneHanded : ManipulationHandFlags.TwoHanded;
-            ManipulationProximityFlags proximityMode = isNear ? ManipulationProximityFlags.Near : ManipulationProximityFlags.Far;
-            
-            foreach (var constraint in constraints)
-            {
-                if (constraint.ConstraintType == Utilities.TransformFlags.Scale &&
-                    constraint.HandType.HasFlag(handMode) &&
-                    constraint.ProximityType.HasFlag(proximityMode))
-                {
-                    constraint.ApplyConstraint(ref transform);
-                }
-            }
+            ApplyConstraintsForType(ref transform, isOneHanded, isNear, TransformFlags.Scale);
         }
 
         public void ApplyRotationConstraints(ref MixedRealityTransform transform, bool isOneHanded, bool isNear)
         {
-            ManipulationHandFlags handMode = isOneHanded ? ManipulationHandFlags.OneHanded : ManipulationHandFlags.TwoHanded;
-            ManipulationProximityFlags proximityMode = isNear ? ManipulationProximityFlags.Near : ManipulationProximityFlags.Far;
-            
+            ApplyConstraintsForType(ref transform, isOneHanded, isNear, TransformFlags.Rotate);
+        }
+
+        public void ApplyTranslationConstraints(ref MixedRealityTransform transform, bool isOneHanded, bool isNear)
+        {
+            ApplyConstraintsForType(ref transform, isOneHanded, isNear, TransformFlags.Move);
+        }
+
+        public void Initialize(MixedRealityPose worldPose)
+        {
             foreach (var constraint in constraints)
             {
-                if (constraint.ConstraintType == Utilities.TransformFlags.Rotate &&
-                    constraint.HandType.HasFlag(handMode) &&
-                    constraint.ProximityType.HasFlag(proximityMode))
-                {
-                    constraint.ApplyConstraint(ref transform);
-                }
+                constraint.Initialize(worldPose);
             }
         }
 
-        public void ApplyTranslationConstraints(ref MixedRealityTransform transform, bool isOneHanded, bool isNear)
+        private void ApplyConstraintsForType(ref MixedRealityTransform transform, bool isOneHanded, bool isNear, TransformFlags transformType)
         {
             ManipulationHandFlags handMode = isOneHanded ? ManipulationHandFlags.OneHanded : ManipulationHandFlags.TwoHanded;
             ManipulationProximityFlags proximityMode = isNear ? ManipulationProximityFlags.Near : ManipulationProximityFlags.Far;
-            
+
             foreach (var constraint in constraints)
             {
-                if (constraint.ConstraintType == Utilities.TransformFlags.Move &&
+                if (constraint.ConstraintType == transformType &&
                     constraint.HandType.HasFlag(handMode) &&
                     constraint.ProximityType.HasFlag(proximityMode))
                 {
                     constraint.ApplyConstraint(ref transform);
                 }
             }
         }
-
-        public void Initialize(MixedRealityPose worldPose)
-        {
-            foreach (var constraint in constraints)
-            {
-                constraint.Initialize(worldPose);
-            }
-        }
     }
 }