Merge pull request #2771 from StephenHodgson/vNEXT-InputActionRules

vNEXT: Input Action Rules

Author: David Kline

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

@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee54661ca8af487c9db40e57d479fa48, type: 3}
+  m_Name: DefaultMixedRealityInputActionRulesProfile
+  m_EditorClassIdentifier: 
+  isCustomProfile: 0
+  inputActionRulesDigital: []
+  inputActionRulesSingleAxis: []
+  inputActionRulesDualAxis: []
+  inputActionRulesVectorAxis: []
+  inputActionRulesQuaternionAxis: []
+  inputActionRulesPoseAxis: []

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputActionRulesProfile.asset

@@ -15,6 +15,8 @@ MonoBehaviour:
   inputActionsProfile: {fileID: 11400000, guid: 723eb97b02944311b92861f473eee53e,
     type: 2}
   gesturesProfile: {fileID: 11400000, guid: bd7829a9b29409045a745b5a18299291, type: 2}
+  inputActionRulesProfile: {fileID: 11400000, guid: 03945385d89102f41855bc8f5116b199,
+    type: 2}
   pointerProfile: {fileID: 11400000, guid: 48aa63a9725047b28d4137fd0834bc31, type: 2}
   speechCommandsProfile: {fileID: 11400000, guid: e8d0393e66374dae9646851a57dc6bc1,
     type: 2}

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputActionRulesProfile.asset.meta

@@ -0,0 +1,50 @@
+// 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.Interfaces.InputSystem;
+using System;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
+{
+    /// <summary>
+    /// Generic Input Action Rule for raising actions based on specific criteria.
+    /// </summary>
+    [Serializable]
+    public struct InputActionRuleDigital : IInputActionRule<bool>
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="baseAction">The Base Action that the rule will listen to.</param>
+        /// <param name="ruleAction">The Action to raise if the criteria is met.</param>
+        /// <param name="criteria">The criteria to check against for determining if the action should be raised.</param>
+        public InputActionRuleDigital(MixedRealityInputAction baseAction, MixedRealityInputAction ruleAction, bool criteria)
+        {
+            this.baseAction = baseAction;
+            this.ruleAction = ruleAction;
+            this.criteria = criteria;
+        }
+
+        [SerializeField]
+        [Tooltip("The Base Action that the rule will listen to.")]
+        private MixedRealityInputAction baseAction;
+
+        /// <inheritdoc />
+        public MixedRealityInputAction BaseAction => baseAction;
+
+        [SerializeField]
+        [Tooltip("The Action to raise if the criteria is met.")]
+        private MixedRealityInputAction ruleAction;
+
+        /// <inheritdoc />
+        public MixedRealityInputAction RuleAction => ruleAction;
+
+        [SerializeField]
+        [Tooltip("The criteria to check against for determining if the action should be raised.")]
+        private bool criteria;
+
+        /// <inheritdoc />
+        public bool Criteria => criteria;
+    }
+}

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityInputSystemProfile.asset

@@ -0,0 +1,50 @@
+// 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.Interfaces.InputSystem;
+using System;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
+{
+    /// <summary>
+    /// Generic Input Action Rule for raising actions based on specific criteria.
+    /// </summary>
+    [Serializable]
+    public struct InputActionRuleDualAxis : IInputActionRule<Vector2>
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="baseAction">The Base Action that the rule will listen to.</param>
+        /// <param name="ruleAction">The Action to raise if the criteria is met.</param>
+        /// <param name="criteria">The criteria to check against for determining if the action should be raised.</param>
+        public InputActionRuleDualAxis(MixedRealityInputAction baseAction, MixedRealityInputAction ruleAction, Vector2 criteria)
+        {
+            this.baseAction = baseAction;
+            this.ruleAction = ruleAction;
+            this.criteria = criteria;
+        }
+
+        [SerializeField]
+        [Tooltip("The Base Action that the rule will listen to.")]
+        private MixedRealityInputAction baseAction;
+
+        /// <inheritdoc />
+        public MixedRealityInputAction BaseAction => baseAction;
+
+        [SerializeField]
+        [Tooltip("The Action to raise if the criteria is met.")]
+        private MixedRealityInputAction ruleAction;
+
+        /// <inheritdoc />
+        public MixedRealityInputAction RuleAction => ruleAction;
+
+        [SerializeField]
+        [Tooltip("The criteria to check against for determining if the action should be raised.")]
+        private Vector2 criteria;
+
+        /// <inheritdoc />
+        public Vector2 Criteria => criteria;
+    }
+}

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

@@ -0,0 +1,51 @@
+// 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.Utilities;
+using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
+using System;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem
+{
+    /// <summary>
+    /// Generic Input Action Rule for raising actions based on specific criteria.
+    /// </summary>
+    [Serializable]
+    public struct InputActionRulePoseAxis : IInputActionRule<MixedRealityPose>
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="baseAction">The Base Action that the rule will listen to.</param>
+        /// <param name="ruleAction">The Action to raise if the criteria is met.</param>
+        /// <param name="criteria">The criteria to check against for determining if the action should be raised.</param>
+        public InputActionRulePoseAxis(MixedRealityInputAction baseAction, MixedRealityInputAction ruleAction, MixedRealityPose criteria)
+        {
+            this.baseAction = baseAction;
+            this.ruleAction = ruleAction;
+            this.criteria = criteria;
+        }
+
+        [SerializeField]
+        [Tooltip("The Base Action that the rule will listen to.")]
+        private MixedRealityInputAction baseAction;
+
+        /// <inheritdoc />
+        public MixedRealityInputAction BaseAction => baseAction;
+
+        [SerializeField]
+        [Tooltip("The Action to raise if the criteria is met.")]
+        private MixedRealityInputAction ruleAction;
+
+        /// <inheritdoc />
+        public MixedRealityInputAction RuleAction => ruleAction;
+
+        [SerializeField]
+        [Tooltip("The criteria to check against for determining if the action should be raised.")]
+        private MixedRealityPose criteria;
+
+        /// <inheritdoc />
+        public MixedRealityPose Criteria => criteria;
+    }
+}