Merge pull request #30 from Jarodshow/patch-1

Genericised ProcessRules

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.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 Microsoft.MixedReality.Toolkit.Core.Definitions.Devices;
@@ -1746,49 +1746,40 @@ public void RaiseDictationError(IMixedRealityInputSource source, string dictatio
 
         #region Rules
 
-        private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, bool criteria)
+        private MixedRealityInputAction ProcessRules_Internal<T1, T2>(MixedRealityInputAction inputAction, T1[] inputActionRules, T2 criteria) where T1 : struct, IInputActionRule<T2>
         {
-            if (CurrentInputActionRulesProfile != null)
+            for (int i = 0; i < inputActionRules.Length; i++)
             {
-                var digitalRules = CurrentInputActionRulesProfile.InputActionRulesDigital;
-
-                for (int i = 0; i < digitalRules.Length; i++)
+                if (inputActionRules[i].BaseAction == inputAction && inputActionRules[i].Criteria.Equals(criteria))
                 {
-                    if (digitalRules[i].BaseAction == inputAction && digitalRules[i].Criteria == criteria)
+                    if (inputActionRules[i].RuleAction == inputAction)
                     {
-                        if (digitalRules[i].RuleAction == inputAction)
-                        {
-                            Debug.LogError("Input Action Rule cannot be the same as the rule's Base Action!");
-                            return inputAction;
-                        }
-
-                        return digitalRules[i].RuleAction;
+                        Debug.LogError("Input Action Rule cannot be the same as the rule's Base Action!");
+                        return inputAction;
                     }
+
+                    return inputActionRules[i].RuleAction;
                 }
             }
 
             return inputAction;
         }
 
-        private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, float criteria)
+        private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, bool criteria)
         {
             if (CurrentInputActionRulesProfile != null)
             {
-                var digitalRules = CurrentInputActionRulesProfile.InputActionRulesSingleAxis;
+                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesDigital, criteria);
+            }
 
-                for (int i = 0; i < digitalRules.Length; i++)
-                {
-                    if (digitalRules[i].BaseAction == inputAction && digitalRules[i].Criteria.Equals(criteria))
-                    {
-                        if (digitalRules[i].RuleAction == inputAction)
-                        {
-                            Debug.LogError("Input Action Rule cannot be the same as the rule's Base Action!");
-                            return inputAction;
-                        }
+            return inputAction;
+        }
 
-                        return digitalRules[i].RuleAction;
-                    }
-                }
+        private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, float criteria)
+        {
+            if (CurrentInputActionRulesProfile != null)
+            {
+                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesSingleAxis, criteria);
             }
 
             return inputAction;
@@ -1798,24 +1789,7 @@ private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction
         {
             if (CurrentInputActionRulesProfile != null)
             {
-                var digitalRules = CurrentInputActionRulesProfile.InputActionRulesDualAxis;
-
-                for (int i = 0; i < digitalRules.Length; i++)
-                {
-                    if (digitalRules[i].BaseAction == inputAction)
-                    {
-                        if (digitalRules[i].Criteria == criteria)
-                        {
-                            if (digitalRules[i].RuleAction == inputAction)
-                            {
-                                Debug.LogError("Input Action Rule cannot be the same as the rule's Base Action!");
-                                return inputAction;
-                            }
-
-                            return digitalRules[i].RuleAction;
-                        }
-                    }
-                }
+                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesDualAxis, criteria);
             }
 
             return inputAction;
@@ -1825,21 +1799,7 @@ private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction
         {
             if (CurrentInputActionRulesProfile != null)
             {
-                var digitalRules = CurrentInputActionRulesProfile.InputActionRulesVectorAxis;
-
-                for (int i = 0; i < digitalRules.Length; i++)
-                {
-                    if (digitalRules[i].BaseAction == inputAction && digitalRules[i].Criteria == criteria)
-                    {
-                        if (digitalRules[i].RuleAction == inputAction)
-                        {
-                            Debug.LogError("Input Action Rule cannot be the same as the rule's Base Action!");
-                            return inputAction;
-                        }
-
-                        return digitalRules[i].RuleAction;
-                    }
-                }
+                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesVectorAxis, criteria);
             }
 
             return inputAction;
@@ -1849,21 +1809,7 @@ private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction
         {
             if (CurrentInputActionRulesProfile != null)
             {
-                var digitalRules = CurrentInputActionRulesProfile.InputActionRulesQuaternionAxis;
-
-                for (int i = 0; i < digitalRules.Length; i++)
-                {
-                    if (digitalRules[i].BaseAction == inputAction && digitalRules[i].Criteria == criteria)
-                    {
-                        if (digitalRules[i].RuleAction == inputAction)
-                        {
-                            Debug.LogError("Input Action Rule cannot be the same as the rule's Base Action!");
-                            return inputAction;
-                        }
-
-                        return digitalRules[i].RuleAction;
-                    }
-                }
+                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesQuaternionAxis, criteria);
             }
 
             return inputAction;
@@ -1873,21 +1819,7 @@ private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction
         {
             if (CurrentInputActionRulesProfile != null)
             {
-                var digitalRules = CurrentInputActionRulesProfile.InputActionRulesPoseAxis;
-
-                for (int i = 0; i < digitalRules.Length; i++)
-                {
-                    if (digitalRules[i].BaseAction == inputAction && digitalRules[i].Criteria == criteria)
-                    {
-                        if (digitalRules[i].RuleAction == inputAction)
-                        {
-                            Debug.LogError("Input Action Rule cannot be the same as the rule's Base Action!");
-                            return inputAction;
-                        }
-
-                        return digitalRules[i].RuleAction;
-                    }
-                }
+                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesPoseAxis, criteria);
             }
 
             return inputAction;