Kilosoft/ZeroVR
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW HVR 2.9.1f

Browse Source
This commit is contained in:
Kilosoft
2023-03-25 03:17:58 +03:00
parent f0bf64ed45
commit 91acc4d728
243 changed files with 16657 additions and 11137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZeroPacientVR/Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRInputManager.cs
+27 -31
View File
@@ -33,7 +33,9 @@ using Valve.VR;
namespace HurricaneVR.Framework.ControllerInput
{
[Serializable]
public class HVRControllerEvent : UnityEvent<HVRController> { }
public class HVRControllerEvent : UnityEvent<HVRController>
{
}
public class HVRInputManager : MonoBehaviour
{
@@ -50,15 +52,16 @@ namespace HurricaneVR.Framework.ControllerInput
public const string Reverb = "reverb";
public const string G2 = "g2";
public const string OpenXR_G2 = "hp reverb g2 controller";
public const string Pico = "pico";
public const string LegacyOpenVRName = "OpenVR";
public const string LegacyOculusName = "Oculus";
public const string LegacyNone = "None";
[Header("XR Plugin Detection Names")]
public string OpenVRLoader = "Open VR Loader";
public string OculusLoader = "Oculus Loader";
public string OpenXRLoader = "Open XR Loader";
public string WMRLoader = "Windows MR Loader";
@@ -70,9 +73,7 @@ namespace HurricaneVR.Framework.ControllerInput
public static HVRInputManager Instance { get; private set; }
[Header("Oculus - Requires Oculus Asset + Integration")]
[Tooltip("If true ovrinputs will be used")]
public bool UseOVRInputs;
@@ -84,10 +85,10 @@ namespace HurricaneVR.Framework.ControllerInput
[Header("SteamVR - Requires SteamVR + Integration")]
public bool InitializeSteamVR = true;
public bool InitializeSteamVRActions = true;
[Header("Input Settings")]
[Tooltip("If true uses the new input system bindings")]
public bool UseNewInputSystem;
@@ -105,8 +106,10 @@ namespace HurricaneVR.Framework.ControllerInput
[Header("Device Specific Settings")]
public HVRInputSettings WMRInputMap;
[FormerlySerializedAs("WMRWithButtonsInputMap")]
public HVRInputSettings ReverbG2InputMap;
public HVRInputSettings OculusInputMap;
public HVRInputSettings ViveInputMap;
public HVRInputSettings KnucklesInputMap;
@@ -178,8 +181,11 @@ namespace HurricaneVR.Framework.ControllerInput
public string RightManufacturer;
public string RightControllerName;
[SerializeField] private HVRControllerType LeftXRInputSystem = HVRControllerType.None;
[SerializeField] private HVRControllerType RightControllerType = HVRControllerType.None;
[SerializeField]
private HVRControllerType LeftControllerType = HVRControllerType.None;
[SerializeField]
private HVRControllerType RightControllerType = HVRControllerType.None;
public List<string> LeftFeatures = new List<string>();
public List<string> RightFeatures = new List<string>();
@@ -243,7 +249,6 @@ namespace HurricaneVR.Framework.ControllerInput
{
get
{
if (!HMDActive)
return false;
@@ -258,8 +263,6 @@ namespace HurricaneVR.Framework.ControllerInput
}
#elif !UNITY_2020_1_OR_NEWER
//https://stackoverflow.com/questions/51372771/how-to-check-if-a-hmd-in-unity-2018-is-in-use
#pragma warning disable 0618
//if xr management wasn't detected use the old API for legacy VR
@@ -287,6 +290,7 @@ namespace HurricaneVR.Framework.ControllerInput
}
private InputDevice _leftDevice;
public InputDevice LeftDevice
{
get
@@ -299,6 +303,7 @@ namespace HurricaneVR.Framework.ControllerInput
}
private InputDevice _rightDevice;
public InputDevice RightDevice
{
get
@@ -311,8 +316,6 @@ namespace HurricaneVR.Framework.ControllerInput
}
private bool _isHMDFirstActivationReported;
@@ -392,7 +395,7 @@ namespace HurricaneVR.Framework.ControllerInput
#if HVR_OCULUS
if (UseOVRInputs && ForceOVRInputUpdate && (LeftXRInputSystem == HVRControllerType.Oculus || RightControllerType == HVRControllerType.Oculus))
if (UseOVRInputs && ForceOVRInputUpdate && (LeftControllerType == HVRControllerType.Oculus || RightControllerType == HVRControllerType.Oculus))
{
HVROculusController.UpdateOVRInput();
}
@@ -552,7 +555,6 @@ namespace HurricaneVR.Framework.ControllerInput
RightController = UpdateController(RightControllerType, device, HVRHandSide.Right);
if (device.isValid)
RightControllerConnected.Invoke(RightController);
}
private void UpdateLeftController(InputDevice device)
@@ -574,8 +576,8 @@ namespace HurricaneVR.Framework.ControllerInput
}
}
LeftXRInputSystem = GetController(LeftDevice.manufacturer?.ToLower(), LeftDevice.name?.ToLower());
LeftController = UpdateController(LeftXRInputSystem, device, HVRHandSide.Left);
LeftControllerType = GetController(LeftDevice.manufacturer?.ToLower(), LeftDevice.name?.ToLower());
LeftController = UpdateController(LeftControllerType, device, HVRHandSide.Left);
if (device.isValid)
LeftControllerConnected.Invoke(LeftController);
}
@@ -613,6 +615,7 @@ namespace HurricaneVR.Framework.ControllerInput
inputMap = WMRInputMap;
deadZone = WMRDeadzone;
break;
case HVRControllerType.Pico:
case HVRControllerType.Oculus:
inputMap = OculusInputMap;
deadZone = OculusDeadzone;
@@ -801,7 +804,6 @@ namespace HurricaneVR.Framework.ControllerInput
}
if (manufaturerToLower.Contains(Oculus))
{
return HVRControllerType.Oculus;
@@ -832,6 +834,8 @@ namespace HurricaneVR.Framework.ControllerInput
return HVRControllerType.WMR;
}
if (nameToLower.Contains(Pico))
return HVRControllerType.Pico;
return HVRControllerType.None;
}
@@ -896,6 +900,7 @@ namespace HurricaneVR.Framework.ControllerInput
{
Debug.LogWarning($"HVR: {OpenVRLoader} active without SteamVR installed or HVR_STEAMVR define set.");
}
CurrentSDK = InputSDK.SteamVR;
return;
}
@@ -906,7 +911,7 @@ namespace HurricaneVR.Framework.ControllerInput
}
//legacy vr
if (LeftXRInputSystem == HVRControllerType.Oculus || RightControllerType == HVRControllerType.Oculus)
if (LeftControllerType == HVRControllerType.Oculus || RightControllerType == HVRControllerType.Oculus)
{
CurrentSDK = UseOVRInputs ? InputSDK.Oculus : InputSDK.XRInput;
return;
@@ -926,7 +931,6 @@ namespace HurricaneVR.Framework.ControllerInput
#if !OPENVR_DESKTOP && !OPENVR_XR
return false;
#else
#if OPENVR_DESKTOP
if (!Valve.VR.SteamVR.usingNativeSupport)
@@ -977,13 +981,12 @@ namespace HurricaneVR.Framework.ControllerInput
#else
loaders = string.Join(",", XRGeneralSettings.Instance.Manager.loaders.Select(e => e.name));
#endif
Debug.Log($"{ XRGeneralSettings.Instance.Manager.automaticLoading}");
Debug.Log($"XRGeneralSettings.Instance.Manager.isInitializationComplete { XRGeneralSettings.Instance.Manager.isInitializationComplete}");
Debug.Log($"{XRGeneralSettings.Instance.Manager.automaticLoading}");
Debug.Log($"XRGeneralSettings.Instance.Manager.isInitializationComplete {XRGeneralSettings.Instance.Manager.isInitializationComplete}");
Debug.Log($"XRPlugin Detected | XRSettings.enabled {XRSettings.enabled} | Loader : {XRPluginLoader} | Loaders Enabled: {loaders}");
XRPluginActive = XRSettings.enabled && XRGeneralSettings.Instance.Manager.isInitializationComplete;
#elif !UNITY_2020_1_OR_NEWER
var legacyDevices = "";
foreach (var t in XRSettings.supportedDevices)
{
@@ -1025,7 +1028,6 @@ namespace HurricaneVR.Framework.ControllerInput
}
public void StopXR()
{
#if USING_XR_MANAGEMENT
@@ -1059,10 +1061,8 @@ namespace HurricaneVR.Framework.ControllerInput
Debug.LogWarning($"XR Plugin Management is in use. Cannot load Legacy VR");
return;
#elif !UNITY_2020_1_OR_NEWER
StartCoroutine(LoadLegacy(callback));
#endif
}
@@ -1101,6 +1101,7 @@ namespace HurricaneVR.Framework.ControllerInput
{
callback(false);
}
LegacyActive = false;
}
}
@@ -1152,7 +1153,6 @@ namespace HurricaneVR.Framework.ControllerInput
IsSteamVR = true;
#endif
}
private void StopSteamVR()
@@ -1198,8 +1198,6 @@ namespace HurricaneVR.Framework.ControllerInput
}
#elif !UNITY_2020_1_OR_NEWER
if (originFlags == TrackingOriginModeFlags.Floor)
{
#pragma warning disable 0618
@@ -1220,7 +1218,6 @@ namespace HurricaneVR.Framework.ControllerInput
}
#endif
}
}
@@ -1229,5 +1226,4 @@ namespace HurricaneVR.Framework.ControllerInput
Legacy,
XRPlugin
}
}
}
ZeroPacientVR/Assets/HurricaneVR/Framework/Scripts/ControllerInput/HVRPlayerInputs.cs
+57 -19
View File
@@ -16,6 +16,7 @@ namespace HurricaneVR.Framework.ControllerInput
{
[Header("Grab Settings")]
public bool CanDistanceGrab = true;
public bool CanTriggerGrab;
[Tooltip("For non flick style force grabber")]
@@ -26,6 +27,7 @@ namespace HurricaneVR.Framework.ControllerInput
[Header("Inputs Debugging")]
public Vector2 MovementAxis;
public Vector2 TurnAxis;
public bool IsTeleportActivated;
@@ -88,6 +90,15 @@ namespace HurricaneVR.Framework.ControllerInput
AfterInputUpdate();
}
protected virtual void OnEnable()
{
}
protected virtual void OnDisable()
{
}
protected virtual void UpdateInput()
{
if (!UpdateInputs)
@@ -130,11 +141,9 @@ namespace HurricaneVR.Framework.ControllerInput
protected virtual void AfterInputUpdate()
{
}
protected void ResetState(ref HVRButtonState buttonState)
{
buttonState.JustDeactivated = false;
@@ -172,7 +181,7 @@ namespace HurricaneVR.Framework.ControllerInput
{
if (RightController.ControllerType == HVRControllerType.Vive)
{
return false;//todo
return false; //todo
}
return false;
@@ -180,10 +189,11 @@ namespace HurricaneVR.Framework.ControllerInput
protected virtual void GetForceGrabActivated(out bool left, out bool right)
{
left = false;
right = false;
if (!CanDistanceGrab)
{
left = false;
right = false;
return;
}
@@ -192,24 +202,52 @@ namespace HurricaneVR.Framework.ControllerInput
left = LeftController.GripButtonState.JustActivated;
right = RightController.GripButtonState.JustActivated;
}
else
else if (ForceGrabActivation == HVRForceGrabActivation.GripAndTrigger)
{
left = LeftController.GripButtonState.Active && LeftController.TriggerButtonState.JustActivated || LeftController.TriggerButtonState.Active && LeftController.GripButtonState.JustActivated;
right = RightController.GripButtonState.Active && RightController.TriggerButtonState.JustActivated || RightController.TriggerButtonState.Active && RightController.GripButtonState.JustActivated;
left = LeftController.GripButtonState.Active && LeftTriggerGrabState.JustActivated || LeftTriggerGrabState.Active && LeftController.GripButtonState.JustActivated;
right = RightController.GripButtonState.Active && RightTriggerGrabState.JustActivated || RightTriggerGrabState.Active && RightController.GripButtonState.JustActivated;
}
else if (ForceGrabActivation == HVRForceGrabActivation.Trigger)
{
left = LeftTriggerGrabState.JustActivated;
right = RightTriggerGrabState.JustActivated;
}
else if (ForceGrabActivation == HVRForceGrabActivation.GripOrTrigger)
{
left = LeftController.GripButtonState.JustActivated || LeftTriggerGrabState.JustActivated;
right = RightController.GripButtonState.JustActivated || RightTriggerGrabState.JustActivated;
}
}
protected virtual void GetForceGrabActive(out bool left, out bool right)
{
left = false;
right = false;
if (!CanDistanceGrab)
{
left = false;
right = false;
return;
}
left = LeftController.GripButtonState.Active;
right = RightController.GripButtonState.Active;
if (ForceGrabActivation == HVRForceGrabActivation.Grip)
{
left = LeftController.GripButtonState.Active;
right = RightController.GripButtonState.Active;
}
else if (ForceGrabActivation == HVRForceGrabActivation.GripAndTrigger || ForceGrabActivation == HVRForceGrabActivation.GripOrTrigger)
{
left = LeftController.GripButtonState.Active || LeftTriggerGrabState.Active;
right = RightController.GripButtonState.Active || RightTriggerGrabState.Active;
}
else if (ForceGrabActivation == HVRForceGrabActivation.Trigger)
{
left = LeftTriggerGrabState.Active;
right = RightTriggerGrabState.Active;
}
}
public bool GetForceGrabActivated(HVRHandSide side)
@@ -237,11 +275,6 @@ namespace HurricaneVR.Framework.ControllerInput
return side == HVRHandSide.Left ? IsLeftGrabActivated : IsRightGrabActivated;
}
public bool GetHoldActive(HVRHandSide side)
{
return side == HVRHandSide.Left ? IsLeftHoldActive : IsRightHoldActive;
}
public bool GetGripHoldActive(HVRHandSide side)
{
return side == HVRHandSide.Left ? IsLeftGripHoldActive : IsRightGripHoldActive;
@@ -266,6 +299,7 @@ namespace HurricaneVR.Framework.ControllerInput
{
return true;
}
return LeftController.GripButtonState.Active;
}
@@ -283,6 +317,7 @@ namespace HurricaneVR.Framework.ControllerInput
{
return true;
}
return RightController.GripButtonState.Active;
}
@@ -358,6 +393,7 @@ namespace HurricaneVR.Framework.ControllerInput
{
return LeftController.TrackpadAxis;
}
return Vector2.zero;
}
@@ -371,9 +407,9 @@ namespace HurricaneVR.Framework.ControllerInput
if (RightController.TrackpadButtonState.Active)
{
return RightController.TrackpadAxis;
}
return Vector2.zero;
}
@@ -458,6 +494,8 @@ namespace HurricaneVR.Framework.ControllerInput
public enum HVRForceGrabActivation
{
Grip,
GripHoldTriggerPress
GripAndTrigger,
Trigger,
GripOrTrigger
}
}
ZeroPacientVR/Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.cs
+391 -304
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.3.0
// version 1.5.0
// from Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.inputactions
//
// Changes to this file may cause incorrect behavior and will be lost if
@@ -15,7 +15,7 @@ using System.Collections.Generic;
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Utilities;
public partial class @HVRInputActions : IInputActionCollection2, IDisposable
public partial class @HVRInputActions: IInputActionCollection2, IDisposable
{
public InputActionAsset asset { get; }
public @HVRInputActions()
@@ -275,6 +275,28 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""692f48f9-3f21-406f-b2d5-5b5e0c4c2761"",
""path"": ""<OculusTouchController>{LeftHand}/menu"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Menu"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""d55f9044-c561-4b40-957b-ad0bd93adc50"",
""path"": ""<WMRSpatialController>{LeftHand}/menu"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Menu"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""54ac7ab0-8ca9-4cbc-a6d1-da5ee0b055cb"",
@@ -738,6 +760,17 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""0c608bc0-1dda-4d95-8e76-add87e298bcc"",
""path"": ""<WMRSpatialController>{LeftHand}/menu"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Menu"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""488857b2-965c-486c-b24e-e21628ad2a07"",
@@ -1167,12 +1200,14 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
{
asset.Disable();
}
public IEnumerable<InputBinding> bindings => asset.bindings;
public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false)
{
return asset.FindAction(actionNameOrId, throwIfNotFound);
}
public int FindBinding(InputBinding bindingMask, out InputAction action)
{
return asset.FindBinding(bindingMask, out action);
@@ -1180,7 +1215,7 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
// LeftHand
private readonly InputActionMap m_LeftHand;
private ILeftHandActions m_LeftHandActionsCallbackInterface;
private List<ILeftHandActions> m_LeftHandActionsCallbackInterfaces = new List<ILeftHandActions>();
private readonly InputAction m_LeftHand_TriggerPress;
private readonly InputAction m_LeftHand_Trigger;
private readonly InputAction m_LeftHand_PrimaryButton;
@@ -1230,142 +1265,155 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(LeftHandActions set) { return set.Get(); }
public void AddCallbacks(ILeftHandActions instance)
{
if (instance == null || m_Wrapper.m_LeftHandActionsCallbackInterfaces.Contains(instance)) return;
m_Wrapper.m_LeftHandActionsCallbackInterfaces.Add(instance);
@TriggerPress.started += instance.OnTriggerPress;
@TriggerPress.performed += instance.OnTriggerPress;
@TriggerPress.canceled += instance.OnTriggerPress;
@Trigger.started += instance.OnTrigger;
@Trigger.performed += instance.OnTrigger;
@Trigger.canceled += instance.OnTrigger;
@PrimaryButton.started += instance.OnPrimaryButton;
@PrimaryButton.performed += instance.OnPrimaryButton;
@PrimaryButton.canceled += instance.OnPrimaryButton;
@PrimaryTouch.started += instance.OnPrimaryTouch;
@PrimaryTouch.performed += instance.OnPrimaryTouch;
@PrimaryTouch.canceled += instance.OnPrimaryTouch;
@Menu.started += instance.OnMenu;
@Menu.performed += instance.OnMenu;
@Menu.canceled += instance.OnMenu;
@Primary2DAxis.started += instance.OnPrimary2DAxis;
@Primary2DAxis.performed += instance.OnPrimary2DAxis;
@Primary2DAxis.canceled += instance.OnPrimary2DAxis;
@Primary2DAxisClick.started += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled += instance.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled += instance.OnPrimary2DAxisTouch;
@Secondary2DAxis.started += instance.OnSecondary2DAxis;
@Secondary2DAxis.performed += instance.OnSecondary2DAxis;
@Secondary2DAxis.canceled += instance.OnSecondary2DAxis;
@Secondary2DAxisClick.started += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled += instance.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled += instance.OnSecondary2DAxisTouch;
@Grip.started += instance.OnGrip;
@Grip.performed += instance.OnGrip;
@Grip.canceled += instance.OnGrip;
@GripPress.started += instance.OnGripPress;
@GripPress.performed += instance.OnGripPress;
@GripPress.canceled += instance.OnGripPress;
@GripForce.started += instance.OnGripForce;
@GripForce.performed += instance.OnGripForce;
@GripForce.canceled += instance.OnGripForce;
@SecondaryButton.started += instance.OnSecondaryButton;
@SecondaryButton.performed += instance.OnSecondaryButton;
@SecondaryButton.canceled += instance.OnSecondaryButton;
@SecondaryTouch.started += instance.OnSecondaryTouch;
@SecondaryTouch.performed += instance.OnSecondaryTouch;
@SecondaryTouch.canceled += instance.OnSecondaryTouch;
@TriggerTouch.started += instance.OnTriggerTouch;
@TriggerTouch.performed += instance.OnTriggerTouch;
@TriggerTouch.canceled += instance.OnTriggerTouch;
@ControllerPosition.started += instance.OnControllerPosition;
@ControllerPosition.performed += instance.OnControllerPosition;
@ControllerPosition.canceled += instance.OnControllerPosition;
@ControllerRotation.started += instance.OnControllerRotation;
@ControllerRotation.performed += instance.OnControllerRotation;
@ControllerRotation.canceled += instance.OnControllerRotation;
@Haptics.started += instance.OnHaptics;
@Haptics.performed += instance.OnHaptics;
@Haptics.canceled += instance.OnHaptics;
}
private void UnregisterCallbacks(ILeftHandActions instance)
{
@TriggerPress.started -= instance.OnTriggerPress;
@TriggerPress.performed -= instance.OnTriggerPress;
@TriggerPress.canceled -= instance.OnTriggerPress;
@Trigger.started -= instance.OnTrigger;
@Trigger.performed -= instance.OnTrigger;
@Trigger.canceled -= instance.OnTrigger;
@PrimaryButton.started -= instance.OnPrimaryButton;
@PrimaryButton.performed -= instance.OnPrimaryButton;
@PrimaryButton.canceled -= instance.OnPrimaryButton;
@PrimaryTouch.started -= instance.OnPrimaryTouch;
@PrimaryTouch.performed -= instance.OnPrimaryTouch;
@PrimaryTouch.canceled -= instance.OnPrimaryTouch;
@Menu.started -= instance.OnMenu;
@Menu.performed -= instance.OnMenu;
@Menu.canceled -= instance.OnMenu;
@Primary2DAxis.started -= instance.OnPrimary2DAxis;
@Primary2DAxis.performed -= instance.OnPrimary2DAxis;
@Primary2DAxis.canceled -= instance.OnPrimary2DAxis;
@Primary2DAxisClick.started -= instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed -= instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled -= instance.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started -= instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed -= instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled -= instance.OnPrimary2DAxisTouch;
@Secondary2DAxis.started -= instance.OnSecondary2DAxis;
@Secondary2DAxis.performed -= instance.OnSecondary2DAxis;
@Secondary2DAxis.canceled -= instance.OnSecondary2DAxis;
@Secondary2DAxisClick.started -= instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed -= instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled -= instance.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started -= instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed -= instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled -= instance.OnSecondary2DAxisTouch;
@Grip.started -= instance.OnGrip;
@Grip.performed -= instance.OnGrip;
@Grip.canceled -= instance.OnGrip;
@GripPress.started -= instance.OnGripPress;
@GripPress.performed -= instance.OnGripPress;
@GripPress.canceled -= instance.OnGripPress;
@GripForce.started -= instance.OnGripForce;
@GripForce.performed -= instance.OnGripForce;
@GripForce.canceled -= instance.OnGripForce;
@SecondaryButton.started -= instance.OnSecondaryButton;
@SecondaryButton.performed -= instance.OnSecondaryButton;
@SecondaryButton.canceled -= instance.OnSecondaryButton;
@SecondaryTouch.started -= instance.OnSecondaryTouch;
@SecondaryTouch.performed -= instance.OnSecondaryTouch;
@SecondaryTouch.canceled -= instance.OnSecondaryTouch;
@TriggerTouch.started -= instance.OnTriggerTouch;
@TriggerTouch.performed -= instance.OnTriggerTouch;
@TriggerTouch.canceled -= instance.OnTriggerTouch;
@ControllerPosition.started -= instance.OnControllerPosition;
@ControllerPosition.performed -= instance.OnControllerPosition;
@ControllerPosition.canceled -= instance.OnControllerPosition;
@ControllerRotation.started -= instance.OnControllerRotation;
@ControllerRotation.performed -= instance.OnControllerRotation;
@ControllerRotation.canceled -= instance.OnControllerRotation;
@Haptics.started -= instance.OnHaptics;
@Haptics.performed -= instance.OnHaptics;
@Haptics.canceled -= instance.OnHaptics;
}
public void RemoveCallbacks(ILeftHandActions instance)
{
if (m_Wrapper.m_LeftHandActionsCallbackInterfaces.Remove(instance))
UnregisterCallbacks(instance);
}
public void SetCallbacks(ILeftHandActions instance)
{
if (m_Wrapper.m_LeftHandActionsCallbackInterface != null)
{
@TriggerPress.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTriggerPress;
@TriggerPress.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTriggerPress;
@TriggerPress.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTriggerPress;
@Trigger.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTrigger;
@Trigger.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTrigger;
@Trigger.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTrigger;
@PrimaryButton.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimaryButton;
@PrimaryButton.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimaryButton;
@PrimaryButton.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimaryButton;
@PrimaryTouch.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimaryTouch;
@PrimaryTouch.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimaryTouch;
@PrimaryTouch.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimaryTouch;
@Menu.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnMenu;
@Menu.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnMenu;
@Menu.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnMenu;
@Primary2DAxis.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxis;
@Primary2DAxis.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxis;
@Primary2DAxis.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxis;
@Primary2DAxisClick.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnPrimary2DAxisTouch;
@Secondary2DAxis.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxis;
@Secondary2DAxis.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxis;
@Secondary2DAxis.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxis;
@Secondary2DAxisClick.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondary2DAxisTouch;
@Grip.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGrip;
@Grip.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGrip;
@Grip.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGrip;
@GripPress.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGripPress;
@GripPress.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGripPress;
@GripPress.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGripPress;
@GripForce.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGripForce;
@GripForce.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGripForce;
@GripForce.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnGripForce;
@SecondaryButton.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondaryButton;
@SecondaryButton.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondaryButton;
@SecondaryButton.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondaryButton;
@SecondaryTouch.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondaryTouch;
@SecondaryTouch.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondaryTouch;
@SecondaryTouch.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnSecondaryTouch;
@TriggerTouch.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTriggerTouch;
@TriggerTouch.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTriggerTouch;
@TriggerTouch.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnTriggerTouch;
@ControllerPosition.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnControllerPosition;
@ControllerPosition.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnControllerPosition;
@ControllerPosition.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnControllerPosition;
@ControllerRotation.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnControllerRotation;
@ControllerRotation.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnControllerRotation;
@ControllerRotation.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnControllerRotation;
@Haptics.started -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnHaptics;
@Haptics.performed -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnHaptics;
@Haptics.canceled -= m_Wrapper.m_LeftHandActionsCallbackInterface.OnHaptics;
}
m_Wrapper.m_LeftHandActionsCallbackInterface = instance;
if (instance != null)
{
@TriggerPress.started += instance.OnTriggerPress;
@TriggerPress.performed += instance.OnTriggerPress;
@TriggerPress.canceled += instance.OnTriggerPress;
@Trigger.started += instance.OnTrigger;
@Trigger.performed += instance.OnTrigger;
@Trigger.canceled += instance.OnTrigger;
@PrimaryButton.started += instance.OnPrimaryButton;
@PrimaryButton.performed += instance.OnPrimaryButton;
@PrimaryButton.canceled += instance.OnPrimaryButton;
@PrimaryTouch.started += instance.OnPrimaryTouch;
@PrimaryTouch.performed += instance.OnPrimaryTouch;
@PrimaryTouch.canceled += instance.OnPrimaryTouch;
@Menu.started += instance.OnMenu;
@Menu.performed += instance.OnMenu;
@Menu.canceled += instance.OnMenu;
@Primary2DAxis.started += instance.OnPrimary2DAxis;
@Primary2DAxis.performed += instance.OnPrimary2DAxis;
@Primary2DAxis.canceled += instance.OnPrimary2DAxis;
@Primary2DAxisClick.started += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled += instance.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled += instance.OnPrimary2DAxisTouch;
@Secondary2DAxis.started += instance.OnSecondary2DAxis;
@Secondary2DAxis.performed += instance.OnSecondary2DAxis;
@Secondary2DAxis.canceled += instance.OnSecondary2DAxis;
@Secondary2DAxisClick.started += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled += instance.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled += instance.OnSecondary2DAxisTouch;
@Grip.started += instance.OnGrip;
@Grip.performed += instance.OnGrip;
@Grip.canceled += instance.OnGrip;
@GripPress.started += instance.OnGripPress;
@GripPress.performed += instance.OnGripPress;
@GripPress.canceled += instance.OnGripPress;
@GripForce.started += instance.OnGripForce;
@GripForce.performed += instance.OnGripForce;
@GripForce.canceled += instance.OnGripForce;
@SecondaryButton.started += instance.OnSecondaryButton;
@SecondaryButton.performed += instance.OnSecondaryButton;
@SecondaryButton.canceled += instance.OnSecondaryButton;
@SecondaryTouch.started += instance.OnSecondaryTouch;
@SecondaryTouch.performed += instance.OnSecondaryTouch;
@SecondaryTouch.canceled += instance.OnSecondaryTouch;
@TriggerTouch.started += instance.OnTriggerTouch;
@TriggerTouch.performed += instance.OnTriggerTouch;
@TriggerTouch.canceled += instance.OnTriggerTouch;
@ControllerPosition.started += instance.OnControllerPosition;
@ControllerPosition.performed += instance.OnControllerPosition;
@ControllerPosition.canceled += instance.OnControllerPosition;
@ControllerRotation.started += instance.OnControllerRotation;
@ControllerRotation.performed += instance.OnControllerRotation;
@ControllerRotation.canceled += instance.OnControllerRotation;
@Haptics.started += instance.OnHaptics;
@Haptics.performed += instance.OnHaptics;
@Haptics.canceled += instance.OnHaptics;
}
foreach (var item in m_Wrapper.m_LeftHandActionsCallbackInterfaces)
UnregisterCallbacks(item);
m_Wrapper.m_LeftHandActionsCallbackInterfaces.Clear();
AddCallbacks(instance);
}
}
public LeftHandActions @LeftHand => new LeftHandActions(this);
// RightHand
private readonly InputActionMap m_RightHand;
private IRightHandActions m_RightHandActionsCallbackInterface;
private List<IRightHandActions> m_RightHandActionsCallbackInterfaces = new List<IRightHandActions>();
private readonly InputAction m_RightHand_TriggerPress;
private readonly InputAction m_RightHand_Trigger;
private readonly InputAction m_RightHand_PrimaryButton;
@@ -1415,142 +1463,155 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(RightHandActions set) { return set.Get(); }
public void AddCallbacks(IRightHandActions instance)
{
if (instance == null || m_Wrapper.m_RightHandActionsCallbackInterfaces.Contains(instance)) return;
m_Wrapper.m_RightHandActionsCallbackInterfaces.Add(instance);
@TriggerPress.started += instance.OnTriggerPress;
@TriggerPress.performed += instance.OnTriggerPress;
@TriggerPress.canceled += instance.OnTriggerPress;
@Trigger.started += instance.OnTrigger;
@Trigger.performed += instance.OnTrigger;
@Trigger.canceled += instance.OnTrigger;
@PrimaryButton.started += instance.OnPrimaryButton;
@PrimaryButton.performed += instance.OnPrimaryButton;
@PrimaryButton.canceled += instance.OnPrimaryButton;
@PrimaryTouch.started += instance.OnPrimaryTouch;
@PrimaryTouch.performed += instance.OnPrimaryTouch;
@PrimaryTouch.canceled += instance.OnPrimaryTouch;
@Menu.started += instance.OnMenu;
@Menu.performed += instance.OnMenu;
@Menu.canceled += instance.OnMenu;
@Primary2DAxis.started += instance.OnPrimary2DAxis;
@Primary2DAxis.performed += instance.OnPrimary2DAxis;
@Primary2DAxis.canceled += instance.OnPrimary2DAxis;
@Primary2DAxisClick.started += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled += instance.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled += instance.OnPrimary2DAxisTouch;
@Secondary2DAxis.started += instance.OnSecondary2DAxis;
@Secondary2DAxis.performed += instance.OnSecondary2DAxis;
@Secondary2DAxis.canceled += instance.OnSecondary2DAxis;
@Secondary2DAxisClick.started += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled += instance.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled += instance.OnSecondary2DAxisTouch;
@Grip.started += instance.OnGrip;
@Grip.performed += instance.OnGrip;
@Grip.canceled += instance.OnGrip;
@GripPress.started += instance.OnGripPress;
@GripPress.performed += instance.OnGripPress;
@GripPress.canceled += instance.OnGripPress;
@GripForce.started += instance.OnGripForce;
@GripForce.performed += instance.OnGripForce;
@GripForce.canceled += instance.OnGripForce;
@SecondaryButton.started += instance.OnSecondaryButton;
@SecondaryButton.performed += instance.OnSecondaryButton;
@SecondaryButton.canceled += instance.OnSecondaryButton;
@SecondaryTouch.started += instance.OnSecondaryTouch;
@SecondaryTouch.performed += instance.OnSecondaryTouch;
@SecondaryTouch.canceled += instance.OnSecondaryTouch;
@TriggerTouch.started += instance.OnTriggerTouch;
@TriggerTouch.performed += instance.OnTriggerTouch;
@TriggerTouch.canceled += instance.OnTriggerTouch;
@ControllerPosition.started += instance.OnControllerPosition;
@ControllerPosition.performed += instance.OnControllerPosition;
@ControllerPosition.canceled += instance.OnControllerPosition;
@ControllerRotation.started += instance.OnControllerRotation;
@ControllerRotation.performed += instance.OnControllerRotation;
@ControllerRotation.canceled += instance.OnControllerRotation;
@Haptics.started += instance.OnHaptics;
@Haptics.performed += instance.OnHaptics;
@Haptics.canceled += instance.OnHaptics;
}
private void UnregisterCallbacks(IRightHandActions instance)
{
@TriggerPress.started -= instance.OnTriggerPress;
@TriggerPress.performed -= instance.OnTriggerPress;
@TriggerPress.canceled -= instance.OnTriggerPress;
@Trigger.started -= instance.OnTrigger;
@Trigger.performed -= instance.OnTrigger;
@Trigger.canceled -= instance.OnTrigger;
@PrimaryButton.started -= instance.OnPrimaryButton;
@PrimaryButton.performed -= instance.OnPrimaryButton;
@PrimaryButton.canceled -= instance.OnPrimaryButton;
@PrimaryTouch.started -= instance.OnPrimaryTouch;
@PrimaryTouch.performed -= instance.OnPrimaryTouch;
@PrimaryTouch.canceled -= instance.OnPrimaryTouch;
@Menu.started -= instance.OnMenu;
@Menu.performed -= instance.OnMenu;
@Menu.canceled -= instance.OnMenu;
@Primary2DAxis.started -= instance.OnPrimary2DAxis;
@Primary2DAxis.performed -= instance.OnPrimary2DAxis;
@Primary2DAxis.canceled -= instance.OnPrimary2DAxis;
@Primary2DAxisClick.started -= instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed -= instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled -= instance.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started -= instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed -= instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled -= instance.OnPrimary2DAxisTouch;
@Secondary2DAxis.started -= instance.OnSecondary2DAxis;
@Secondary2DAxis.performed -= instance.OnSecondary2DAxis;
@Secondary2DAxis.canceled -= instance.OnSecondary2DAxis;
@Secondary2DAxisClick.started -= instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed -= instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled -= instance.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started -= instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed -= instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled -= instance.OnSecondary2DAxisTouch;
@Grip.started -= instance.OnGrip;
@Grip.performed -= instance.OnGrip;
@Grip.canceled -= instance.OnGrip;
@GripPress.started -= instance.OnGripPress;
@GripPress.performed -= instance.OnGripPress;
@GripPress.canceled -= instance.OnGripPress;
@GripForce.started -= instance.OnGripForce;
@GripForce.performed -= instance.OnGripForce;
@GripForce.canceled -= instance.OnGripForce;
@SecondaryButton.started -= instance.OnSecondaryButton;
@SecondaryButton.performed -= instance.OnSecondaryButton;
@SecondaryButton.canceled -= instance.OnSecondaryButton;
@SecondaryTouch.started -= instance.OnSecondaryTouch;
@SecondaryTouch.performed -= instance.OnSecondaryTouch;
@SecondaryTouch.canceled -= instance.OnSecondaryTouch;
@TriggerTouch.started -= instance.OnTriggerTouch;
@TriggerTouch.performed -= instance.OnTriggerTouch;
@TriggerTouch.canceled -= instance.OnTriggerTouch;
@ControllerPosition.started -= instance.OnControllerPosition;
@ControllerPosition.performed -= instance.OnControllerPosition;
@ControllerPosition.canceled -= instance.OnControllerPosition;
@ControllerRotation.started -= instance.OnControllerRotation;
@ControllerRotation.performed -= instance.OnControllerRotation;
@ControllerRotation.canceled -= instance.OnControllerRotation;
@Haptics.started -= instance.OnHaptics;
@Haptics.performed -= instance.OnHaptics;
@Haptics.canceled -= instance.OnHaptics;
}
public void RemoveCallbacks(IRightHandActions instance)
{
if (m_Wrapper.m_RightHandActionsCallbackInterfaces.Remove(instance))
UnregisterCallbacks(instance);
}
public void SetCallbacks(IRightHandActions instance)
{
if (m_Wrapper.m_RightHandActionsCallbackInterface != null)
{
@TriggerPress.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTriggerPress;
@TriggerPress.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTriggerPress;
@TriggerPress.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTriggerPress;
@Trigger.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTrigger;
@Trigger.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTrigger;
@Trigger.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTrigger;
@PrimaryButton.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimaryButton;
@PrimaryButton.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimaryButton;
@PrimaryButton.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimaryButton;
@PrimaryTouch.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimaryTouch;
@PrimaryTouch.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimaryTouch;
@PrimaryTouch.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimaryTouch;
@Menu.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnMenu;
@Menu.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnMenu;
@Menu.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnMenu;
@Primary2DAxis.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxis;
@Primary2DAxis.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxis;
@Primary2DAxis.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxis;
@Primary2DAxisClick.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnPrimary2DAxisTouch;
@Secondary2DAxis.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxis;
@Secondary2DAxis.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxis;
@Secondary2DAxis.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxis;
@Secondary2DAxisClick.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondary2DAxisTouch;
@Grip.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGrip;
@Grip.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGrip;
@Grip.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGrip;
@GripPress.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGripPress;
@GripPress.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGripPress;
@GripPress.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGripPress;
@GripForce.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGripForce;
@GripForce.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGripForce;
@GripForce.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnGripForce;
@SecondaryButton.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondaryButton;
@SecondaryButton.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondaryButton;
@SecondaryButton.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondaryButton;
@SecondaryTouch.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondaryTouch;
@SecondaryTouch.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondaryTouch;
@SecondaryTouch.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnSecondaryTouch;
@TriggerTouch.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTriggerTouch;
@TriggerTouch.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTriggerTouch;
@TriggerTouch.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnTriggerTouch;
@ControllerPosition.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnControllerPosition;
@ControllerPosition.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnControllerPosition;
@ControllerPosition.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnControllerPosition;
@ControllerRotation.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnControllerRotation;
@ControllerRotation.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnControllerRotation;
@ControllerRotation.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnControllerRotation;
@Haptics.started -= m_Wrapper.m_RightHandActionsCallbackInterface.OnHaptics;
@Haptics.performed -= m_Wrapper.m_RightHandActionsCallbackInterface.OnHaptics;
@Haptics.canceled -= m_Wrapper.m_RightHandActionsCallbackInterface.OnHaptics;
}
m_Wrapper.m_RightHandActionsCallbackInterface = instance;
if (instance != null)
{
@TriggerPress.started += instance.OnTriggerPress;
@TriggerPress.performed += instance.OnTriggerPress;
@TriggerPress.canceled += instance.OnTriggerPress;
@Trigger.started += instance.OnTrigger;
@Trigger.performed += instance.OnTrigger;
@Trigger.canceled += instance.OnTrigger;
@PrimaryButton.started += instance.OnPrimaryButton;
@PrimaryButton.performed += instance.OnPrimaryButton;
@PrimaryButton.canceled += instance.OnPrimaryButton;
@PrimaryTouch.started += instance.OnPrimaryTouch;
@PrimaryTouch.performed += instance.OnPrimaryTouch;
@PrimaryTouch.canceled += instance.OnPrimaryTouch;
@Menu.started += instance.OnMenu;
@Menu.performed += instance.OnMenu;
@Menu.canceled += instance.OnMenu;
@Primary2DAxis.started += instance.OnPrimary2DAxis;
@Primary2DAxis.performed += instance.OnPrimary2DAxis;
@Primary2DAxis.canceled += instance.OnPrimary2DAxis;
@Primary2DAxisClick.started += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.performed += instance.OnPrimary2DAxisClick;
@Primary2DAxisClick.canceled += instance.OnPrimary2DAxisClick;
@Primary2DAxisTouch.started += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.performed += instance.OnPrimary2DAxisTouch;
@Primary2DAxisTouch.canceled += instance.OnPrimary2DAxisTouch;
@Secondary2DAxis.started += instance.OnSecondary2DAxis;
@Secondary2DAxis.performed += instance.OnSecondary2DAxis;
@Secondary2DAxis.canceled += instance.OnSecondary2DAxis;
@Secondary2DAxisClick.started += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.performed += instance.OnSecondary2DAxisClick;
@Secondary2DAxisClick.canceled += instance.OnSecondary2DAxisClick;
@Secondary2DAxisTouch.started += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.performed += instance.OnSecondary2DAxisTouch;
@Secondary2DAxisTouch.canceled += instance.OnSecondary2DAxisTouch;
@Grip.started += instance.OnGrip;
@Grip.performed += instance.OnGrip;
@Grip.canceled += instance.OnGrip;
@GripPress.started += instance.OnGripPress;
@GripPress.performed += instance.OnGripPress;
@GripPress.canceled += instance.OnGripPress;
@GripForce.started += instance.OnGripForce;
@GripForce.performed += instance.OnGripForce;
@GripForce.canceled += instance.OnGripForce;
@SecondaryButton.started += instance.OnSecondaryButton;
@SecondaryButton.performed += instance.OnSecondaryButton;
@SecondaryButton.canceled += instance.OnSecondaryButton;
@SecondaryTouch.started += instance.OnSecondaryTouch;
@SecondaryTouch.performed += instance.OnSecondaryTouch;
@SecondaryTouch.canceled += instance.OnSecondaryTouch;
@TriggerTouch.started += instance.OnTriggerTouch;
@TriggerTouch.performed += instance.OnTriggerTouch;
@TriggerTouch.canceled += instance.OnTriggerTouch;
@ControllerPosition.started += instance.OnControllerPosition;
@ControllerPosition.performed += instance.OnControllerPosition;
@ControllerPosition.canceled += instance.OnControllerPosition;
@ControllerRotation.started += instance.OnControllerRotation;
@ControllerRotation.performed += instance.OnControllerRotation;
@ControllerRotation.canceled += instance.OnControllerRotation;
@Haptics.started += instance.OnHaptics;
@Haptics.performed += instance.OnHaptics;
@Haptics.canceled += instance.OnHaptics;
}
foreach (var item in m_Wrapper.m_RightHandActionsCallbackInterfaces)
UnregisterCallbacks(item);
m_Wrapper.m_RightHandActionsCallbackInterfaces.Clear();
AddCallbacks(instance);
}
}
public RightHandActions @RightHand => new RightHandActions(this);
// HMD
private readonly InputActionMap m_HMD;
private IHMDActions m_HMDActionsCallbackInterface;
private List<IHMDActions> m_HMDActionsCallbackInterfaces = new List<IHMDActions>();
private readonly InputAction m_HMD_hmdPosition;
private readonly InputAction m_HMD_hmdRotation;
public struct HMDActions
@@ -1564,34 +1625,47 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(HMDActions set) { return set.Get(); }
public void AddCallbacks(IHMDActions instance)
{
if (instance == null || m_Wrapper.m_HMDActionsCallbackInterfaces.Contains(instance)) return;
m_Wrapper.m_HMDActionsCallbackInterfaces.Add(instance);
@hmdPosition.started += instance.OnHmdPosition;
@hmdPosition.performed += instance.OnHmdPosition;
@hmdPosition.canceled += instance.OnHmdPosition;
@hmdRotation.started += instance.OnHmdRotation;
@hmdRotation.performed += instance.OnHmdRotation;
@hmdRotation.canceled += instance.OnHmdRotation;
}
private void UnregisterCallbacks(IHMDActions instance)
{
@hmdPosition.started -= instance.OnHmdPosition;
@hmdPosition.performed -= instance.OnHmdPosition;
@hmdPosition.canceled -= instance.OnHmdPosition;
@hmdRotation.started -= instance.OnHmdRotation;
@hmdRotation.performed -= instance.OnHmdRotation;
@hmdRotation.canceled -= instance.OnHmdRotation;
}
public void RemoveCallbacks(IHMDActions instance)
{
if (m_Wrapper.m_HMDActionsCallbackInterfaces.Remove(instance))
UnregisterCallbacks(instance);
}
public void SetCallbacks(IHMDActions instance)
{
if (m_Wrapper.m_HMDActionsCallbackInterface != null)
{
@hmdPosition.started -= m_Wrapper.m_HMDActionsCallbackInterface.OnHmdPosition;
@hmdPosition.performed -= m_Wrapper.m_HMDActionsCallbackInterface.OnHmdPosition;
@hmdPosition.canceled -= m_Wrapper.m_HMDActionsCallbackInterface.OnHmdPosition;
@hmdRotation.started -= m_Wrapper.m_HMDActionsCallbackInterface.OnHmdRotation;
@hmdRotation.performed -= m_Wrapper.m_HMDActionsCallbackInterface.OnHmdRotation;
@hmdRotation.canceled -= m_Wrapper.m_HMDActionsCallbackInterface.OnHmdRotation;
}
m_Wrapper.m_HMDActionsCallbackInterface = instance;
if (instance != null)
{
@hmdPosition.started += instance.OnHmdPosition;
@hmdPosition.performed += instance.OnHmdPosition;
@hmdPosition.canceled += instance.OnHmdPosition;
@hmdRotation.started += instance.OnHmdRotation;
@hmdRotation.performed += instance.OnHmdRotation;
@hmdRotation.canceled += instance.OnHmdRotation;
}
foreach (var item in m_Wrapper.m_HMDActionsCallbackInterfaces)
UnregisterCallbacks(item);
m_Wrapper.m_HMDActionsCallbackInterfaces.Clear();
AddCallbacks(instance);
}
}
public HMDActions @HMD => new HMDActions(this);
// UI
private readonly InputActionMap m_UI;
private IUIActions m_UIActionsCallbackInterface;
private List<IUIActions> m_UIActionsCallbackInterfaces = new List<IUIActions>();
private readonly InputAction m_UI_Click;
private readonly InputAction m_UI_pointerPosition;
private readonly InputAction m_UI_pointerRotation;
@@ -1607,33 +1681,46 @@ public partial class @HVRInputActions : IInputActionCollection2, IDisposable
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(UIActions set) { return set.Get(); }
public void AddCallbacks(IUIActions instance)
{
if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return;
m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance);
@Click.started += instance.OnClick;
@Click.performed += instance.OnClick;
@Click.canceled += instance.OnClick;
@pointerPosition.started += instance.OnPointerPosition;
@pointerPosition.performed += instance.OnPointerPosition;
@pointerPosition.canceled += instance.OnPointerPosition;
@pointerRotation.started += instance.OnPointerRotation;
@pointerRotation.performed += instance.OnPointerRotation;
@pointerRotation.canceled += instance.OnPointerRotation;
}
private void UnregisterCallbacks(IUIActions instance)
{
@Click.started -= instance.OnClick;
@Click.performed -= instance.OnClick;
@Click.canceled -= instance.OnClick;
@pointerPosition.started -= instance.OnPointerPosition;
@pointerPosition.performed -= instance.OnPointerPosition;
@pointerPosition.canceled -= instance.OnPointerPosition;
@pointerRotation.started -= instance.OnPointerRotation;
@pointerRotation.performed -= instance.OnPointerRotation;
@pointerRotation.canceled -= instance.OnPointerRotation;
}
public void RemoveCallbacks(IUIActions instance)
{
if (m_Wrapper.m_UIActionsCallbackInterfaces.Remove(instance))
UnregisterCallbacks(instance);
}
public void SetCallbacks(IUIActions instance)
{
if (m_Wrapper.m_UIActionsCallbackInterface != null)
{
@Click.started -= m_Wrapper.m_UIActionsCallbackInterface.OnClick;
@Click.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnClick;
@Click.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnClick;
@pointerPosition.started -= m_Wrapper.m_UIActionsCallbackInterface.OnPointerPosition;
@pointerPosition.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnPointerPosition;
@pointerPosition.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnPointerPosition;
@pointerRotation.started -= m_Wrapper.m_UIActionsCallbackInterface.OnPointerRotation;
@pointerRotation.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnPointerRotation;
@pointerRotation.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnPointerRotation;
}
m_Wrapper.m_UIActionsCallbackInterface = instance;
if (instance != null)
{
@Click.started += instance.OnClick;
@Click.performed += instance.OnClick;
@Click.canceled += instance.OnClick;
@pointerPosition.started += instance.OnPointerPosition;
@pointerPosition.performed += instance.OnPointerPosition;
@pointerPosition.canceled += instance.OnPointerPosition;
@pointerRotation.started += instance.OnPointerRotation;
@pointerRotation.performed += instance.OnPointerRotation;
@pointerRotation.canceled += instance.OnPointerRotation;
}
foreach (var item in m_Wrapper.m_UIActionsCallbackInterfaces)
UnregisterCallbacks(item);
m_Wrapper.m_UIActionsCallbackInterfaces.Clear();
AddCallbacks(instance);
}
}
public UIActions @UI => new UIActions(this);
ZeroPacientVR/Assets/HurricaneVR/Framework/Scripts/ControllerInput/InputSystem/HVRInputActions.inputactions
+33
View File
@@ -233,6 +233,28 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "692f48f9-3f21-406f-b2d5-5b5e0c4c2761",
"path": "<OculusTouchController>{LeftHand}/menu",
"interactions": "",
"processors": "",
"groups": "",
"action": "Menu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d55f9044-c561-4b40-957b-ad0bd93adc50",
"path": "<WMRSpatialController>{LeftHand}/menu",
"interactions": "",
"processors": "",
"groups": "",
"action": "Menu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "54ac7ab0-8ca9-4cbc-a6d1-da5ee0b055cb",
@@ -676,6 +698,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0c608bc0-1dda-4d95-8e76-add87e298bcc",
"path": "<WMRSpatialController>{LeftHand}/menu",
"interactions": "",
"processors": "",
"groups": "",
"action": "Menu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "488857b2-965c-486c-b24e-e21628ad2a07",