Skip to content

Commit daf6e9b

Browse files
committed
Merge branch 'main' into ADO-9365918-migrate-world-locking-tools
2 parents 54b8da3 + 2723f36 commit daf6e9b

33 files changed

+158
-465
lines changed

.openpublishing.redirection.json

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
"//c": "vtieto, 9/21/21"
1313
},
1414

15+
{
16+
"source_path": "mixed-reality-docs/mr-dev-docs/develop/unreal/unreal-azure-spatial-anchors.md",
17+
"redirect_url": "mixed-reality-docs/mr-dev-docs/develop/unreal",
18+
"redirect_document_id": false
19+
},
20+
1521
{
1622
"source_path": "mixed-reality-docs/mr-dev-docs/whats-new/mr-dev-days-japan.md",
1723
"redirect_url": "/windows/mixed-reality/whats-new/journey-to-mr-series",

mixed-reality-docs/mr-dev-docs/CONTRIBUTING.md

-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ This page covers the basic steps and guidelines for contributing and links to Ma
1919

2020
| Repository name | URL |
2121
| --- | --- |
22-
| Azure Object Anchors | [MicrosoftDocs/azure-docs/articles/object-anchors](https://github.com/MicrosoftDocs/azure-docs/tree/master/articles/object-anchors)
2322
| Azure Remote Rendering | [MicrosoftDocs/azure-docs/articles/remote-rendering](https://github.com/MicrosoftDocs/azure-docs/tree/master/articles/remote-rendering) |
24-
| Azure Spatial Anchors | [MicrosoftDocs/azure-docs/articles/spatial-anchors](https://github.com/MicrosoftDocs/azure-docs/tree/master/articles/spatial-anchors) |
2523
| HoloLens | [MicrosoftDocs/HoloLens](https://github.com/MicrosoftDocs/Hololens) |
2624
| Mixed Reality | [MicrosoftDocs/mixed-reality](https://github.com/MicrosoftDocs/mixed-reality) |
2725
| VR Enthusiasts Guide | [MicrosoftDocs/mixed-reality/enthusiast-guide](https://github.com/MicrosoftDocs/mixed-reality/tree/docs/enthusiast-guide) |

mixed-reality-docs/mr-dev-docs/design/coordinate-systems.md

-9
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,6 @@ You can save to disk the spatial anchors your app creates, and then load them ba
190190

191191
By persisting anchors to the store, your users can place individual holograms or place a workspace around which an app will place its various holograms, and then find those holograms later where they expect them, over many uses of your app.
192192

193-
You can also use <a href="/azure/spatial-anchors/overview" target="_blank">Azure Spatial Anchors</a> for asynchronous hologram persistence across HoloLens, iOS, and Android devices. By sharing a durable cloud spatial anchor, multiple devices can observe the same persisted hologram over time, even if those devices aren't present together at the same time.
194-
195-
### Spatial anchor sharing
196-
197-
Your app can also share a spatial anchor in real time with other devices, allowing for real-time shared experiences.
198-
199-
By using <a href="/azure/spatial-anchors/overview" target="_blank">Azure Spatial Anchors</a>, your app can share a spatial anchor across multiple HoloLens, iOS, and Android devices. By having each device render a hologram using the same spatial anchor, all users will see the hologram appear at the same place in the real world.
200-
201193
## Avoid head-locked content
202194

203195
We strongly discourage rendering head-locked content, which stays at a fixed spot in the display (such as a HUD). In general, head-locked content is uncomfortable for users and doesn't feel like a natural part of their world.
@@ -237,5 +229,4 @@ Sometimes, a home or other space may have two identical areas. For example, two
237229
* [Coordinate systems in DirectX](../develop/native/coordinate-systems-in-directx.md)
238230
* [Spatial anchors](spatial-anchors.md)
239231
* [Shared experiences in mixed reality](shared-experiences-in-mixed-reality.md)
240-
* <a href="/azure/spatial-anchors" target="_blank">Azure Spatial Anchors</a>
241232
* [Case study - Looking through holes in your reality](../out-of-scope/case-study-looking-through-holes-in-your-reality.md)

mixed-reality-docs/mr-dev-docs/design/spatial-anchors.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ keywords: coordinate system, spatial coordinate system, world-scale, world, scal
1212

1313
A spatial anchor represents an important point in the world that the system tracks over time. Each anchor has an adjustable [coordinate system](coordinate-systems.md), based on other anchors or frames of reference, to ensure anchored holograms stay precisely in place. Rendering a hologram in an anchor's coordinate system gives you the most precise positioning for that hologram at any given time. This comes at the cost of small adjustments over time to the hologram's position as the system continually moves it back into place based on the real world.
1414

15-
You can also persist and share spatial anchors across application sessions and across devices:
16-
* By saving local spatial anchors to disk and loading them back later, your application can calculate the same location in the real world across multiple application sessions on a single HoloLens.
17-
* By using <a href="/azure/spatial-anchors/overview" target="_blank">Azure Spatial Anchors</a> to create a cloud anchor, your application can share a spatial anchor across multiple HoloLens, iOS, and Android devices. By having each device render a hologram using the same spatial anchor, users will see the hologram appear at the same place in the real world. This allows for real-time shared experiences.
18-
* You can also use <a href="/azure/spatial-anchors/overview" target="_blank">Azure Spatial Anchors</a> for asynchronous hologram persistence across HoloLens, iOS, and Android devices. By sharing a durable cloud spatial anchor, multiple devices can observe the same persisted hologram over time, even if those devices aren't present together at the same time.
15+
You can also persist and share spatial anchors across application sessions: By saving local spatial anchors to disk and loading them back later, your application can calculate the same location in the real world across multiple application sessions on a single HoloLens.
1916

2017
For standing-scale or room-scale experiences for tethered desktop headsets that will stay within a 5-meter diameter, you can typically use the [stage frame of reference](coordinate-systems.md#stage-frame-of-reference) instead of spatial anchors, which provides you a single coordinate system in which to render all content. However, if your application lets users wander beyond 5 meters in HoloLens, perhaps operating throughout an entire floor of a building, you'll need spatial anchors to keep content stable.
2118

@@ -70,7 +67,6 @@ For cloud spatial anchors, your storage can scale as your scenario requires. You
7067

7168
* [Coordinate systems](coordinate-systems.md)
7269
* [Shared experiences in mixed reality](shared-experiences-in-mixed-reality.md)
73-
* <a href="/azure/spatial-anchors" target="_blank">Azure Spatial Anchors</a>
7470
* [Persistence in Unity](../develop/unity/spatial-anchors-in-unity.md)
7571
* [Spatial anchors in DirectX](../develop/native/coordinate-systems-in-directx.md#place-holograms-in-the-world-using-spatial-anchors)
76-
* [Case study - Looking through holes in your reality](../out-of-scope/case-study-looking-through-holes-in-your-reality.md)
72+
* [Case study - Looking through holes in your reality](../out-of-scope/case-study-looking-through-holes-in-your-reality.md)

mixed-reality-docs/mr-dev-docs/develop/advanced-concepts/qr-code-tracking-overview.md

-1
Original file line numberDiff line numberDiff line change
@@ -329,5 +329,4 @@ QR code smoothing process changed after 20H2, from pose smoothing to size smooth
329329

330330
* [QR code tracking with native C++ and C# samples](../native/qr-code-tracking-cs-cpp.md)
331331
* [Coordinate systems](../../design/coordinate-systems.md)
332-
* [Azure Spatial Anchors](/azure/spatial-anchors/overview)
333332
* [HoloLens 2 Locatable camera overview](./locatable-camera-overview.md#hololens-2)

mixed-reality-docs/mr-dev-docs/develop/advanced-concepts/shared-spatial-anchors-in-directx.md

+1-13
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@ keywords: HoloLens, synchronize, spatial anchor, transfer, multiplayer, view, sc
1515
1616
A shared experience is one where multiple users with their own HoloLens, iOS, or Android device, collectively view and interact with the same hologram. The hologram is positioned at a fixed point in space using spatial anchor sharing.
1717

18-
This article provides brief introductions to Azure Spatial Anchors and local anchors. If you're new to Azure Spatial Anchors, we recommend that you read this [detailed overview](../../design/spatial-anchors.md) first.
19-
20-
## Azure Spatial Anchors
21-
22-
You can use <a href="/azure/spatial-anchors/overview" target="_blank">Azure Spatial Anchors</a> to create durable cloud-backed spatial anchors, which your app can then locate across multiple HoloLens, iOS and Android devices. By sharing a common spatial anchor across multiple devices, each user can see content rendered relative to that anchor in the same physical location. This allows for real-time shared experiences.
23-
24-
You can also use <a href="/azure/spatial-anchors/overview" target="_blank">Azure Spatial Anchors</a> for asynchronous hologram persistence across HoloLens, iOS, and Android devices. By sharing a durable cloud spatial anchor, multiple devices can observe the same persisted hologram over time, even if those devices aren't present together at the same time.
25-
26-
To get started building shared experiences in your HoloLens app, try out the 5-minute <a href="/azure/spatial-anchors/quickstarts/get-started-hololens" target="_blank">Azure Spatial Anchors HoloLens quickstart</a>.
27-
28-
Once you're up and running with Azure Spatial Anchors, you can then <a href="/azure/spatial-anchors/concepts/create-locate-anchors-cpp-winrt" target="_blank">create and locate anchors on HoloLens</a>. Walkthroughs are available for <a href="/azure/spatial-anchors/create-locate-anchors-overview" target="_blank">Android and iOS</a> as well, enabling you to share the same anchors on all devices.
18+
This article provides a brief introduction to local anchors.
2919

3020
## Local anchor transfers
3121

@@ -34,5 +24,3 @@ In situations where you can't use Azure Spatial Anchors, [local anchor transfers
3424
## See also
3525

3626
* [Shared experiences in mixed reality](../../design/shared-experiences-in-mixed-reality.md)
37-
* <a href="/azure/spatial-anchors" target="_blank">Azure Spatial Anchors</a>
38-
* <a href="/cpp/api/spatial-anchors/winrt/" target="_blank">Azure Spatial Anchors SDK for HoloLens</a>

mixed-reality-docs/mr-dev-docs/develop/choosing-an-engine.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,10 @@ There are several development paths you can take through our documentation. The
7474

7575
| Cloud services | Unity | Unreal | JavaScript | Custom engine <br>(using OpenXR) |
7676
|---|---|---|---|---|
77-
| Azure Spatial Anchors | ✔️ | ✔️ || ✔️ |
78-
| Azure Object Anchors | ✔️ ||| ✔️ |
79-
| Azure Remote Rendering | ✔️ * ||| ✔️ * |
77+
| Azure Remote Rendering | ✔️ ||| ✔️ |
8078

8179
> [!NOTE]
82-
> * Azure Remote Rendering is currently supported in apps using the legacy WinRT APIs (Windows XR plugin in Unity). ARR support for OpenXR apps is coming soon.
80+
> * Azure Remote Rendering (ARR) will be retired on September 30, 2025. [Learn more](https://azure.microsoft.com/updates/v2/azure-remote-rendering-retirement/).
8381
8482
## Next steps
8583

mixed-reality-docs/mr-dev-docs/develop/features-and-samples.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,10 @@ For each of the developer scenarios listed below, there are feature samples that
3131
| --- | --- | ---- | --- |
3232
| [**Build basic Unity mixed reality scenarios**](#build-basic-openxr-scenarios) | [OpenXR with Unity samples](#build-basic-openxr-scenarios) | Unity C# | Get started with cross-platform developer tools using the latest Unity 2020.LTS and OpenXR plugin. |
3333
| [**Anchoring Strategies**](../design/spatial-anchors.md) | [Local anchor](https://github.com/microsoft/OpenXR-Unity-MixedReality-Samples#sample-for-anchors-and-anchor-persistence) | | Persist and share spatial anchors across application sessions and across devices. See the [Spatial anchors](../design/spatial-anchors.md) article. |
34-
| | [Azure Spatial Anchors samples](https://github.com/Azure/azure-spatial-anchors-samples) | | Build spatially aware mixed reality applications with the essential capabilities of [Azure Spatial Anchors](/azure/spatial-anchors/overview). |
3534
| | [QR Codes](#qr-codes) | Unity C# | Detect QR Codes in the environment. |
3635
| [**Collaboration in mixed reality**](#collaboration-in-mixed-reality) | [User identity](#user-identity) | Unity C# | Set up your HoloLens 2 device using Azure Active Directory (AAD) credentials. |
37-
| | [Azure Spatial Anchors samples](https://github.com/Azure/azure-spatial-anchors-samples) | | Build spatially aware mixed reality applications with the essential capabilities of [Azure Spatial Anchors](/azure/spatial-anchors/overview). |
3836
| [**Spatial interaction**](#spatial-interaction---basic-hologram-sample) | [Basic hologram sample](#spatial-interaction---basic-hologram-sample) | Windows 10 C++ | Render a spinning cube in Windows Mixed Reality. |
39-
| [**Scene/Object understanding**](#scene-understanding) | [Scene understanding samples](#scene-understanding) | Unity C# | Help design environmentally-aware mixed reality applications. |
40-
| | [Azure Object Anchors samples](https://github.com/Azure/azure-object-anchors) | Unity C# | Detect an object in the physical world using a 3D model and estimate its 6DoF pose with [Azure Object Anchors](/azure/object-anchors/overview). |
37+
| [**Scene understanding**](#scene-understanding) | [Scene understanding samples](#scene-understanding) | Unity C# | Help design environmentally-aware mixed reality applications. |
4138
| [**Contextual data overlays**](#contextual-data-overlays) | [QR Codes](#qr-codes) | Unity C# | Detect QR Codes in the environment. |
4239
| | [Poster tracker sample](#poster-tracker-sample) | Unity C# | Align a hologram with a real world object. |
4340
| | [Build mixed reality digital twins](#build-mixed-reality-digital-twins) | Unity C# | Learn how to create a mixed reality application using Azure Digital Twins and Unity, a real-time 3D platform. |
@@ -50,7 +47,6 @@ For each of the developer scenarios listed below, there are feature samples that
5047
| **World Locking holograms** | [World locked physics sample](/mixed-reality/world-locking-tools/documentation/howtos/samples/worldlockedphysicssample) | Unity C# | Explore a few virtual physics experiences that are enabled by World Locking Tools' world-locked coordinate system. |
5148
| | [Space pin sample](/mixed-reality/world-locking-tools/documentation/howtos/samples/spacepin) | Unity C# | Move closer to the inner workings of a real-world application that needs to align a large object or objects with real-world features. The Space Pin sample offers a simplified and more focused view of the Space Pin feature. |
5249
| | [Ray pins example](/mixed-reality/world-locking-tools/documentation/howtos/samples/raypins) | Unity C# | Demonstrate how to set up Space Pins by manually manipulating marker objects into position using MRTK affordances. |
53-
| | [World Locking Tools with Azure Spatial Anchors sample](/mixed-reality/world-locking-tools/documentation/howtos/samples/wlt_asa_sample) | Unity C# | Provide a stable coordinate system that can be persisted across sessions and shared across devices in your application. This is made possible when combining World Locking Tools for Unity (WLT) with Azure Spatial Anchors (ASA). |
5450
| Managing Power and Thermals | [Managing Power & Thermals](unity/managing-power-and-thermals.md) | Unity C#, Win32 C++ | When the HoloLens 2 is running in warm environments or with heavy performance requirements (CPU/GPU usage, peripheral usage, etc.), PowerThermalNotification SDK can be used to subscribe to notification events, allowing the device to operate longer. See the [PowerThermalNotification API reference](/dotnet/api/microsoft.mixedreality.powerthermalnotification). |
5551

5652
### Build basic OpenXR scenarios
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Azure Remote Rendering](#tab/arr)
1+
## Azure Remote Rendering
22

33
Azure Remote Rendering (ARR) is a service that lets you to render highly complex 3D models in real time. ARR is currently in public preview. It can be added to your Unity or Native C++ projects targeting HoloLens 2 or Windows desktop PC.
44

@@ -9,13 +9,3 @@ Azure Remote Rendering (ARR) is a service that lets you to render highly complex
99
* [Tutorial: Azure Remote Rendering series](/azure/remote-rendering/tutorials/unity/tutorial-landing)
1010
* [Azure Remote Rending sample](/azure/remote-rendering/samples/showcase-app)
1111

12-
# [Azure Spatial Anchors](#tab/asa)
13-
14-
Azure Spatial Anchors (ASA) is a cross-platform service that allows you to build spatially aware mixed reality applications. With Azure Spatial Anchors, you can map, persist, and share holographic content across multiple devices, at real-world scale.
15-
16-
* [Overview](/azure/spatial-anchors/overview)
17-
* [Quickstart: Create a HoloLens app](/azure/spatial-anchors/quickstarts/get-started-unity-hololens)
18-
* [Create and locate anchors](/azure/spatial-anchors/how-tos/create-locate-anchors-unity)
19-
* [Discover nearby anchors](/azure/spatial-anchors/how-tos/set-up-coarse-reloc-unity)
20-
* [Tutorial: Sharing anchors across sessions and devices](/azure/spatial-anchors/tutorials/tutorial-share-anchors-across-devices?tabs=VS%2cAndroid)
21-
* [Azure Spatial Anchors samples (GitHub)](https://github.com/Azure/azure-spatial-anchors-samples)

mixed-reality-docs/mr-dev-docs/develop/includes/unity-tutorials.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# [HoloLens 2](#tab/hl2)
22

33
* [Getting started](/training/paths/beginner-hololens-2-tutorials/)
4-
* [Azure Spatial Anchors](/training/modules/azure-spatial-anchors-tutorials/)
54
* [Multi-user capabilities](../unity/tutorials/mr-learning-sharing-01.md)
65
* [Azure Speech Services](/training/modules/azure-speech-services-tutorials-mrtk/)
76
* [Spatial audio](/training/modules/spatial-audio-tutorials-mrtk/)

mixed-reality-docs/mr-dev-docs/develop/includes/unreal-building-blocks.md

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
| [Gaze](../unreal/unreal-gaze-input.md) | Let users target holograms with by looking at them |
1616
| [Hand tracking](../unreal/unreal-hand-tracking.md) | Add spatial actions to your users gaze input |
1717
| [Local Spatial Anchors](../unreal/unreal-spatial-anchors.md) | Save holograms locally in real-world space between application sessions |
18-
| [Azure Spatial Anchors](../unreal/unreal-azure-spatial-anchors.md) | Save holograms to the cloud in real-world space between application sessions |
1918
| [Spatial mapping](../unreal/unreal-spatial-mapping.md) | Map your physical space with a virtual mesh overlay to mark the boundaries of your environment |
2019
| [Spatial audio](../unreal/unreal-spatial-audio.md) | Enhance your apps with immersive 3D audio |
2120
| [Voice input](../unreal/unreal-voice-input.md) | Capture spoken keywords, phrases, and dictation from your users|

mixed-reality-docs/mr-dev-docs/develop/includes/unreal-cloud-services-d365.md

-6
This file was deleted.

mixed-reality-docs/mr-dev-docs/develop/mixed-reality-cloud-services.md

-1
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,4 @@ The standalone services listed below don't apply to Mixed Reality, but can be he
148148

149149
## See also
150150

151-
* Azure Spatial Anchor tutorials for HoloLens 2 - [1 of 3 Getting started with Azure Spatial Anchors](/training/modules/azure-spatial-anchors-tutorials/2-get-started-with-azure-spatial-anchors)
152151
* Azure Speech Services tutorials for HoloLens 2 - [1 of 4 Integrating and using speech recognition and transcription](/training/modules/azure-speech-services-tutorials-mrtk/)

0 commit comments

Comments
 (0)