From 1b34bd9d1d3d0d35345ed1f18a6f679d19167a7f Mon Sep 17 00:00:00 2001 From: Gustavo Quiroz Date: Wed, 3 Mar 2021 12:17:16 +0100 Subject: [PATCH] fix: xr interaction toolkit is now fix at v1.0.0-pre.2 --- .gitignore | 2 + ...oactive.CreatorEditor.XRInteraction.asmdef | 12 +- Editor/Interaction/DirectInteractorEditor.cs | 31 ---- .../Interaction/InteractableObjectEditor.cs | 30 ---- Editor/Interaction/RayInteractorEditor.cs | 44 +----- Editor/Interaction/SnapZoneEditor.cs | 7 - .../XRInteractionPackageEnabler.cs | 3 + Editor/SceneSetup/XRInteractionSceneSetup.cs | 2 - Editor/SceneSetup/XRSimulatorImporter.cs | 4 +- Editor/SnapZone/SnapZoneSettings.cs | 4 - .../Innoactive.Creator.XRInteraction.asmdef | 12 +- .../ActionBasedControllerManager.cs | 6 +- .../Action-based/LocomotionSchemeManager.cs | 4 +- .../Interactables/InteractableHighlighter.cs | 57 +------ .../Interactables/InteractableObject.cs | 142 +++++++----------- .../Interactors/DirectInteractor.cs | 106 +++++-------- Runtime/Interaction/Interactors/SnapZone.cs | 80 ++-------- Runtime/Properties/GrabbableProperty.cs | 24 --- Runtime/Properties/SnapZoneProperty.cs | 33 +--- Runtime/Properties/SnappableProperty.cs | 29 +--- Runtime/Properties/TouchableProperty.cs | 24 --- Runtime/Properties/UsableProperty.cs | 27 +--- Runtime/Rigs/XRSimulatorSetup.cs | 6 +- 23 files changed, 126 insertions(+), 563 deletions(-) diff --git a/.gitignore b/.gitignore index 287da7c..0d9a9cf 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ ExportedObj/ *.booproj *.svd +# Creator generated files +*[XR_Setup_Simulator]* # Unity3D generated meta files *.pidb.meta diff --git a/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef b/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef index d0d19ae..db323a7 100644 --- a/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef +++ b/Editor/Innoactive.CreatorEditor.XRInteraction.asmdef @@ -20,20 +20,10 @@ "XR_INTERACTION_TOOLKIT" ], "versionDefines": [ - { - "name": "com.unity.xr.interaction.toolkit", - "expression": "", - "define": "XR_INTERACTION_TOOLKIT" - }, - { - "name": "com.unity.xr.interaction.toolkit", - "expression": "0.10.0-preview", - "define": "XRIT_0_10_OR_NEWER" - }, { "name": "com.unity.xr.interaction.toolkit", "expression": "1.0.0-pre.2", - "define": "XRIT_1_0_OR_NEWER" + "define": "XR_INTERACTION_TOOLKIT" } ], "noEngineReferences": false diff --git a/Editor/Interaction/DirectInteractorEditor.cs b/Editor/Interaction/DirectInteractorEditor.cs index f307285..786eb45 100644 --- a/Editor/Interaction/DirectInteractorEditor.cs +++ b/Editor/Interaction/DirectInteractorEditor.cs @@ -94,7 +94,6 @@ private void OnEnable() precisionGrab = serializedObject.FindProperty("precisionGrab"); hideControllerOnSelect = serializedObject.FindProperty("m_HideControllerOnSelect"); -#if XRIT_0_10_OR_NEWER playAudioClipOnSelectEntered = serializedObject.FindProperty("m_PlayAudioClipOnSelectEntered"); audioClipForOnSelectEntered = serializedObject.FindProperty("m_AudioClipForOnSelectEntered"); playAudioClipOnSelectExited = serializedObject.FindProperty("m_PlayAudioClipOnSelectExited"); @@ -121,32 +120,6 @@ private void OnEnable() onSelectExit = serializedObject.FindProperty("m_OnSelectExited"); onHoverEnter = serializedObject.FindProperty("m_OnHoverEntered"); onHoverExit = serializedObject.FindProperty("m_OnHoverExited"); -#else - playAudioClipOnSelectEntered = serializedObject.FindProperty("m_PlayAudioClipOnSelectEnter"); - audioClipForOnSelectEntered = serializedObject.FindProperty("m_AudioClipForOnSelectEnter"); - playAudioClipOnSelectExited = serializedObject.FindProperty("m_PlayAudioClipOnSelectExit"); - audioClipForOnSelectExited = serializedObject.FindProperty("m_AudioClipForOnSelectExit"); - playAudioClipOnHoverEntered = serializedObject.FindProperty("m_PlayAudioClipOnHoverEnter"); - audioClipForOnHoverEntered = serializedObject.FindProperty("m_AudioClipForOnHoverEnter"); - playAudioClipOnHoverExited = serializedObject.FindProperty("m_PlayAudioClipOnHoverExit"); - audioClipForOnHoverExited = serializedObject.FindProperty("m_AudioClipForOnHoverExit"); - playHapticsOnSelectEntered = serializedObject.FindProperty("m_PlayHapticsOnSelectEnter"); - hapticSelectEnterIntensity = serializedObject.FindProperty("m_HapticSelectEnterIntensity"); - hapticSelectEnterDuration = serializedObject.FindProperty("m_HapticSelectEnterDuration"); - playHapticsOnHoverEntered = serializedObject.FindProperty("m_PlayHapticsOnHoverEnter"); - hapticHoverEnterIntensity = serializedObject.FindProperty("m_HapticHoverEnterIntensity"); - hapticHoverEnterDuration = serializedObject.FindProperty("m_HapticHoverEnterDuration"); - playHapticsOnSelectExited = serializedObject.FindProperty("m_PlayHapticsOnSelectExit"); - hapticSelectExitIntensity = serializedObject.FindProperty("m_HapticSelectExitIntensity"); - hapticSelectExitDuration = serializedObject.FindProperty("m_HapticSelectExitDuration"); - playHapticsOnHoverExited = serializedObject.FindProperty("m_PlayHapticsOnHoverExit"); - hapticHoverExitIntensity = serializedObject.FindProperty("m_HapticHoverExitIntensity"); - hapticHoverExitDuration = serializedObject.FindProperty("m_HapticHoverExitDuration"); - onSelectEnter = serializedObject.FindProperty("m_OnSelectEnter"); - onSelectExit = serializedObject.FindProperty("m_OnSelectExit"); - onHoverEnter = serializedObject.FindProperty("m_OnHoverEnter"); - onHoverExit = serializedObject.FindProperty("m_OnHoverExit"); -#endif } public override void OnInspectorGUI() @@ -161,11 +134,7 @@ public override void OnInspectorGUI() { DirectInteractor interactor = (DirectInteractor)targetObject; -#if XRIT_0_10_OR_NEWER if (interactor.GetComponent() == null && interactor.GetComponent() == null) -#else - if (interactor.GetComponent() == null) -#endif { EditorGUILayout.HelpBox(Tooltips.MissingRequiredController, MessageType.Warning, true); break; diff --git a/Editor/Interaction/InteractableObjectEditor.cs b/Editor/Interaction/InteractableObjectEditor.cs index b3b51af..38f11ef 100644 --- a/Editor/Interaction/InteractableObjectEditor.cs +++ b/Editor/Interaction/InteractableObjectEditor.cs @@ -28,23 +28,16 @@ internal class InteractableObjectEditor : Editor private SerializedProperty throwAngularVelocityScaleProperty; private SerializedProperty gravityOnDetachProperty; private SerializedProperty retainTransformParentProperty; - -#if XRIT_1_0_OR_NEWER private SerializedProperty customReticle; -#endif - private SerializedProperty onFirstHoverEntered; private SerializedProperty onHoverEntered; private SerializedProperty onHoverExited; private SerializedProperty onLastHoverExited; private SerializedProperty onSelectEntered; private SerializedProperty onSelectExited; -#if XRIT_0_10_OR_NEWER private SerializedProperty onSelectCanceled; -#endif private SerializedProperty onActivateProperty; private SerializedProperty onDeactivateProperty; - private SerializedProperty interactionManager; private SerializedProperty collidersProperty; private SerializedProperty interactionLayerMaskProperty; @@ -82,10 +75,7 @@ private static class Tooltips public static readonly GUIContent IsGrabbable = new GUIContent("Is Grabbable", "Determines if this Interactable Object can be grabbed."); public static readonly GUIContent IsUsable = new GUIContent("Is Usable", "Determines if this Interactable Object can be used."); public static readonly GUIContent HighlightOptions = new GUIContent("Enable Highlighting", "Adds an InteractableHighlighter component to this Interactable."); - -#if XRIT_1_0_OR_NEWER public static readonly GUIContent CustomReticle = EditorGUIUtility.TrTextContent("Custom Reticle", "The reticle that will appear at the end of the line when it is valid."); -#endif } private void OnEnable() @@ -111,15 +101,8 @@ private void OnEnable() throwAngularVelocityScaleProperty = serializedObject.FindProperty("m_ThrowAngularVelocityScale"); retainTransformParentProperty = serializedObject.FindProperty("m_RetainTransformParent"); interactionManager = serializedObject.FindProperty("m_InteractionManager"); - -#if XRIT_1_0_OR_NEWER gravityOnDetachProperty = serializedObject.FindProperty("m_ForceGravityOnDetach"); customReticle = serializedObject.FindProperty("m_CustomReticle"); -#else - gravityOnDetachProperty = serializedObject.FindProperty("m_GravityOnDetach"); -#endif - -#if XRIT_0_10_OR_NEWER onFirstHoverEntered = serializedObject.FindProperty("m_OnFirstHoverEntered"); onHoverEntered = serializedObject.FindProperty("m_OnHoverEntered"); onHoverExited = serializedObject.FindProperty("m_OnHoverExited"); @@ -127,14 +110,6 @@ private void OnEnable() onSelectEntered = serializedObject.FindProperty("m_OnSelectEntered"); onSelectExited = serializedObject.FindProperty("m_OnSelectExited"); onSelectCanceled = serializedObject.FindProperty("m_OnSelectCanceled"); -#else - onFirstHoverEntered = serializedObject.FindProperty("m_OnFirstHoverEnter"); - onHoverEntered = serializedObject.FindProperty("m_OnHoverEnter"); - onHoverExited = serializedObject.FindProperty("m_OnHoverExit"); - onLastHoverExited = serializedObject.FindProperty("m_OnLastHoverExit"); - onSelectEntered = serializedObject.FindProperty("m_OnSelectEnter"); - onSelectExited = serializedObject.FindProperty("m_OnSelectExit"); -#endif onActivateProperty = serializedObject.FindProperty("m_OnActivate"); onDeactivateProperty = serializedObject.FindProperty("m_OnDeactivate"); collidersProperty = serializedObject.FindProperty("m_Colliders"); @@ -168,10 +143,7 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(interactionManager, Tooltips.InteractionManager); EditorGUILayout.PropertyField(interactionLayerMaskProperty, Tooltips.InteractionLayerMask); EditorGUILayout.PropertyField(collidersProperty, Tooltips.Colliders, true); - -#if XRIT_1_0_OR_NEWER EditorGUILayout.PropertyField(customReticle, Tooltips.CustomReticle); -#endif EditorGUILayout.Space(); @@ -241,9 +213,7 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(onLastHoverExited); EditorGUILayout.PropertyField(onSelectEntered); EditorGUILayout.PropertyField(onSelectExited); -#if XRIT_0_10_OR_NEWER EditorGUILayout.PropertyField(onSelectCanceled); -#endif EditorGUILayout.PropertyField(onActivateProperty); EditorGUILayout.PropertyField(onDeactivateProperty); } diff --git a/Editor/Interaction/RayInteractorEditor.cs b/Editor/Interaction/RayInteractorEditor.cs index 8b1cb37..1ad2243 100644 --- a/Editor/Interaction/RayInteractorEditor.cs +++ b/Editor/Interaction/RayInteractorEditor.cs @@ -67,17 +67,11 @@ internal class RayInteractorEditor : Editor private SerializedProperty onSelectEntered; private SerializedProperty onSelectExited; -#if XRIT_0_10_OR_NEWER private SerializedProperty keepSelectedTargetValid; private SerializedProperty allowAnchorControl; private SerializedProperty useForceGrab; private SerializedProperty anchorRotateSpeed; private SerializedProperty anchorTranslateSpeed; -#endif - - // private bool showInteractorEvents; - // private bool showSoundEvents = false; - // private bool showHapticEvents = false; private static class Tooltips { @@ -169,7 +163,6 @@ private void OnEnable() acceleration = serializedObject.FindProperty("m_Acceleration"); additionalFlightTime = serializedObject.FindProperty("m_AdditionalFlightTime"); -#if XRIT_0_10_OR_NEWER keepSelectedTargetValid = serializedObject.FindProperty("m_KeepSelectedTargetValid"); allowAnchorControl = serializedObject.FindProperty("m_AllowAnchorControl"); useForceGrab = serializedObject.FindProperty("m_UseForceGrab"); @@ -202,34 +195,6 @@ private void OnEnable() onHoverExited = serializedObject.FindProperty("m_OnHoverExited"); onSelectEntered = serializedObject.FindProperty("m_OnSelectEntered"); onSelectExited = serializedObject.FindProperty("m_OnSelectExited"); -#else - playAudioClipOnSelectEntered = serializedObject.FindProperty("m_PlayAudioClipOnSelectEnter"); - audioClipForOnSelectEntered = serializedObject.FindProperty("m_AudioClipForOnSelectEnter"); - playAudioClipOnSelectExited = serializedObject.FindProperty("m_PlayAudioClipOnSelectExit"); - audioClipForOnSelectExited = serializedObject.FindProperty("m_AudioClipForOnSelectExit"); - playAudioClipOnHoverEntered = serializedObject.FindProperty("m_PlayAudioClipOnHoverEnter"); - audioClipForOnHoverEntered = serializedObject.FindProperty("m_AudioClipForOnHoverEnter"); - playAudioClipOnHoverExited = serializedObject.FindProperty("m_PlayAudioClipOnHoverExit"); - audioClipForOnHoverExited = serializedObject.FindProperty("m_AudioClipForOnHoverExit"); - playHapticsOnSelectEntered = serializedObject.FindProperty("m_PlayHapticsOnSelectEnter"); - - hapticSelectEnterIntensity = serializedObject.FindProperty("m_HapticSelectEnterIntensity"); - hapticSelectEnterDuration = serializedObject.FindProperty("m_HapticSelectEnterDuration"); - playHapticsOnHoverEntered = serializedObject.FindProperty("m_PlayHapticsOnHoverEnter"); - hapticHoverEnterIntensity = serializedObject.FindProperty("m_HapticHoverEnterIntensity"); - hapticHoverEnterDuration = serializedObject.FindProperty("m_HapticHoverEnterDuration"); - playHapticsOnSelectExited = serializedObject.FindProperty("m_PlayHapticsOnSelectExit"); - hapticSelectExitIntensity = serializedObject.FindProperty("m_HapticSelectExitIntensity"); - hapticSelectExitDuration = serializedObject.FindProperty("m_HapticSelectExitDuration"); - playHapticsOnHoverExited = serializedObject.FindProperty("m_PlayHapticsOnHoverExit"); - hapticHoverExitIntensity = serializedObject.FindProperty("m_HapticHoverExitIntensity"); - hapticHoverExitDuration = serializedObject.FindProperty("m_HapticHoverExitDuration"); - - onHoverEntered = serializedObject.FindProperty("m_OnHoverEnter"); - onHoverExited = serializedObject.FindProperty("m_OnHoverExit"); - onSelectEntered = serializedObject.FindProperty("m_OnSelectEnter"); - onSelectExited = serializedObject.FindProperty("m_OnSelectExit"); -#endif } public override void OnInspectorGUI() @@ -243,11 +208,8 @@ public override void OnInspectorGUI() foreach (Object targetObject in serializedObject.targetObjects) { RayInteractor interactor = (RayInteractor)targetObject; -#if XRIT_0_10_OR_NEWER + if (interactor.GetComponent() == null && interactor.GetComponent() == null) -#else - if (interactor.GetComponent() == null) -#endif { EditorGUILayout.HelpBox(Tooltips.MissingRequiredController, MessageType.Warning, true); break; @@ -261,7 +223,6 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(enableUIInteraction, Tooltips.EnableUIInteraction); -#if XRIT_0_10_OR_NEWER EditorGUILayout.PropertyField(useForceGrab, Tooltips.ForceGrab); EditorGUILayout.PropertyField(allowAnchorControl, Tooltips.AllowAnchorControl); @@ -272,7 +233,6 @@ public override void OnInspectorGUI() EditorGUILayout.PropertyField(anchorTranslateSpeed, Tooltips.AnchorTranslateSpeed); EditorGUI.indentLevel--; } -#endif EditorGUILayout.PropertyField(attachTransform, Tooltips.AttachTransform); @@ -338,9 +298,7 @@ public override void OnInspectorGUI() EditorGUILayout.HelpBox(Tooltips.StartingInteractableWarning, MessageType.Warning, true); } -#if XRIT_0_10_OR_NEWER EditorGUILayout.PropertyField(keepSelectedTargetValid, Tooltips.KeepSelectedTargetValid); -#endif EditorGUILayout.PropertyField(hideControllerOnSelect, Tooltips.HideControllerOnSelect); EditorGUILayout.PropertyField(hoverToSelect, Tooltips.HoverToSelect); diff --git a/Editor/Interaction/SnapZoneEditor.cs b/Editor/Interaction/SnapZoneEditor.cs index 1255d7e..fa2e453 100644 --- a/Editor/Interaction/SnapZoneEditor.cs +++ b/Editor/Interaction/SnapZoneEditor.cs @@ -55,17 +55,10 @@ private void OnEnable() interactableHoverMeshMaterial = serializedObject.FindProperty("validationMaterial"); -#if XRIT_0_10_OR_NEWER onHoverEntered = serializedObject.FindProperty("m_OnHoverEntered"); onHoverExited = serializedObject.FindProperty("m_OnHoverExited"); onSelectEntered = serializedObject.FindProperty("m_OnSelectEntered"); onSelectExited = serializedObject.FindProperty("m_OnSelectExited"); -#else - onHoverEntered = serializedObject.FindProperty("m_OnHoverEnter"); - onHoverExited = serializedObject.FindProperty("m_OnHoverExit"); - onSelectEntered = serializedObject.FindProperty("m_OnSelectEnter"); - onSelectExited = serializedObject.FindProperty("m_OnSelectExit"); -#endif } public override void OnInspectorGUI() diff --git a/Editor/PackageDependencies/XRInteractionPackageEnabler.cs b/Editor/PackageDependencies/XRInteractionPackageEnabler.cs index 8c8baaf..37dfcc4 100644 --- a/Editor/PackageDependencies/XRInteractionPackageEnabler.cs +++ b/Editor/PackageDependencies/XRInteractionPackageEnabler.cs @@ -7,6 +7,9 @@ public class XRInteractionPackageEnabler : Dependency { /// public override string Package { get; } = "com.unity.xr.interaction.toolkit"; + + /// + public override string Version { get; internal set; } = "1.0.0-pre.2"; /// public override string[] Samples { get; } = { "Default Input Actions", "XR Device Simulator" }; diff --git a/Editor/SceneSetup/XRInteractionSceneSetup.cs b/Editor/SceneSetup/XRInteractionSceneSetup.cs index aa9a4ef..364683f 100644 --- a/Editor/SceneSetup/XRInteractionSceneSetup.cs +++ b/Editor/SceneSetup/XRInteractionSceneSetup.cs @@ -20,14 +20,12 @@ public override void Setup() { DeleteStaticObject("[XR_Setup]"); -#if XRIT_1_0_OR_NEWER XRSimulatorImporter simulatorImporter = new XRSimulatorImporter(); if (string.IsNullOrEmpty(simulatorImporter.SimulatorRigPath) || AssetDatabase.GetMainAssetTypeAtPath(simulatorImporter.SimulatorRigPath) == null) { simulatorImporter.ImportSimulatorRig(); } -#endif } private void DeleteStaticObject(string objectName) diff --git a/Editor/SceneSetup/XRSimulatorImporter.cs b/Editor/SceneSetup/XRSimulatorImporter.cs index 2687acb..16d6df1 100644 --- a/Editor/SceneSetup/XRSimulatorImporter.cs +++ b/Editor/SceneSetup/XRSimulatorImporter.cs @@ -1,5 +1,4 @@ -#if XRIT_1_0_OR_NEWER -using System.IO; +using System.IO; using System.Linq; using UnityEditor; using UnityEngine; @@ -63,4 +62,3 @@ private GameObject LoadPrefab(string prefabName, string searchFolder, out string } } } -#endif diff --git a/Editor/SnapZone/SnapZoneSettings.cs b/Editor/SnapZone/SnapZoneSettings.cs index ef6ee15..9ace278 100644 --- a/Editor/SnapZone/SnapZoneSettings.cs +++ b/Editor/SnapZone/SnapZoneSettings.cs @@ -79,11 +79,7 @@ public class SnapZoneSettings : SettingsObject /// public void ApplySettingsToSnapZone(SnapZone snapZone) { -#if XRIT_0_10_OR_NEWER snapZone.interactionLayerMask = InteractionLayerMask; -#else - snapZone.InteractionLayerMask = InteractionLayerMask; -#endif snapZone.ShownHighlightObjectColor = HighlightColor; snapZone.ValidationMaterial = ValidationMaterial; snapZone.InvalidMaterial = InvalidMaterial; diff --git a/Runtime/Innoactive.Creator.XRInteraction.asmdef b/Runtime/Innoactive.Creator.XRInteraction.asmdef index 28bafa4..2199de6 100644 --- a/Runtime/Innoactive.Creator.XRInteraction.asmdef +++ b/Runtime/Innoactive.Creator.XRInteraction.asmdef @@ -16,20 +16,10 @@ "XR_INTERACTION_TOOLKIT" ], "versionDefines": [ - { - "name": "com.unity.xr.interaction.toolkit", - "expression": "", - "define": "XR_INTERACTION_TOOLKIT" - }, - { - "name": "com.unity.xr.interaction.toolkit", - "expression": "0.10.0-preview", - "define": "XRIT_0_10_OR_NEWER" - }, { "name": "com.unity.xr.interaction.toolkit", "expression": "1.0.0-pre.2", - "define": "XRIT_1_0_OR_NEWER" + "define": "XR_INTERACTION_TOOLKIT" } ], "noEngineReferences": false diff --git a/Runtime/Interaction/Action-based/ActionBasedControllerManager.cs b/Runtime/Interaction/Action-based/ActionBasedControllerManager.cs index b5aea08..4cde169 100644 --- a/Runtime/Interaction/Action-based/ActionBasedControllerManager.cs +++ b/Runtime/Interaction/Action-based/ActionBasedControllerManager.cs @@ -1,5 +1,4 @@ -#if XRIT_0_10_OR_NEWER -using System; +using System; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -786,5 +785,4 @@ private InputAction GetInputAction(InputActionReference actionReference) return actionReference != null ? actionReference.action : null; } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Runtime/Interaction/Action-based/LocomotionSchemeManager.cs b/Runtime/Interaction/Action-based/LocomotionSchemeManager.cs index 8597b3c..55695f2 100644 --- a/Runtime/Interaction/Action-based/LocomotionSchemeManager.cs +++ b/Runtime/Interaction/Action-based/LocomotionSchemeManager.cs @@ -1,5 +1,4 @@ -#if XRIT_0_10_OR_NEWER -using System; +using System; using System.ComponentModel; using System.Collections.Generic; using UnityEngine; @@ -546,4 +545,3 @@ private void ClearBindingMasks() } } } -#endif \ No newline at end of file diff --git a/Runtime/Interaction/Interactables/InteractableHighlighter.cs b/Runtime/Interaction/Interactables/InteractableHighlighter.cs index 3f63062..d07f812 100644 --- a/Runtime/Interaction/Interactables/InteractableHighlighter.cs +++ b/Runtime/Interaction/Interactables/InteractableHighlighter.cs @@ -103,25 +103,11 @@ private void OnEnable() interactableObject = gameObject.GetComponent(); } -#if XRIT_1_0_OR_NEWER interactableObject.firstHoverEntered.AddListener(OnTouched); interactableObject.selectEntered.AddListener(OnGrabbed); interactableObject.selectExited.AddListener(OnReleased); interactableObject.activated.AddListener(OnUsed); interactableObject.deactivated.AddListener(OnUnused); -#elif XRIT_0_10_OR_NEWER - interactableObject.onFirstHoverEntered.AddListener(OnTouched); - interactableObject.onSelectEntered.AddListener(OnGrabbed); - interactableObject.onSelectExited.AddListener(OnReleased); - interactableObject.onActivate.AddListener(OnUsed); - interactableObject.onDeactivate.AddListener(OnUnused); -#else - interactableObject.onFirstHoverEnter.AddListener(OnTouched); - interactableObject.onSelectEnter.AddListener(OnGrabbed); - interactableObject.onSelectExit.AddListener(OnReleased); - interactableObject.onActivate.AddListener(OnUsed); - interactableObject.onDeactivate.AddListener(OnUnused); -#endif } private void OnDisable() @@ -137,25 +123,11 @@ private void OnDisable() return; } -#if XRIT_1_0_OR_NEWER interactableObject.firstHoverEntered.RemoveListener(OnTouched); interactableObject.selectEntered.RemoveListener(OnGrabbed); interactableObject.selectExited.RemoveListener(OnReleased); interactableObject.activated.RemoveListener(OnUsed); interactableObject.deactivated.RemoveListener(OnUnused); -#elif XRIT_0_10_OR_NEWER - interactableObject.onFirstHoverEntered.RemoveListener(OnTouched); - interactableObject.onSelectEntered.RemoveListener(OnGrabbed); - interactableObject.onSelectExited.RemoveListener(OnReleased); - interactableObject.onActivate.RemoveListener(OnUsed); - interactableObject.onDeactivate.RemoveListener(OnUnused); -#else - interactableObject.onFirstHoverEnter.RemoveListener(OnTouched); - interactableObject.onSelectEnter.RemoveListener(OnGrabbed); - interactableObject.onSelectExit.RemoveListener(OnReleased); - interactableObject.onActivate.RemoveListener(OnUsed); - interactableObject.onDeactivate.RemoveListener(OnUnused); -#endif } private void OnValidate() @@ -246,7 +218,6 @@ public void StopHighlighting(string highlightID) } } -#if XRIT_1_0_OR_NEWER private void OnTouched(HoverEnterEventArgs arguments) { OnTouchHighlight(); @@ -271,33 +242,7 @@ private void OnUnused(DeactivateEventArgs arg0) { OnGrabHighlight(); } -#else - - private void OnTouched(XRBaseInteractor interactor) - { - OnTouchHighlight(); - } - - private void OnGrabbed(XRBaseInteractor interactor) - { - OnGrabHighlight(); - } - - private void OnReleased(XRBaseInteractor interactor) - { - OnTouchHighlight(); - } - - private void OnUsed(XRBaseInteractor interactor) - { - OnUseHighlight(); - } - - private void OnUnused(XRBaseInteractor interactor) - { - OnGrabHighlight(); - } -#endif + private IEnumerator Highlight(Material highlightMaterial, Func shouldContinueHighlighting, string highlightID = "") { if (highlightMeshRenderer == null || renderers == null || renderers.Any() == false) diff --git a/Runtime/Interaction/Interactables/InteractableObject.cs b/Runtime/Interaction/Interactables/InteractableObject.cs index 1c18622..4ca26a4 100644 --- a/Runtime/Interaction/Interactables/InteractableObject.cs +++ b/Runtime/Interaction/Interactables/InteractableObject.cs @@ -142,15 +142,11 @@ public virtual void ForceStopInteracting() { if (IsActivated) { -#if XRIT_1_0_OR_NEWER OnDeactivated(new DeactivateEventArgs { interactable = this, interactor = selectingInteractor }); -#else - OnDeactivate(selectingInteractor); -#endif } StartCoroutine(StopInteractingForOneFrame()); @@ -161,39 +157,18 @@ public virtual void ForceStopInteracting() /// public virtual void ForceUse() { -#if XRIT_1_0_OR_NEWER OnActivated(new ActivateEventArgs { interactable = this, interactor = selectingInteractor }); -#else - OnActivate(selectingInteractor); -#endif } internal void ForceSelectEnter(XRBaseInteractor interactor) { -#if XRIT_1_0_OR_NEWER - OnSelectEntering(new SelectEnterEventArgs - { - interactable = this, - interactor = interactor - }); - - OnSelectEntered(new SelectEnterEventArgs - { - interactable = this, - interactor = interactor - }); -#elif XRIT_0_10_OR_NEWER - OnSelectEntering(interactor); -#else - OnSelectEnter(interactor); -#endif + interactionManager.ForceSelect(interactor, this); } - -#if XRIT_1_0_OR_NEWER + /// /// This method is called by the Interaction Manager /// right before the Interactor first initiates selection of an Interactable @@ -208,24 +183,7 @@ protected override void OnSelectEntering(SelectEnterEventArgs arguments) { base.OnSelectEntering(arguments); XRBaseInteractor interactor = arguments.interactor; -#elif XRIT_0_10_OR_NEWER - /// This method is called by the interaction manager - /// when the interactor first initiates selection of an interactable. - /// Interactor that is initiating the selection. - [System.Obsolete("OnSelectEntering(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectEntering(XRBaseInteractor interactor) - { - base.OnSelectEntering(interactor); -#else - /// This method is called by the interaction manager - /// when the interactor first initiates selection of an interactable. - /// Interactor that is initiating the selection. - [System.Obsolete("OnSelectEnter(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectEnter(XRBaseInteractor interactor) - { - base.OnSelectEnter(interactor); -#endif - + if (IsInSocket == false) { XRSocketInteractor socket = interactor.GetComponent(); @@ -237,7 +195,26 @@ protected override void OnSelectEnter(XRBaseInteractor interactor) } } -#if XRIT_1_0_OR_NEWER + [System.Obsolete("OnSelectEntering(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] + protected new void OnSelectEntering(XRBaseInteractor interactor) + { + OnSelectEntering(new SelectEnterEventArgs + { + interactor = interactor, + interactable = this + }); + } + + [System.Obsolete("OnSelectEnter(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] + protected void OnSelectEnter(XRBaseInteractor interactor) + { + OnSelectEntering(new SelectEnterEventArgs + { + interactor = interactor, + interactable = this + }); + } + /// /// This method is called by the Interaction Manager /// right before the Interactor ends selection of an Interactable @@ -252,30 +229,33 @@ protected override void OnSelectExiting(SelectExitEventArgs arguments) { base.OnSelectExiting(arguments); XRBaseInteractor interactor = arguments.interactor; -#elif XRIT_0_10_OR_NEWER - /// This method is called by the interaction manager - /// when the interactor ends selection of an interactable. - /// Interactor that is ending the selection. + + if (IsInSocket && interactor == selectingSocket) + { + selectingSocket = null; + } + } + [System.Obsolete("OnSelectExiting(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectExiting(XRBaseInteractor interactor) + protected new void OnSelectExiting(XRBaseInteractor interactor) { - base.OnSelectExiting(interactor); -#else - /// This method is called by the interaction manager - /// when the interactor ends selection of an interactable. - /// Interactor that is ending the selection. + OnSelectExiting(new SelectExitEventArgs + { + interactor = interactor, + interactable = this + }); + } + [System.Obsolete("OnSelectExit(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectExit(XRBaseInteractor interactor) + protected void OnSelectExit(XRBaseInteractor interactor) { - base.OnSelectExit(interactor); -#endif - if (IsInSocket && interactor == selectingSocket) + OnSelectExiting(new SelectExitEventArgs { - selectingSocket = null; - } + interactor = interactor, + interactable = this + }); } - -#if XRIT_1_0_OR_NEWER + /// /// This method is called by the /// when the Interactor begins an activation event on this selected Interactable. @@ -293,22 +273,17 @@ protected override void OnActivated(ActivateEventArgs arguments) base.OnActivated(arguments); } } -#else - /// This method is called by the interaction manager - /// when the interactor sends an activation event down to an interactable. - /// Interactor that is sending the activation event. + [System.Obsolete("OnActivate(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnActivate(XRBaseInteractor interactor) + protected new void OnActivate(XRBaseInteractor interactor) { - if (isUsable) + OnActivated(new ActivateEventArgs { - IsActivated = true; - base.OnActivate(interactor); - } + interactor = interactor, + interactable = this + }); } -#endif -#if XRIT_1_0_OR_NEWER /// /// This method is called by the /// when the Interactor ends an activation event on this selected Interactable. @@ -326,21 +301,16 @@ protected override void OnDeactivated(DeactivateEventArgs arguments) base.OnDeactivated(arguments); } } - -#else - /// This method is called by the interaction manager - /// when the interactor sends a deactivation event down to an interactable. - /// Interactor that is sending the activation event. + [System.Obsolete("OnDeactivate(XRBaseInteractor) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnDeactivate(XRBaseInteractor interactor) + protected new void OnDeactivate(XRBaseInteractor interactor) { - if (isUsable) + OnDeactivated(new DeactivateEventArgs { - IsActivated = false; - base.OnDeactivate(interactor); - } + interactor = interactor, + interactable = this + }); } -#endif private IEnumerator StopInteractingForOneFrame() { diff --git a/Runtime/Interaction/Interactors/DirectInteractor.cs b/Runtime/Interaction/Interactors/DirectInteractor.cs index 8544f75..66d4d8b 100644 --- a/Runtime/Interaction/Interactors/DirectInteractor.cs +++ b/Runtime/Interaction/Interactors/DirectInteractor.cs @@ -64,8 +64,7 @@ public virtual void AttemptGrab() { forceGrab = true; } - -#if XRIT_1_0_OR_NEWER + /// /// This method is called by the Interaction Manager /// right before the Interactor first initiates selection of an Interactable @@ -98,62 +97,28 @@ protected override void OnSelectEntering(SelectEnterEventArgs arguments) base.OnSelectEntering(arguments); } -#elif XRIT_0_10_OR_NEWER - /// - /// This method is called when the interactor first initiates selection of an interactable. - /// - /// Interactable that is being selected. + [System.Obsolete("OnSelectEntering(XRBaseInteractable) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectEntering(XRBaseInteractable interactable) + protected new void OnSelectEntering(XRBaseInteractable interactable) { - InteractableObject interactableObject = interactable as InteractableObject; - - if (precisionGrab && interactableObject.attachTransform == null) + OnSelectEntering(new SelectEnterEventArgs { - switch (interactableObject.movementType) - { - case XRBaseInteractable.MovementType.VelocityTracking: - case XRBaseInteractable.MovementType.Kinematic: - attachTransform.SetPositionAndRotation(interactable.transform.position, interactable.transform.rotation); - break; - case XRBaseInteractable.MovementType.Instantaneous: - Debug.LogWarning("Precision Grab is currently not compatible with interactable objects with Movement Type configured as Instantaneous.\n" - + $"Please change the Movement Type in {interactable.name}.", interactable); - break; - } - } - - base.OnSelectEntering(interactable); + interactable = interactable, + interactor = this + }); } -#else - /// - /// This method is called when the interactor first initiates selection of an interactable. - /// - /// Interactable that is being selected. + [System.Obsolete("OnSelectEnter(XRBaseInteractable) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectEnter(XRBaseInteractable interactable) + protected void OnSelectEnter(XRBaseInteractable interactable) { - InteractableObject interactableObject = interactable as InteractableObject; - - if (precisionGrab && interactableObject.attachTransform == null) + OnSelectEntering(new SelectEnterEventArgs { - switch (interactableObject.movementType) - { - case XRBaseInteractable.MovementType.VelocityTracking: - case XRBaseInteractable.MovementType.Kinematic: - attachTransform.SetPositionAndRotation(interactableObject.Rigidbody.worldCenterOfMass, interactable.transform.rotation); - break; - case XRBaseInteractable.MovementType.Instantaneous: - attachTransform.SetPositionAndRotation(interactable.transform.position, interactable.transform.rotation); - break; - } - } - - base.OnSelectEnter(interactable); + interactable = interactable, + interactor = this + }); } -#endif - -#if XRIT_1_0_OR_NEWER + + /// /// This method is called by the Interaction Manager /// right before the Interactor ends selection of an Interactable @@ -167,31 +132,32 @@ protected override void OnSelectEnter(XRBaseInteractable interactable) protected override void OnSelectExiting(SelectExitEventArgs arguments) { base.OnSelectExiting(arguments); -#elif XRIT_0_10_OR_NEWER - /// - /// This method is called by the interaction manager when the interactor ends selection of an interactable. - /// - /// Interactable that is no longer selected. - [System.Obsolete("OnSelectExiting(XRBaseInteractable) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectExiting(XRBaseInteractable interactable) - { - base.OnSelectExiting(interactable); -#else - /// - /// This method is called by the interaction manager when the interactor ends selection of an interactable. - /// - /// Interactable that is no longer selected. - [System.Obsolete("OnSelectExit(XRBaseInteractable) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] - protected override void OnSelectExit(XRBaseInteractable interactable) - { - base.OnSelectExit(interactable); -#endif + if (precisionGrab) { attachTransform.localPosition = initialAttachPosition; attachTransform.localRotation = initialAttachRotation; } } - + + [System.Obsolete("OnSelectExiting(XRBaseInteractable) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] + protected new void OnSelectExiting(XRBaseInteractable interactable) + { + OnSelectExiting(new SelectExitEventArgs + { + interactable = interactable, + interactor = this + }); + } + + [System.Obsolete("OnSelectExit(XRBaseInteractable) has been deprecated. Please, upgrade the XR Interaction Toolkit from the Package Manager to the latest available version.")] + protected void OnSelectExit(XRBaseInteractable interactable) + { + OnSelectExiting(new SelectExitEventArgs + { + interactable = interactable, + interactor = this + }); + } } } diff --git a/Runtime/Interaction/Interactors/SnapZone.cs b/Runtime/Interaction/Interactors/SnapZone.cs index 85f8a2c..f6a8e2d 100644 --- a/Runtime/Interaction/Interactors/SnapZone.cs +++ b/Runtime/Interaction/Interactors/SnapZone.cs @@ -33,7 +33,7 @@ public class SnapZone : XRSocketInteractor /// public GameObject ShownHighlightObject { - get { return shownHighlightObject; } + get => shownHighlightObject; set { shownHighlightObject = value; @@ -150,17 +150,14 @@ public Mesh PreviewMesh return previewMesh; } - set - { - previewMesh = value; - } + set => previewMesh = value; } private Transform initialParent; private Material activeMaterial; private Vector3 tmpCenterOfMass; private List validators = new List(); - private List snapZoneHoverTargets = new List(); + private readonly List snapZoneHoverTargets = new List(); protected override void Awake() { @@ -205,16 +202,8 @@ protected override void OnEnable() snapZoneHoverTargets.Clear(); -#if XRIT_1_0_OR_NEWER selectEntered.AddListener(OnAttach); selectExited.AddListener(OnDetach); -#elif XRIT_0_10_OR_NEWER - onSelectEntered.AddListener(OnAttach); - onSelectExited.AddListener(OnDetach); -#else - onSelectEnter.AddListener(OnAttach); - onSelectExit.AddListener(OnDetach); -#endif } protected override void OnDisable() @@ -224,27 +213,14 @@ protected override void OnDisable() AttachParent(); snapZoneHoverTargets.Clear(); -#if XRIT_1_0_OR_NEWER selectEntered.RemoveListener(OnAttach); selectExited.RemoveListener(OnDetach); -#elif XRIT_0_10_OR_NEWER - onSelectEntered.RemoveListener(OnAttach); - onSelectExited.RemoveListener(OnDetach); -#else - onSelectEnter.RemoveListener(OnAttach); - onSelectExit.RemoveListener(OnDetach); -#endif } - - -#if XRIT_1_0_OR_NEWER + private void OnAttach(SelectEnterEventArgs arguments) { XRBaseInteractable interactable = arguments.interactable; -#else - private void OnAttach(XRBaseInteractable interactable) - { -#endif + if (interactable != null) { Rigidbody rigid = interactable.gameObject.GetComponent(); @@ -253,14 +229,10 @@ private void OnAttach(XRBaseInteractable interactable) } } -#if XRIT_1_0_OR_NEWER private void OnDetach(SelectExitEventArgs arguments) { XRBaseInteractable interactable = arguments.interactable; -#else - private void OnDetach(XRBaseInteractable interactable) - { -#endif + if (interactable != null) { Rigidbody rigid = interactable.gameObject.GetComponent(); @@ -336,7 +308,7 @@ protected virtual Material CreateTransparentMaterial() } /// - /// Updates the property using the current . + /// Updates the property using the current . /// protected virtual void UpdateHighlightMeshFilterCache() { @@ -357,10 +329,12 @@ protected virtual void UpdateHighlightMeshFilterCache() for (int i = 0; i < skinnedMeshRenderer.sharedMesh.subMeshCount; i++) { - CombineInstance combineInstance = new CombineInstance(); - combineInstance.mesh = skinnedMeshRenderer.sharedMesh; - combineInstance.subMeshIndex = i; - combineInstance.transform = skinnedMeshRenderer.transform.localToWorldMatrix; + CombineInstance combineInstance = new CombineInstance + { + mesh = skinnedMeshRenderer.sharedMesh, + subMeshIndex = i, + transform = skinnedMeshRenderer.transform.localToWorldMatrix + }; meshes.Add(combineInstance); } @@ -427,11 +401,7 @@ private void CheckForReleasedHoverTargets() foreach (XRBaseInteractable target in snapZoneHoverTargets) { -#if XRIT_0_10_OR_NEWER if (hoverTargets.Contains(target) || target.isSelected) -#else - if (m_HoverTargets.Contains(target) || target.isSelected) -#endif { continue; } @@ -488,29 +458,7 @@ public virtual void ForceSelect(XRBaseInteractable interactable) if (interactable.IsSelectableBy(this)) { -#if XRIT_1_0_OR_NEWER - OnSelectEntering(new SelectEnterEventArgs - { - interactable = interactable, - interactor = this - }); - - OnSelectEntered(new SelectEnterEventArgs - { - interactable = interactable, - interactor = this - }); -#elif XRIT_0_10_OR_NEWER - OnSelectEntering(interactable); -#else - OnSelectEnter(interactable); -#endif - - if (interactable is InteractableObject interactableObject) - { - interactableObject.ForceSelectEnter(this); - } - + interactionManager.ForceSelect(this, interactable); interactable.transform.SetPositionAndRotation(attachTransform.position, attachTransform.rotation); ForceSelectTarget = interactable; } diff --git a/Runtime/Properties/GrabbableProperty.cs b/Runtime/Properties/GrabbableProperty.cs index 5736a90..e803bb9 100644 --- a/Runtime/Properties/GrabbableProperty.cs +++ b/Runtime/Properties/GrabbableProperty.cs @@ -43,16 +43,8 @@ protected override void OnEnable() { base.OnEnable(); -#if XRIT_1_0_OR_NEWER Interactable.selectEntered.AddListener(HandleXRGrabbed); Interactable.selectExited.AddListener(HandleXRUngrabbed); -#elif XRIT_0_10_OR_NEWER - Interactable.onSelectEntered.AddListener(HandleXRGrabbed); - Interactable.onSelectExited.AddListener(HandleXRUngrabbed); -#else - Interactable.onSelectEnter.AddListener(HandleXRGrabbed); - Interactable.onSelectExit.AddListener(HandleXRUngrabbed); -#endif InternalSetLocked(IsLocked); } @@ -61,16 +53,8 @@ protected override void OnDisable() { base.OnDisable(); -#if XRIT_1_0_OR_NEWER Interactable.selectEntered.RemoveListener(HandleXRGrabbed); Interactable.selectExited.RemoveListener(HandleXRUngrabbed); -#elif XRIT_0_10_OR_NEWER - Interactable.onSelectEntered.RemoveListener(HandleXRGrabbed); - Interactable.onSelectExited.RemoveListener(HandleXRUngrabbed); -#else - Interactable.onSelectEnter.RemoveListener(HandleXRGrabbed); - Interactable.onSelectExit.RemoveListener(HandleXRUngrabbed); -#endif } protected void Reset() @@ -79,20 +63,12 @@ protected void Reset() GetComponent().isKinematic = false; } -#if XRIT_1_0_OR_NEWER private void HandleXRGrabbed(SelectEnterEventArgs arguments) -#else - private void HandleXRGrabbed(XRBaseInteractor interactor) -#endif { EmitGrabbed(); } -#if XRIT_1_0_OR_NEWER private void HandleXRUngrabbed(SelectExitEventArgs arguments) -#else - private void HandleXRUngrabbed(XRBaseInteractor interactor) -#endif { EmitUngrabbed(); } diff --git a/Runtime/Properties/SnapZoneProperty.cs b/Runtime/Properties/SnapZoneProperty.cs index 2b659e4..1da1685 100644 --- a/Runtime/Properties/SnapZoneProperty.cs +++ b/Runtime/Properties/SnapZoneProperty.cs @@ -21,13 +21,7 @@ public class SnapZoneProperty : LockableProperty, ISnapZoneProperty public ModeParameter HighlightColor { get; private set; } /// - public bool IsObjectSnapped - { - get - { - return SnappedObject != null; - } - } + public bool IsObjectSnapped => SnappedObject != null; /// public ISnappableProperty SnappedObject { get; set; } @@ -67,42 +61,21 @@ protected override void OnEnable() { base.OnEnable(); -#if XRIT_1_0_OR_NEWER SnapZone.selectEntered.AddListener(HandleObjectSnapped); SnapZone.selectExited.AddListener(HandleObjectUnsnapped); -#elif XRIT_0_10_OR_NEWER - SnapZone.onSelectEntered.AddListener(HandleObjectSnapped); - SnapZone.onSelectExited.AddListener(HandleObjectUnsnapped); -#else - SnapZone.onSelectEnter.AddListener(HandleObjectSnapped); - SnapZone.onSelectExit.AddListener(HandleObjectUnsnapped); -#endif } protected override void OnDisable() { base.OnDisable(); -#if XRIT_1_0_OR_NEWER SnapZone.selectEntered.RemoveListener(HandleObjectSnapped); SnapZone.selectExited.RemoveListener(HandleObjectUnsnapped); -#elif XRIT_0_10_OR_NEWER - SnapZone.onSelectEntered.RemoveListener(HandleObjectSnapped); - SnapZone.onSelectExited.RemoveListener(HandleObjectUnsnapped); -#else - SnapZone.onSelectEnter.RemoveListener(HandleObjectSnapped); - SnapZone.onSelectExit.RemoveListener(HandleObjectUnsnapped); -#endif } -#if XRIT_1_0_OR_NEWER private void HandleObjectSnapped(SelectEnterEventArgs arguments) { XRBaseInteractable interactable = arguments.interactable; -#else - private void HandleObjectSnapped(XRBaseInteractable interactable) - { -#endif SnappedObject = interactable.gameObject.GetComponent(); if (SnappedObject == null) { @@ -114,11 +87,7 @@ private void HandleObjectSnapped(XRBaseInteractable interactable) } } -#if XRIT_1_0_OR_NEWER private void HandleObjectUnsnapped(SelectExitEventArgs arguments) -#else - private void HandleObjectUnsnapped(XRBaseInteractable interactable) -#endif { if (SnappedObject != null) { diff --git a/Runtime/Properties/SnappableProperty.cs b/Runtime/Properties/SnappableProperty.cs index 7a26a97..2d970e7 100644 --- a/Runtime/Properties/SnappableProperty.cs +++ b/Runtime/Properties/SnappableProperty.cs @@ -58,43 +58,22 @@ public XRBaseInteractable Interactable { base.OnEnable(); -#if XRIT_1_0_OR_NEWER Interactable.selectEntered.AddListener(HandleSnappedToDropZone); Interactable.selectExited.AddListener(HandleUnsnappedFromDropZone); -#elif XRIT_0_10_OR_NEWER - Interactable.onSelectEntered.AddListener(HandleSnappedToDropZone); - Interactable.onSelectExited.AddListener(HandleUnsnappedFromDropZone); -#else - Interactable.onSelectEnter.AddListener(HandleSnappedToDropZone); - Interactable.onSelectExit.AddListener(HandleUnsnappedFromDropZone); -#endif InternalSetLocked(IsLocked); } protected new virtual void OnDisable() { -#if XRIT_1_0_OR_NEWER Interactable.selectEntered.RemoveListener(HandleSnappedToDropZone); Interactable.selectExited.RemoveListener(HandleUnsnappedFromDropZone); -#elif XRIT_0_10_OR_NEWER - Interactable.onSelectEntered.RemoveListener(HandleSnappedToDropZone); - Interactable.onSelectEntered.RemoveListener(HandleUnsnappedFromDropZone); -#else - Interactable.onSelectEnter.RemoveListener(HandleSnappedToDropZone); - Interactable.onSelectEnter.RemoveListener(HandleUnsnappedFromDropZone); -#endif } -#if XRIT_1_0_OR_NEWER private void HandleSnappedToDropZone(SelectEnterEventArgs arguments) { XRBaseInteractor interactor = arguments.interactor; -#else - private void HandleSnappedToDropZone(XRBaseInteractor interactor) - { -#endif - SnappedZone = interactor.GetComponent(); + SnappedZone = interactor.GetComponent(); if (SnappedZone == null) { @@ -110,11 +89,7 @@ private void HandleSnappedToDropZone(XRBaseInteractor interactor) EmitSnapped(); } -#if XRIT_1_0_OR_NEWER private void HandleUnsnappedFromDropZone(SelectExitEventArgs arguments) -#else - private void HandleUnsnappedFromDropZone(XRBaseInteractor interactor) -#endif { SnappedZone = null; EmitUnsnapped(); @@ -123,7 +98,7 @@ private void HandleUnsnappedFromDropZone(XRBaseInteractor interactor) /// protected override void InternalSetLocked(bool lockState) { - + } /// diff --git a/Runtime/Properties/TouchableProperty.cs b/Runtime/Properties/TouchableProperty.cs index 082d24e..6beb86b 100644 --- a/Runtime/Properties/TouchableProperty.cs +++ b/Runtime/Properties/TouchableProperty.cs @@ -42,16 +42,8 @@ protected override void OnEnable() { base.OnEnable(); -#if XRIT_1_0_OR_NEWER Interactable.firstHoverEntered.AddListener(HandleXRTouched); Interactable.lastHoverExited.AddListener(HandleXRUntouched); -#elif XRIT_0_10_OR_NEWER - Interactable.onFirstHoverEntered.AddListener(HandleXRTouched); - Interactable.onLastHoverExited.AddListener(HandleXRUntouched); -#else - Interactable.onFirstHoverEnter.AddListener(HandleXRTouched); - Interactable.onLastHoverExit.AddListener(HandleXRUntouched); -#endif InternalSetLocked(IsLocked); } @@ -60,16 +52,8 @@ protected override void OnDisable() { base.OnDisable(); -#if XRIT_1_0_OR_NEWER Interactable.firstHoverEntered.RemoveListener(HandleXRTouched); Interactable.lastHoverExited.RemoveListener(HandleXRUntouched); -#elif XRIT_0_10_OR_NEWER - Interactable.onFirstHoverEntered.RemoveListener(HandleXRTouched); - Interactable.onLastHoverExited.RemoveListener(HandleXRUntouched); -#else - Interactable.onFirstHoverEnter.RemoveListener(HandleXRTouched); - Interactable.onLastHoverExit.RemoveListener(HandleXRUntouched); -#endif } protected void Reset() @@ -78,20 +62,12 @@ protected void Reset() gameObject.GetComponent().isKinematic = false; } -#if XRIT_1_0_OR_NEWER private void HandleXRTouched(HoverEnterEventArgs arguments) -#else - private void HandleXRTouched(XRBaseInteractor interactor) -#endif { EmitTouched(); } -#if XRIT_1_0_OR_NEWER private void HandleXRUntouched(HoverExitEventArgs arguments) -#else - private void HandleXRUntouched(XRBaseInteractor interactor) -#endif { EmitUntouched(); } diff --git a/Runtime/Properties/UsableProperty.cs b/Runtime/Properties/UsableProperty.cs index b333553..8d77f02 100644 --- a/Runtime/Properties/UsableProperty.cs +++ b/Runtime/Properties/UsableProperty.cs @@ -18,13 +18,7 @@ public class UsableProperty : LockableProperty, IUsableProperty /// /// Returns true if the GameObject is being used. /// - public virtual bool IsBeingUsed - { - get - { - return Interactable != null && Interactable.IsActivated; - } - } + public virtual bool IsBeingUsed => Interactable != null && Interactable.IsActivated; /// /// Reference to attached . @@ -48,13 +42,9 @@ protected override void OnEnable() { base.OnEnable(); -#if XRIT_1_0_OR_NEWER Interactable.activated.AddListener(HandleXRUsageStarted); Interactable.deactivated.AddListener(HandleXRUsageStopped); -#else - Interactable.onActivate.AddListener(HandleXRUsageStarted); - Interactable.onDeactivate.AddListener(HandleXRUsageStopped); -#endif + InternalSetLocked(IsLocked); } @@ -62,13 +52,8 @@ protected override void OnDisable() { base.OnDisable(); -#if XRIT_1_0_OR_NEWER Interactable.activated.RemoveListener(HandleXRUsageStarted); Interactable.deactivated.RemoveListener(HandleXRUsageStopped); -#else - Interactable.onActivate.RemoveListener(HandleXRUsageStarted); - Interactable.onDeactivate.RemoveListener(HandleXRUsageStopped); -#endif } protected void Reset() @@ -77,20 +62,12 @@ protected void Reset() gameObject.GetComponent().isKinematic = false; } -#if XRIT_1_0_OR_NEWER private void HandleXRUsageStarted(ActivateEventArgs arguments) -#else - private void HandleXRUsageStarted(XRBaseInteractor interactor) -#endif { EmitUsageStarted(); } -#if XRIT_1_0_OR_NEWER private void HandleXRUsageStopped(DeactivateEventArgs arguments) -#else - private void HandleXRUsageStopped(XRBaseInteractor interactor) -#endif { EmitUsageStopped(); } diff --git a/Runtime/Rigs/XRSimulatorSetup.cs b/Runtime/Rigs/XRSimulatorSetup.cs index f988977..b536868 100644 --- a/Runtime/Rigs/XRSimulatorSetup.cs +++ b/Runtime/Rigs/XRSimulatorSetup.cs @@ -14,7 +14,7 @@ public class XRSimulatorSetup : XRSetupBase /// public override bool CanBeUsed() { -#if ENABLE_INPUT_SYSTEM && XRIT_1_0_OR_NEWER +#if ENABLE_INPUT_SYSTEM return IsEventManagerInScene() == false && IsPrefabMissing == false; #else return false; @@ -29,9 +29,7 @@ public override string GetSetupTooltip() return $"The prefab {PrefabName} is missing in the Resources folder."; } -#if !XRIT_1_0_OR_NEWER - return "Please upgrade the XR Interaction Toolkit from the Package Manager to the latest available version."; -#elif ENABLE_INPUT_SYSTEM +#if ENABLE_INPUT_SYSTEM return "Can't be used while there is already a XRInteractionManager in the scene."; #else return "Enable the new input system to allow using this rig.";