From b1d8567a52ef43c0baff55356f8a186a88fc452e Mon Sep 17 00:00:00 2001 From: "Brown, Caleb M" Date: Fri, 10 Nov 2023 11:38:51 -0500 Subject: [PATCH] MAVIRC-2183: Fixed Locking Interactable Filter --- .../Cartridge_V3 Variant Interactable.prefab | 237 ++++++++++++-- Assets/Prefabs/Cartridge-Interactable.prefab | 289 +----------------- .../Filters/XRInteractableFilter.cs | 18 +- 3 files changed, 245 insertions(+), 299 deletions(-) diff --git a/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab b/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab index d6ab9f3..77cf53e 100644 --- a/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab +++ b/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab @@ -260,6 +260,9 @@ GameObject: - component: {fileID: 5236466170488912795} - component: {fileID: 8136670427705346541} - component: {fileID: 2897259354266345947} + - component: {fileID: 1280075286638713478} + - component: {fileID: 7870551422755492877} + - component: {fileID: 3540580792236698558} m_Layer: 0 m_Name: Clip m_TagString: Untagged @@ -333,6 +336,206 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1280075286638713478 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182665900626322174} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.0006995102, y: 0.00040441856, z: 0.00021432019} + m_Center: {x: -0.000004023314, y: 0.0000000016229773, z: 0.00004916335} +--- !u!54 &7870551422755492877 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182665900626322174} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &3540580792236698558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1182665900626322174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 17 + m_DistanceCalculationMode: 1 + m_SelectMode: 0 + m_FocusMode: 1 + m_CustomReticle: {fileID: 0} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + m_AttachTransform: {fileID: 0} + m_SecondaryAttachTransform: {fileID: 0} + m_UseDynamicAttach: 0 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 + m_ReinitializeDynamicAttachEverySingleGrab: 1 + m_AttachEaseInTime: 0.15 + m_MovementType: 2 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 0 + m_SmoothPositionAmount: 8 + m_TightenPosition: 0.1 + m_TrackRotation: 1 + m_SmoothRotation: 0 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 + m_TrackScale: 0 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 + m_ThrowOnDetach: 0 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_AttachPointCompatibilityMode: 0 + m_StartingSingleGrabTransformers: [] + m_StartingMultipleGrabTransformers: [] + m_AddDefaultGrabTransformers: 1 --- !u!1 &1360195127966810115 GameObject: m_ObjectHideFlags: 0 @@ -1343,8 +1546,8 @@ Rigidbody: m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 1 + m_IsKinematic: 1 + m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 --- !u!59 &3414920703166708064 @@ -1357,9 +1560,9 @@ HingeJoint: m_ConnectedBody: {fileID: 0} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} - m_Axis: {x: 1, y: 0, z: 0} + m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -0.1585, y: 0.228, z: -0.0204} + m_ConnectedAnchor: {x: 0.44860125, y: 1.1474999, z: 3.1980007} serializedVersion: 2 m_UseSpring: 0 m_Spring: @@ -1371,14 +1574,14 @@ HingeJoint: targetVelocity: 0 force: 0 freeSpin: 0 - m_UseLimits: 0 + m_UseLimits: 1 m_ExtendedLimits: 0 m_UseAcceleration: 0 m_Limits: - min: -86 - max: 86 + min: 0 + max: 180 bounciness: 0 - bounceMinVelocity: 0.2 + bounceMinVelocity: 0 contactDistance: 0 m_BreakForce: Infinity m_BreakTorque: Infinity @@ -1425,7 +1628,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_InteractionLayers: - m_Bits: 1 + m_Bits: 3 m_DistanceCalculationMode: 1 m_SelectMode: 0 m_FocusMode: 1 @@ -1526,7 +1729,7 @@ MonoBehaviour: m_SmoothPosition: 0 m_SmoothPositionAmount: 8 m_TightenPosition: 0.1 - m_TrackRotation: 1 + m_TrackRotation: 0 m_SmoothRotation: 0 m_SmoothRotationAmount: 8 m_TightenRotation: 0.1 @@ -2399,8 +2602,8 @@ Rigidbody: m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 1 + m_IsKinematic: 1 + m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 --- !u!114 &9126189417414843225 @@ -2513,7 +2716,7 @@ MonoBehaviour: m_SnapToColliderVolume: 1 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 - m_MovementType: 2 + m_MovementType: 1 m_VelocityDamping: 1 m_VelocityScale: 1 m_AngularVelocityDamping: 1 @@ -2861,8 +3064,8 @@ Rigidbody: m_ImplicitCom: 1 m_ImplicitTensor: 1 m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 1 + m_IsKinematic: 1 + m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 --- !u!114 &8710816239888859076 @@ -2883,7 +3086,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 m_InteractionLayers: - m_Bits: 1 + m_Bits: 9 m_DistanceCalculationMode: 1 m_SelectMode: 0 m_FocusMode: 1 @@ -2975,7 +3178,7 @@ MonoBehaviour: m_SnapToColliderVolume: 1 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 - m_MovementType: 2 + m_MovementType: 1 m_VelocityDamping: 1 m_VelocityScale: 1 m_AngularVelocityDamping: 1 diff --git a/Assets/Prefabs/Cartridge-Interactable.prefab b/Assets/Prefabs/Cartridge-Interactable.prefab index 730c983..5a25973 100644 --- a/Assets/Prefabs/Cartridge-Interactable.prefab +++ b/Assets/Prefabs/Cartridge-Interactable.prefab @@ -1276,9 +1276,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b475c9cc9b3efa4a8b68f22256096d6, type: 3} m_Name: m_EditorClassIdentifier: - description: what to do on the next step + description: what to do on the step after next (forgot to remove the plug when + replacing the tape) channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2} - focusStep: {fileID: 11400000, guid: f06581b6a2676704cbac6d816ed881e1, type: 2} + focusStep: {fileID: 11400000, guid: 8f01251921d0b0841b8ec39df16747b7, type: 2} focusResponse: m_PersistentCalls: m_Calls: @@ -3502,26 +3503,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6554210300994472440} m_Modifications: - - target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Interpolate - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_IsKinematic - value: 1 - objectReference: {fileID: 0} - target: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -86 objectReference: {fileID: 0} - - target: {fileID: 1994594684026882957, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Constraints - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1994594684026882957, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Interpolate - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3590,38 +3575,6 @@ PrefabInstance: propertyPath: m_Name value: Cartridge_V3 Variant Interactable objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Axis.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_UseLimits - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Limits.max - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Limits.min - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_ConnectedAnchor.x - value: -1.8304616 - objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_ConnectedAnchor.y - value: 1.5814999 - objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_ConnectedAnchor.z - value: 2.3876 - objectReference: {fileID: 0} - - target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Limits.bounceMinVelocity - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_Name value: Flip_Pad_Pull_Out (Transform) @@ -3630,18 +3583,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 7798793048474624085, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_Interpolate - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_MovementType value: 0 objectReference: {fileID: 0} - - target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_TrackRotation - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_VelocityScale value: 0.1 @@ -3658,14 +3603,6 @@ PrefabInstance: propertyPath: m_DistanceCalculationMode value: 0 objectReference: {fileID: 0} - - target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_InteractionLayers.m_Bits - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3} - propertyPath: m_InteractionLayers.m_Bits - value: 9 - objectReference: {fileID: 0} - target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_MovementType value: 2 @@ -3690,15 +3627,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 3299088965526146119} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3} - insertIndex: -1 - addedObject: {fileID: 4595166388880541806} - - targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3} - insertIndex: -1 - addedObject: {fileID: 4845629233216095973} - - targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3} - insertIndex: -1 - addedObject: {fileID: 2244017144755370326} - targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3} insertIndex: -1 addedObject: {fileID: 3774238497440674398} @@ -3725,6 +3653,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 3819015551208540297, guid: b27049639847946ddac425fa7721eb71, type: 3} m_PrefabInstance: {fileID: 3316605137565340392} m_PrefabAsset: {fileID: 0} +--- !u!114 &2244017144755370326 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3540580792236698558, guid: b27049639847946ddac425fa7721eb71, type: 3} + m_PrefabInstance: {fileID: 3316605137565340392} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4498918534765473814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &3161078843648604362 stripped Transform: m_CorrespondingSourceObject: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3} @@ -3735,206 +3674,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3} m_PrefabInstance: {fileID: 3316605137565340392} m_PrefabAsset: {fileID: 0} ---- !u!65 &4595166388880541806 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498918534765473814} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.0006995102, y: 0.00040441856, z: 0.00021432019} - m_Center: {x: -0.000004023314, y: 0.0000000016229773, z: 0.00004916335} ---- !u!54 &4845629233216095973 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498918534765473814} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &2244017144755370326 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498918534765473814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 17 - m_DistanceCalculationMode: 1 - m_SelectMode: 0 - m_FocusMode: 1 - m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - m_AttachTransform: {fileID: 0} - m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 - m_MatchAttachPosition: 1 - m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 - m_ReinitializeDynamicAttachEverySingleGrab: 1 - m_AttachEaseInTime: 0.15 - m_MovementType: 2 - m_VelocityDamping: 1 - m_VelocityScale: 1 - m_AngularVelocityDamping: 1 - m_AngularVelocityScale: 1 - m_TrackPosition: 1 - m_SmoothPosition: 0 - m_SmoothPositionAmount: 8 - m_TightenPosition: 0.1 - m_TrackRotation: 1 - m_SmoothRotation: 0 - m_SmoothRotationAmount: 8 - m_TightenRotation: 0.1 - m_TrackScale: 0 - m_SmoothScale: 0 - m_SmoothScaleAmount: 8 - m_TightenScale: 0.1 - m_ThrowOnDetach: 0 - m_ThrowSmoothingDuration: 0.25 - m_ThrowSmoothingCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ThrowVelocityScale: 1.5 - m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 - m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 - m_StartingSingleGrabTransformers: [] - m_StartingMultipleGrabTransformers: [] - m_AddDefaultGrabTransformers: 1 --- !u!114 &3774238497440674398 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Interactions/Filters/XRInteractableFilter.cs b/Assets/Scripts/Interactions/Filters/XRInteractableFilter.cs index d1ab95e..149a97a 100644 --- a/Assets/Scripts/Interactions/Filters/XRInteractableFilter.cs +++ b/Assets/Scripts/Interactions/Filters/XRInteractableFilter.cs @@ -36,32 +36,36 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering private void OnEnable() { - interactable.selectEntered.AddListener(Socket_SelectEntered); - interactable.selectExited.AddListener(Socket_SelectExited); + AddFilters(); } private void OnDisable() { - interactable.selectEntered.RemoveListener(Socket_SelectEntered); - interactable.selectExited.RemoveListener(Socket_SelectExited); + RemoveFilters(); } - private void Socket_SelectEntered(SelectEnterEventArgs e) + private void AddFilters() { if (interactable == null) return; - + // Add filter to interactable + interactable.startingHoverFilters.Add(this); + interactable.startingSelectFilters.Add(this); + + // Make extra sure that the filter is added to the interactable interactable.hoverFilters.Add(this); interactable.selectFilters.Add(this); } - private void Socket_SelectExited(SelectExitEventArgs e) + private void RemoveFilters() { if (interactable == null) return; // Remove filter from interactable + interactable.startingHoverFilters.Remove(this); + interactable.startingSelectFilters.Remove(this); interactable.hoverFilters.Remove(this); interactable.selectFilters.Remove(this); }