Skip to content

Commit 242cc4d

Browse files
committed
Update to use new Feature
1 parent 2b5712b commit 242cc4d

File tree

6 files changed

+4
-140
lines changed

6 files changed

+4
-140
lines changed

org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ GameObject:
325325
- component: {fileID: 2351505567455720332}
326326
- component: {fileID: 4160709927669568829}
327327
- component: {fileID: 6400715630075217958}
328-
- component: {fileID: 1798554929582623642}
329328
m_Layer: 0
330329
m_Name: MRTK XR Rig
331330
m_TagString: Untagged
@@ -378,21 +377,6 @@ MonoBehaviour:
378377
m_Script: {fileID: 11500000, guid: 1a107350295baaf4489642caa92f05de, type: 3}
379378
m_Name:
380379
m_EditorClassIdentifier:
381-
--- !u!114 &1798554929582623642
382-
MonoBehaviour:
383-
m_ObjectHideFlags: 0
384-
m_CorrespondingSourceObject: {fileID: 0}
385-
m_PrefabInstance: {fileID: 0}
386-
m_PrefabAsset: {fileID: 0}
387-
m_GameObject: {fileID: 2351505567455720334}
388-
m_Enabled: 1
389-
m_EditorHideFlags: 0
390-
m_Script: {fileID: 11500000, guid: 671b97df530b06e46893c4189b3ceab4, type: 3}
391-
m_Name:
392-
m_EditorClassIdentifier:
393-
inputActionReferences:
394-
- {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3}
395-
- {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3}
396380
--- !u!1 &7735890427496681069
397381
GameObject:
398382
m_ObjectHideFlags: 0

org.mixedrealitytoolkit.input/Controllers/HandModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ protected virtual void Start()
9494
}
9595
}
9696

97-
MRTKInputFocusManager.XrSessionHasFocus.SubscribeAndUpdate(OnXrSessionFocus);
97+
MRTKInputFocusFeature.XrSessionHasFocus.SubscribeAndUpdate(OnXrSessionFocus);
9898
}
9999

100100
/// <summary>
101101
/// See <see cref="MonoBehaviour"/>.
102102
/// </summary>
103-
private void OnDestroy() => MRTKInputFocusManager.XrSessionHasFocus.Unsubscribe(OnXrSessionFocus);
103+
private void OnDestroy() => MRTKInputFocusFeature.XrSessionHasFocus.Unsubscribe(OnXrSessionFocus);
104104

105105
/// <summary>
106106
/// Sent to all GameObjects when the player gets or loses focus.

org.mixedrealitytoolkit.input/MRTK.Input.asmdef

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"glTFast",
66
"Microsoft.MixedReality.OpenXR",
77
"MixedReality.Toolkit.Core",
8-
"Snapdragon.Spaces.Runtime",
98
"Unity.InputSystem",
109
"Unity.XR.CoreUtils",
1110
"Unity.XR.Hands",
@@ -70,11 +69,6 @@
7069
"name": "com.unity.xr.openxr",
7170
"expression": "",
7271
"define": "UNITY_OPENXR_PRESENT"
73-
},
74-
{
75-
"name": "com.qualcomm.snapdragon.spaces",
76-
"expression": "",
77-
"define": "SNAPDRAGON_SPACES_PRESENT"
7872
}
7973
],
8074
"noEngineReferences": false

org.mixedrealitytoolkit.input/Subsystems/Hands/HandsProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public override bool TryGetEntireHand(XRNode handNode, out IReadOnlyList<HandJoi
6161
{
6262
Debug.Assert(handNode == XRNode.LeftHand || handNode == XRNode.RightHand, "Non-hand XRNode used in TryGetEntireHand query.");
6363

64-
if (!MRTKInputFocusManager.XrSessionHasFocus.Value)
64+
if (!MRTKInputFocusFeature.XrSessionHasFocus.Value)
6565
{
6666
jointPoses = Array.Empty<HandJointPose>();
6767
return false;
@@ -75,7 +75,7 @@ public override bool TryGetJoint(TrackedHandJoint joint, XRNode handNode, out Ha
7575
{
7676
Debug.Assert(handNode == XRNode.LeftHand || handNode == XRNode.RightHand, "Non-hand XRNode used in TryGetJoint query.");
7777

78-
if (!MRTKInputFocusManager.XrSessionHasFocus.Value)
78+
if (!MRTKInputFocusFeature.XrSessionHasFocus.Value)
7979
{
8080
jointPose = default;
8181
return false;

org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs

Lines changed: 0 additions & 103 deletions
This file was deleted.

org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)