Skip to content

Commit aa9bcc0

Browse files
author
David Kline
authored
Merge pull request #8725 from microsoft/releases/2.5.0
Merge 2.5.0 -> mrtk_release
2 parents ed6929b + 84454ec commit aa9bcc0

File tree

3,031 files changed

+393257
-432494
lines changed

Some content is hidden

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

3,031 files changed

+393257
-432494
lines changed

‎.gitignore

+10-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ UnityPackageManager/
1717
project.json
1818
project.lock.json
1919
*.package
20-
20+
**/.DS_Store
21+
Assets/XR/
22+
Assets/XR.meta
23+
Assets/Oculus/
24+
Assets/Oculus.meta
2125
# ============ #
2226
# Certificates #
2327
# ============ #
@@ -101,3 +105,8 @@ MSBuildForUnity.Common.props
101105
*.msb4u.sln.meta
102106
Dependencies*
103107
Nuget.config*
108+
109+
# =========== #
110+
# Other files #
111+
# =========== #
112+
.DS_Store

‎Assets/MRTK/.npmignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.nuspec
2+
*.nuspec.meta
3+
*.tgz

‎Assets/MRTK/Core/AssemblyInfo.cs

-10
This file was deleted.

‎Assets/MRTK/Core/AssemblyInfo.cs.meta

-11
This file was deleted.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55
using UnityEngine;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33
using UnityEngine;
44
using System;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
#if WINDOWS_UWP && !ENABLE_IL2CPP

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33
using UnityEngine;
44
using System;
55

@@ -8,7 +8,7 @@ namespace Microsoft.MixedReality.Toolkit
88
/// <summary>
99
/// A PropertyAttribute for showing a collapsible Help section.
1010
/// </summary>
11-
[AttributeUsage(AttributeTargets.Field|AttributeTargets.Property, AllowMultiple = false)]
11+
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
1212
public class HelpAttribute : PropertyAttribute
1313
{
1414
/// <summary>
@@ -35,7 +35,7 @@ public class HelpAttribute : PropertyAttribute
3535
/// <param name="helpText">The help text to display</param>
3636
/// <param name="helpHeader">The help header foldout text</param>
3737
/// <param name="collapsible">If true, this help drawer will be collapsible</param>
38-
public HelpAttribute(string helpText, string helpHeader="Help", bool collapsible = true)
38+
public HelpAttribute(string helpText, string helpHeader = "Help", bool collapsible = true)
3939
{
4040
Text = helpText;
4141
Header = helpHeader;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
#if WINDOWS_UWP && !ENABLE_IL2CPP

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
using System;
@@ -42,9 +42,9 @@ public class MixedRealityControllerAttribute : Attribute
4242
///
4343
/// </summary>
4444
public MixedRealityControllerAttribute(
45-
SupportedControllerType supportedControllerType,
45+
SupportedControllerType supportedControllerType,
4646
Handedness[] supportedHandedness,
47-
string texturePath = "",
47+
string texturePath = "",
4848
MixedRealityControllerConfigurationFlags flags = 0)
4949
{
5050
SupportedControllerType = supportedControllerType;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
using System;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
using System;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55
using UnityEngine;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55
using UnityEngine;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using UnityEngine;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33
using System;
44
using UnityEngine;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
#if WINDOWS_UWP && !ENABLE_IL2CPP

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33
using UnityEngine;
44
using System;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55
using UnityEngine;

‎Assets/MRTK/Core/Definitions/BaseMixedRealityProfile.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55
using UnityEngine;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using UnityEngine;
55

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
using System;
@@ -62,7 +62,7 @@ public class InscribedRectangle
6262
/// Is the described rectangle valid?
6363
/// </summary>
6464
/// <remarks>
65-
/// A rectangle is considered valid if it's center point is valid.
65+
/// A rectangle is considered valid if its center point is valid.
6666
/// </remarks>
6767
public bool IsValid => EdgeUtilities.IsValidPoint(Center);
6868

@@ -163,12 +163,12 @@ public InscribedRectangle(Edge[] geometryEdges, int randomSeed)
163163
// Note, we are ignoring the return value as we are checking each point's validity
164164
// individually.
165165
FindSurroundingCollisionPoints(
166-
geometryEdges,
167-
startingPoints[pointIndex],
166+
geometryEdges,
167+
startingPoints[pointIndex],
168168
angleRadians,
169-
out topCollisionPoint,
170-
out bottomCollisionPoint,
171-
out leftCollisionPoint,
169+
out topCollisionPoint,
170+
out bottomCollisionPoint,
171+
out leftCollisionPoint,
172172
out rightCollisionPoint);
173173

174174
float newWidth;
@@ -332,9 +332,9 @@ private bool FindSurroundingCollisionPoints(
332332
}
333333

334334
// Each corner of the rectangle must intersect with the geometry.
335-
if (!EdgeUtilities.IsValidPoint(topCollisionPoint) ||
335+
if (!EdgeUtilities.IsValidPoint(topCollisionPoint) ||
336336
!EdgeUtilities.IsValidPoint(bottomCollisionPoint) ||
337-
!EdgeUtilities.IsValidPoint(leftCollisionPoint) ||
337+
!EdgeUtilities.IsValidPoint(leftCollisionPoint) ||
338338
!EdgeUtilities.IsValidPoint(rightCollisionPoint))
339339
{
340340
return false;
@@ -521,7 +521,7 @@ private bool TryFixMaximumRectangle(
521521

522522
// If the lowest value needed to outperform the previous best is greater than our max,
523523
// this aspect ratio can't outperform what we've already calculated.
524-
if ((searchHeightLowerBound > searchHeightUpperBound) ||
524+
if ((searchHeightLowerBound > searchHeightUpperBound) ||
525525
(searchHeightLowerBound * aspectRatios[i] > maxWidth))
526526
{
527527
continue;
@@ -533,10 +533,10 @@ private bool TryFixMaximumRectangle(
533533
// Perform the binary search until continuing to search will not give us a significant win.
534534
do
535535
{
536-
if (CheckRectangleFit(geometryEdges,
537-
centerPoint,
538-
angleRadians,
539-
aspectRatios[i] * currentTestingHeight,
536+
if (CheckRectangleFit(geometryEdges,
537+
centerPoint,
538+
angleRadians,
539+
aspectRatios[i] * currentTestingHeight,
540540
currentTestingHeight))
541541
{
542542
// Binary search up-ward

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
using UnityEngine;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation.
22
// Copyright(c) 2019 Takahiro Miyaura
3-
// Licensed under the MIT License. See LICENSE in the project root for license information.
3+
// Licensed under the MIT License.
44

55
namespace Microsoft.MixedReality.Toolkit.CameraSystem
66
{

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.CameraSystem;
55
using Microsoft.MixedReality.Toolkit.Utilities;
@@ -123,7 +123,7 @@ public MixedRealityCameraSettingsConfiguration[] SettingsConfigurations
123123
/// </summary>
124124
public int TransparentQualityLevel => transparentQualityLevel;
125125

126-
#region Obsolete properties
126+
#region Obsolete properties
127127

128128
/// <summary>
129129
/// Quality level for a HoloLens device.
@@ -134,7 +134,7 @@ public MixedRealityCameraSettingsConfiguration[] SettingsConfigurations
134134
[Obsolete("HoloLensQualityLevel is obsolete and will be removed in a future Mixed Reality Toolkit release. Please use TransparentQualityLevel.")]
135135
public int HoloLensQualityLevel => transparentQualityLevel;
136136

137-
#endregion Obsolete properties
137+
#endregion Obsolete properties
138138

139139
}
140140
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
using System;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
#if UNITY_EDITOR
55
using Microsoft.MixedReality.Toolkit.Utilities;
@@ -286,7 +286,7 @@ private static Texture2D GetControllerTextureInternal(Type controllerType, Hande
286286
}
287287
}
288288

289-
return GetControllerTextureInternal("StandardAssets/Textures/Generic_controller", Handedness.None, suffix);
289+
return GetControllerTextureInternal("Textures/Generic_controller", Handedness.None, suffix);
290290
}
291291

292292
private static Texture2D GetControllerTextureInternal(string relativeTexturePath, Handedness handedness, string suffix)
@@ -303,7 +303,7 @@ private static Texture2D GetControllerTextureInternal(string relativeTexturePath
303303

304304
string themeSuffix = EditorGUIUtility.isProSkin ? "_white" : "_black";
305305

306-
string fullTexturePath = MixedRealityToolkitFiles.MapRelativeFilePath($"{relativeTexturePath}{handednessSuffix}{themeSuffix}{suffix}.png");
306+
string fullTexturePath = MixedRealityToolkitFiles.MapRelativeFilePath(MixedRealityToolkitModuleType.StandardAssets, $"{relativeTexturePath}{handednessSuffix}{themeSuffix}{suffix}.png");
307307
return (Texture2D)AssetDatabase.LoadAssetAtPath(fullTexturePath, typeof(Texture2D));
308308
}
309309

0 commit comments

Comments
 (0)