Skip to content

Commit 701fec5

Browse files
MaxWang-MSMaxWang-MS
committed
Merge branch 'main' into add_configurator
2 parents 1df8679 + c46bfb8 commit 701fec5

File tree

179 files changed

+54107
-37311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+54107
-37311
lines changed

‎Assets/MRTK/Core/Attributes/MixedRealityControllerAttribute.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,26 @@ public class MixedRealityControllerAttribute : Attribute
3838
/// </summary>
3939
public MixedRealityControllerConfigurationFlags Flags { get; }
4040

41+
/// <summary>
42+
/// The supported Unity XR pipelines for this controller.
43+
/// </summary>
44+
public SupportedUnityXRPipelines SupportedUnityXRPipelines { get; }
45+
4146
/// <summary>
4247
///
4348
/// </summary>
4449
public MixedRealityControllerAttribute(
4550
SupportedControllerType supportedControllerType,
4651
Handedness[] supportedHandedness,
4752
string texturePath = "",
48-
MixedRealityControllerConfigurationFlags flags = 0)
53+
MixedRealityControllerConfigurationFlags flags = 0,
54+
SupportedUnityXRPipelines supportedUnityXRPipelines = (SupportedUnityXRPipelines)(-1))
4955
{
5056
SupportedControllerType = supportedControllerType;
5157
SupportedHandedness = supportedHandedness;
5258
TexturePath = texturePath;
5359
Flags = flags;
60+
SupportedUnityXRPipelines = supportedUnityXRPipelines;
5461
}
5562

5663
/// <summary>

‎Assets/MRTK/Core/Attributes/MixedRealityDataProviderAttribute.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,31 @@ namespace Microsoft.MixedReality.Toolkit
99
/// <summary>
1010
/// Attribute that defines the properties of a Mixed Reality Toolkit data provider.
1111
/// </summary>
12-
[AttributeUsage(System.AttributeTargets.Class, AllowMultiple = false)]
12+
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
1313
public class MixedRealityDataProviderAttribute : MixedRealityExtensionServiceAttribute
1414
{
1515
/// <summary>
1616
/// The interface type of the IMixedRealityService for which the data provider is supported.
1717
/// </summary>
1818
public Type ServiceInterfaceType { get; }
1919

20+
/// <summary>
21+
/// The supported Unity XR pipelines for this data provider.
22+
/// </summary>
23+
public SupportedUnityXRPipelines SupportedUnityXRPipelines { get; }
24+
2025
public MixedRealityDataProviderAttribute(
2126
Type serviceInterfaceType,
2227
SupportedPlatforms runtimePlatforms,
2328
string name = "",
2429
string profilePath = "",
2530
string packageFolder = "MixedRealityToolkit",
26-
bool requiresProfile = false) : base(runtimePlatforms, name, profilePath, packageFolder, requiresProfile)
31+
bool requiresProfile = false,
32+
SupportedUnityXRPipelines supportedUnityXRPipelines = (SupportedUnityXRPipelines)(-1))
33+
: base(runtimePlatforms, name, profilePath, packageFolder, requiresProfile)
2734
{
2835
ServiceInterfaceType = serviceInterfaceType;
36+
SupportedUnityXRPipelines = supportedUnityXRPipelines;
2937
}
3038
}
3139
}

‎Assets/MRTK/Core/Definitions/BoundarySystem/MixedRealityBoundaryVisualizationProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Boundary
1010
/// <summary>
1111
/// Configuration profile settings for setting up boundary visualizations.
1212
/// </summary>
13-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Boundary Visualization Profile", fileName = "MixedRealityBoundaryVisualizationProfile", order = (int)CreateProfileMenuItemIndices.BoundaryVisualization)]
13+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Boundary Visualization Profile", fileName = "MixedRealityBoundaryVisualizationProfile", order = (int)CreateProfileMenuItemIndices.BoundaryVisualization)]
1414
[MixedRealityServiceProfile(typeof(IMixedRealityBoundarySystem))]
1515
[HelpURL("https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/features/boundary/boundary-system-getting-started")]
1616
public class MixedRealityBoundaryVisualizationProfile : BaseMixedRealityProfile

‎Assets/MRTK/Core/Definitions/CameraSystem/MixedRealityCameraProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Microsoft.MixedReality.Toolkit
1414
/// is a transparent device or an occluded device.
1515
/// Based on those values, you can customize your camera and quality settings.
1616
/// </summary>
17-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Camera Profile", fileName = "MixedRealityCameraProfile", order = (int)CreateProfileMenuItemIndices.Camera)]
17+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Camera Profile", fileName = "MixedRealityCameraProfile", order = (int)CreateProfileMenuItemIndices.Camera)]
1818
[MixedRealityServiceProfile(typeof(IMixedRealityCameraSystem))]
1919
[HelpURL("https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/configuration/mixed-reality-configuration-guide#camera")]
2020
public class MixedRealityCameraProfile : BaseMixedRealityProfile

‎Assets/MRTK/Core/Definitions/Devices/MixedRealityControllerMappingProfile.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Microsoft.MixedReality.Toolkit.Input
1818
/// New controller types can be registered by adding the MixedRealityControllerAttribute to
1919
/// the controller class.
2020
/// </summary>
21-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Controller Mapping Profile", fileName = "MixedRealityControllerMappingProfile", order = (int)CreateProfileMenuItemIndices.ControllerMapping)]
21+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Controller Mapping Profile", fileName = "MixedRealityControllerMappingProfile", order = (int)CreateProfileMenuItemIndices.ControllerMapping)]
2222
public class MixedRealityControllerMappingProfile : BaseMixedRealityProfile
2323
{
2424
[SerializeField]
@@ -35,7 +35,7 @@ public class MixedRealityControllerMappingProfile : BaseMixedRealityProfile
3535
public MixedRealityControllerMapping[] MixedRealityControllerMappingProfiles => mixedRealityControllerMappings;
3636

3737
#if UNITY_EDITOR
38-
[MenuItem("Mixed Reality Toolkit/Utilities/Update/Controller Mapping Profiles")]
38+
[MenuItem("Mixed Reality/Toolkit/Utilities/Update/Controller Mapping Profiles")]
3939
private static void UpdateAllControllerMappingProfiles()
4040
{
4141
string[] guids = AssetDatabase.FindAssets("t:MixedRealityControllerMappingProfile");

‎Assets/MRTK/Core/Definitions/Devices/MixedRealityControllerVisualizationProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Input
1111
/// <summary>
1212
/// Profile that determines relevant overrides and properties for controller visualization
1313
/// </summary>
14-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Controller Visualization Profile", fileName = "MixedRealityControllerVisualizationProfile", order = (int)CreateProfileMenuItemIndices.ControllerVisualization)]
14+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Controller Visualization Profile", fileName = "MixedRealityControllerVisualizationProfile", order = (int)CreateProfileMenuItemIndices.ControllerVisualization)]
1515
[MixedRealityServiceProfile(typeof(IMixedRealityControllerVisualizer))]
1616
public class MixedRealityControllerVisualizationProfile : BaseMixedRealityProfile
1717
{

‎Assets/MRTK/Core/Definitions/Devices/MixedRealityEyeTrackingProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Microsoft.MixedReality.Toolkit.Input
99
{
10-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Eye Tracking Profile", fileName = "MixedRealityEyeTrackingProfile", order = (int)CreateProfileMenuItemIndices.EyeTracking)]
10+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Eye Tracking Profile", fileName = "MixedRealityEyeTrackingProfile", order = (int)CreateProfileMenuItemIndices.EyeTracking)]
1111
[MixedRealityServiceProfile(requiredTypes: new Type[] { typeof(IMixedRealityEyeGazeDataProvider), typeof(IMixedRealityEyeSaccadeProvider) })]
1212
public class MixedRealityEyeTrackingProfile : BaseMixedRealityProfile
1313
{

‎Assets/MRTK/Core/Definitions/Devices/MixedRealityHandTrackingProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Microsoft.MixedReality.Toolkit.Input
88
{
9-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Hand Tracking Profile", fileName = "MixedRealityHandTrackingProfile", order = (int)CreateProfileMenuItemIndices.HandTracking)]
9+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Hand Tracking Profile", fileName = "MixedRealityHandTrackingProfile", order = (int)CreateProfileMenuItemIndices.HandTracking)]
1010
[HelpURL("https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/features/input/hand-tracking")]
1111
public class MixedRealityHandTrackingProfile : BaseMixedRealityProfile
1212
{

‎Assets/MRTK/Core/Definitions/Diagnostics/MixedRealityDiagnosticsProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Diagnostics
1010
/// <summary>
1111
/// Configuration profile settings for setting up diagnostics.
1212
/// </summary>
13-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Diagnostics Profile", fileName = "MixedRealityDiagnosticsProfile", order = (int)CreateProfileMenuItemIndices.Diagnostics)]
13+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Diagnostics Profile", fileName = "MixedRealityDiagnosticsProfile", order = (int)CreateProfileMenuItemIndices.Diagnostics)]
1414
[MixedRealityServiceProfile(typeof(IMixedRealityDiagnosticsSystem))]
1515
[HelpURL("https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/features/diagnostics/diagnostics-system-getting-started")]
1616
public class MixedRealityDiagnosticsProfile : BaseMixedRealityProfile

‎Assets/MRTK/Core/Definitions/InputSystem/MixedRealityGesturesProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Input
1010
/// <summary>
1111
/// Configuration profile settings for setting up and consuming Input Actions.
1212
/// </summary>
13-
[CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Gestures Profile", fileName = "MixedRealityGesturesProfile", order = (int)CreateProfileMenuItemIndices.Gestures)]
13+
[CreateAssetMenu(menuName = "Mixed Reality/Toolkit/Profiles/Mixed Reality Gestures Profile", fileName = "MixedRealityGesturesProfile", order = (int)CreateProfileMenuItemIndices.Gestures)]
1414
[HelpURL("https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/features/input/gestures")]
1515
public class MixedRealityGesturesProfile : BaseMixedRealityProfile
1616
{

0 commit comments

Comments
 (0)