NEW HVR 2.9.1f
This commit is contained in:
+391
-304
@@ -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);
|
||||
|
||||
+33
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user