Skip to content

Commit 6d3e75f

Browse files
thalbernthalbern
authored
Merge branch 'mrtk_development' into user/bethalha/cref_fix
2 parents 2a7f9cb + 4ebcc3c commit 6d3e75f

File tree

774 files changed

+8798
-1937
lines changed

Some content is hidden

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

774 files changed

+8798
-1937
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,6 @@ Assets/ThirdParty.meta
6363
Assets/TextMesh Pro.meta
6464
Assets/TextMesh Pro/
6565
--Version/
66+
Assets/StreamingAssets/GltfModels/
67+
Assets/StreamingAssets/GltfModels.meta
68+
Assets/StreamingAssets.meta

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scripts/LoFiFilterSelection.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Input;
5-
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem.Handlers;
6-
using Microsoft.MixedReality.Toolkit.SDK.Audio.Influencers;
4+
using Microsoft.MixedReality.Toolkit.Input;
5+
using Microsoft.MixedReality.Toolkit.Audio;
76
using UnityEngine;
87

98
namespace Microsoft.MixedReality.Toolkit.Examples.Demos

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem;
5-
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
6-
using Microsoft.MixedReality.Toolkit.Core.Interfaces.BoundarySystem;
7-
using Microsoft.MixedReality.Toolkit.Core.Services;
4+
using Microsoft.MixedReality.Toolkit.Boundary;
85
using System.Collections.Generic;
9-
using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
6+
using Microsoft.MixedReality.Toolkit.Utilities;
107
using UnityEngine;
11-
using UnityEngine.Experimental.XR;
8+
using UnityBoundary = UnityEngine.Experimental.XR.Boundary;
129

1310
namespace Microsoft.MixedReality.Toolkit.Examples.Demos
1411
{
@@ -134,12 +131,12 @@ private void AddMarkers()
134131

135132
Material material = null;
136133
// Check inscribed rectangle first
137-
if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.PlayArea))
134+
if (MixedRealityToolkit.BoundarySystem.Contains(position, UnityBoundary.Type.PlayArea))
138135
{
139136
material = visualizationProfile.PlayAreaMaterial;
140137
}
141138
// Then check geometry
142-
else if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.TrackedArea))
139+
else if (MixedRealityToolkit.BoundarySystem.Contains(position, UnityBoundary.Type.TrackedArea))
143140
{
144141
material = visualizationProfile.TrackedAreaMaterial;
145142
}

‎Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Core.Services;
5-
using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
4+
using Microsoft.MixedReality.Toolkit.Utilities;
65
using UnityEngine;
76

87
namespace Microsoft.MixedReality.Toolkit.Examples.Demos

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/MixedRealityToolkit.Examples.Demos.Gltf.asmdef‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"name": "Microsoft.MixedReality.Toolkit.Examples.Demos.Gltf",
3+
"references": [
4+
"Microsoft.MixedReality.Toolkit",
5+
"Microsoft.MixedReality.Toolkit.Core.Utilities.Async",
6+
"Microsoft.MixedReality.Toolkit.Utilities.Gltf"
7+
],
8+
"optionalUnityReferences": [],
9+
"includePlatforms": [],
10+
"excludePlatforms": [],
11+
"allowUnsafeCode": false,
12+
"overrideReferences": false,
13+
"precompiledReferences": [],
14+
"autoReferenced": true,
15+
"defineConstraints": []
16+
}

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/MixedRealityToolkit.Examples.Demos.Gltf.asmdef.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/Models.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/Models/BoomBox.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/Models/BoomBox/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Boom Box
2+
## Screenshot
3+
4+
![screenshot](screenshot/screenshot.jpg)
5+
6+
## License Information
7+
8+
[![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png)](http://creativecommons.org/publicdomain/zero/1.0/)
9+
To the extent possible under law, Microsoft has waived all copyright and related or neighboring rights to this asset.

0 commit comments

Comments
 (0)