Updated Input Action Rules Inspector

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs

@@ -73,7 +73,7 @@ public class MixedRealityInputManager : MixedRealityEventManager, IMixedRealityI
         private SpeechEventData speechEventData;
         private DictationEventData dictationEventData;
 
-        public MixedRealityInputActionRulesProfile CurrentInputActionRulesProfile { get; set; }
+        private MixedRealityInputActionRulesProfile CurrentInputActionRulesProfile { get; set; }
 
         #region IMixedRealityManager Implementation
 
@@ -1444,7 +1444,7 @@ public void RaiseDictationError(IMixedRealityInputSource source, string dictatio
 
         #region Rules
 
-        private MixedRealityInputAction ProcessRules_Internal<T1, T2>(MixedRealityInputAction inputAction, T1[] inputActionRules, T2 criteria) where T1 : struct, IInputActionRule<T2>
+        private static MixedRealityInputAction ProcessRules_Internal<T1, T2>(MixedRealityInputAction inputAction, T1[] inputActionRules, T2 criteria) where T1 : struct, IInputActionRule<T2>
         {
             for (int i = 0; i < inputActionRules.Length; i++)
             {
@@ -1456,6 +1456,12 @@ private MixedRealityInputAction ProcessRules_Internal<T1, T2>(MixedRealityInputA
                         return inputAction;
                     }
 
+                    if (inputActionRules[i].BaseAction.AxisConstraint != inputActionRules[i].RuleAction.AxisConstraint)
+                    {
+                        Debug.LogError("Input Action Rule doesn't have the same Axis Constraint as the Base Action!");
+                        return inputAction;
+                    }
+
                     return inputActionRules[i].RuleAction;
                 }
             }

Assets/MixedRealityToolkit-SDK/Profiles/MixedRealityInputActionRulesProfile.asset

@@ -11,3 +11,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ee54661ca8af487c9db40e57d479fa48, type: 3}
   m_Name: MixedRealityInputActionRulesProfile
   m_EditorClassIdentifier: 
+  isCustomProfile: 0
+  inputActionRulesDigital: []
+  inputActionRulesSingleAxis: []
+  inputActionRulesDualAxis: []
+  inputActionRulesVectorAxis: []
+  inputActionRulesQuaternionAxis: []
+  inputActionRulesPoseAxis: []

Assets/MixedRealityToolkit/_Core/Definitions/InputSystem/MixedRealityInputActionRulesProfile.cs

@@ -7,7 +7,7 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
 {
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Input Action Rules Profile", fileName = "MixedRealityInputActionRulesProfile", order = (int)CreateProfileMenuItemIndices.InputActionRules)]
-    public class MixedRealityInputActionRulesProfile : ScriptableObject
+    public class MixedRealityInputActionRulesProfile : BaseMixedRealityProfile
     {
         [SerializeField]
         private InputActionRuleDigital[] inputActionRulesDigital;