Skip to content

Commit ec3b0ad

Browse files
authored
Merge pull request #10363 from keveleigh/unobsolete-openxr-profiles
Rename OpenXR profiles
2 parents ce00f91 + d4784a7 commit ec3b0ad

12 files changed

+17
-10
lines changed

Assets/MRTK/Providers/OpenXR/Profiles/ObsoleteOpenXRCameraProfile.asset renamed to Assets/MRTK/Providers/OpenXR/Profiles/OpenXRCameraProfile.asset

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: a4a1c93114e9437cb75d8b3ee4e0e1ba, type: 3}
13-
m_Name: ObsoleteOpenXRCameraProfile
13+
m_Name: OpenXRCameraProfile
1414
m_EditorClassIdentifier:
1515
isCustomProfile: 0
1616
settingsConfigurations:
@@ -21,6 +21,13 @@ MonoBehaviour:
2121
priority: 0
2222
runtimePlatform: -1
2323
settingsProfile: {fileID: 0}
24+
- componentType:
25+
reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.OpenXRCameraSettings,
26+
Microsoft.MixedReality.Toolkit.Providers.OpenXR
27+
componentName: OpenXR Camera Settings
28+
priority: 0
29+
runtimePlatform: -1
30+
settingsProfile: {fileID: 11400000, guid: 32349edfa9bacb94a9fe58923e9a2400, type: 2}
2431
nearClipPlaneOpaqueDisplay: 0.1
2532
farClipPlaneOpaqueDisplay: 1000
2633
cameraClearFlagsOpaqueDisplay: 1

Assets/MRTK/Providers/OpenXR/Profiles/ObsoleteOpenXRConfigurationProfile.asset renamed to Assets/MRTK/Providers/OpenXR/Profiles/OpenXRConfigurationProfile.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: 7612acbc1a4a4ed0afa5f4ccbe42bee4, type: 3}
13-
m_Name: ObsoleteOpenXRConfigurationProfile
13+
m_Name: OpenXRConfigurationProfile
1414
m_EditorClassIdentifier:
1515
isCustomProfile: 0
1616
experienceSettingsProfile: {fileID: 11400000, guid: 1ccbb3b1d759d6a49b4161a958329d9d,

Assets/MRTK/Providers/OpenXR/Profiles/ObsoleteOpenXRControllerMappingProfile.asset renamed to Assets/MRTK/Providers/OpenXR/Profiles/OpenXRControllerMappingProfile.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: 1a1cf5fd47e548e6a23bdd3ddcc00cf6, type: 3}
13-
m_Name: ObsoleteOpenXRControllerMappingProfile
13+
m_Name: OpenXRControllerMappingProfile
1414
m_EditorClassIdentifier:
1515
isCustomProfile: 0
1616
mixedRealityControllerMappings:

Assets/MRTK/Providers/OpenXR/Profiles/ObsoleteOpenXRControllerVisualizationProfile.asset renamed to Assets/MRTK/Providers/OpenXR/Profiles/OpenXRControllerVisualizationProfile.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: 514da61389c049c0bdaf31b7f6970d33, type: 3}
13-
m_Name: ObsoleteOpenXRControllerVisualizationProfile
13+
m_Name: OpenXRControllerVisualizationProfile
1414
m_EditorClassIdentifier:
1515
isCustomProfile: 0
1616
renderMotionControllers: 1

Assets/MRTK/Providers/OpenXR/Profiles/ObsoleteOpenXRInputSystemProfile.asset renamed to Assets/MRTK/Providers/OpenXR/Profiles/OpenXRInputSystemProfile.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: b71cb900fa9dec5488df2deb180db58f, type: 3}
13-
m_Name: ObsoleteOpenXRInputSystemProfile
13+
m_Name: OpenXRInputSystemProfile
1414
m_EditorClassIdentifier:
1515
isCustomProfile: 0
1616
dataProviderConfigurations:

0 commit comments

Comments
 (0)