Remove hand ray type setting

XRTK · Apr 4, 2020 · 0cd4f5f · 0cd4f5f
1 parent 7e61a74
commit 0cd4f5f
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 84 deletions.
diff --git a/Submodules/Lumin b/Submodules/Lumin
diff --git a/Submodules/Oculus b/Submodules/Oculus
diff --git a/Submodules/SDK b/Submodules/SDK
diff --git a/Submodules/WindowsMixedReality b/Submodules/WindowsMixedReality
diff --git a/...re/Definitions/Controllers/Simulation/Hands/SimulatedHandControllerDataProviderProfile.cs b/...re/Definitions/Controllers/Simulation/Hands/SimulatedHandControllerDataProviderProfile.cs
@@ -3,9 +3,7 @@
 
 using System.Collections.Generic;
 using UnityEngine;
-using XRTK.Attributes;
 using XRTK.Definitions.Utilities;
-using XRTK.Interfaces.InputSystem.Controllers.Hands;
 using XRTK.Providers.Controllers.Hands;
 
 namespace XRTK.Definitions.Controllers.Simulation.Hands
@@ -43,16 +41,6 @@ public class SimulatedHandControllerDataProviderProfile : SimulatedControllerDat
         /// </summary>
         public bool HandMeshingEnabled => handMeshingEnabled;
 
-        [SerializeField]
-        [Tooltip("The hand ray concrete type to use when raycasting for hand interaction.")]
-        [Implements(typeof(IMixedRealityHandRay), TypeGrouping.ByNamespaceFlat)]
-        private SystemType handRayType = null;
-
-        /// <summary>
-        /// The hand ray concrete type to use when raycasting for hand interaction.
-        /// </summary>
-        public SystemType HandRayType => handRayType;
-
         [Header("Hand Physics")]
 
         [SerializeField]

diff --git a/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityHandTrackingProfile.cs b/XRTK-Core/Packages/com.xrtk.core/Definitions/InputSystem/MixedRealityHandTrackingProfile.cs
@@ -2,9 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
-using XRTK.Attributes;
 using XRTK.Definitions.Utilities;
-using XRTK.Interfaces.InputSystem.Controllers.Hands;
 using XRTK.Providers.Controllers.Hands;
 
 namespace XRTK.Definitions.InputSystem
@@ -26,16 +24,6 @@ public class MixedRealityHandTrackingProfile : BaseMixedRealityProfile
         /// </summary>
         public bool HandMeshingEnabled => handMeshingEnabled;
 
-        [SerializeField]
-        [Tooltip("The hand ray concrete type to use when raycasting for hand interaction.")]
-        [Implements(typeof(IMixedRealityHandRay), TypeGrouping.ByNamespaceFlat)]
-        private SystemType handRayType = null;
-
-        /// <summary>
-        /// The hand ray concrete type to use when raycasting for hand interaction.
-        /// </summary>
-        public SystemType HandRayType => handRayType;
-
         [Header("Hand Physics")]
 
         [SerializeField]

diff --git a/...InputSystem/Controllers/Simulation/SimulatedHandControllerDataProviderProfileInspector.cs b/...InputSystem/Controllers/Simulation/SimulatedHandControllerDataProviderProfileInspector.cs
@@ -11,7 +11,6 @@ public class SimulatedHandControllerDataProviderProfileInspector : SimulatedCont
     {
         // Global hand settings overrides
         private SerializedProperty handMeshingEnabled;
-        private SerializedProperty handRayType;
         private SerializedProperty handPhysicsEnabled;
         private SerializedProperty useTriggers;
         private SerializedProperty boundsMode;
@@ -24,7 +23,6 @@ protected override void OnEnable()
             base.OnEnable();
 
             handMeshingEnabled = serializedObject.FindProperty(nameof(handMeshingEnabled));
-            handRayType = serializedObject.FindProperty(nameof(handRayType));
             handPhysicsEnabled = serializedObject.FindProperty(nameof(handPhysicsEnabled));
             useTriggers = serializedObject.FindProperty(nameof(useTriggers));
             boundsMode = serializedObject.FindProperty(nameof(boundsMode));
@@ -40,7 +38,6 @@ protected override void OnEnable()
         protected override void OnInspectorAdditionalGUI()
         {
             EditorGUILayout.PropertyField(handMeshingEnabled);
-            EditorGUILayout.PropertyField(handRayType);
             EditorGUILayout.PropertyField(handPhysicsEnabled);
             EditorGUILayout.PropertyField(useTriggers);
             EditorGUILayout.PropertyField(boundsMode);

diff --git a/...com.xrtk.core/Inspectors/Profiles/InputSystem/MixedRealityHandTrackingProfileInspector.cs b/...com.xrtk.core/Inspectors/Profiles/InputSystem/MixedRealityHandTrackingProfileInspector.cs
@@ -3,15 +3,13 @@
 
 using UnityEditor;
 using XRTK.Definitions.InputSystem;
-using XRTK.Inspectors.Utilities;
 
 namespace XRTK.Inspectors.Profiles.InputSystem
 {
     [CustomEditor(typeof(MixedRealityHandTrackingProfile))]
     public class MixedRealityHandTrackingProfileInspector : BaseMixedRealityProfileInspector
     {
         private SerializedProperty handMeshingEnabled;
-        private SerializedProperty handRayType;
 
         private SerializedProperty handPhysicsEnabled;
         private SerializedProperty useTriggers;
@@ -22,7 +20,6 @@ protected override void OnEnable()
             base.OnEnable();
 
             handMeshingEnabled = serializedObject.FindProperty(nameof(handMeshingEnabled));
-            handRayType = serializedObject.FindProperty(nameof(handRayType));
 
             handPhysicsEnabled = serializedObject.FindProperty(nameof(handPhysicsEnabled));
             useTriggers = serializedObject.FindProperty(nameof(useTriggers));
@@ -40,7 +37,6 @@ public override void OnInspectorGUI()
             serializedObject.Update();
 
             EditorGUILayout.PropertyField(handMeshingEnabled);
-            EditorGUILayout.PropertyField(handRayType);
             EditorGUILayout.Space();
 
             EditorGUILayout.PropertyField(handPhysicsEnabled);

diff --git a/...e/Packages/com.xrtk.core/Interfaces/InputSystem/Controllers/Hands/IMixedRealityHandRay.cs b/...e/Packages/com.xrtk.core/Interfaces/InputSystem/Controllers/Hands/IMixedRealityHandRay.cs
diff --git a/...kages/com.xrtk.core/Interfaces/InputSystem/Controllers/Hands/IMixedRealityHandRay.cs.meta b/...kages/com.xrtk.core/Interfaces/InputSystem/Controllers/Hands/IMixedRealityHandRay.cs.meta
diff --git a/XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/Hands/MixedRealityHandRay.cs b/XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/Hands/MixedRealityHandRay.cs
diff --git a/XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/Hands/MixedRealityHandRay.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/Hands/MixedRealityHandRay.cs.meta