Update setup, configuration, and deployment docs

a

Author: keveleigh

docs/mrtk3-overview/getting-started/setting-up/setup-new-project.md

@@ -46,64 +46,29 @@ Open the Unity project and wait for Unity to finish importing the newly added pa
 1. The first message asks whether you want to enable the new input backend. Select **yes**.
 1. The second message asks whether you want to update XR InteractionLayerMask. Select **No Thanks**.
 
-Unity might restart a few times during this process--wait for it to finish before proceeding.
+Unity might restart a few times during this process; wait for it to finish before proceeding.
 
 ### 4. Configure MRTK profile after import
 
 Once imported, MRTK3 requires a profile to be set for the standalone target platform and each additional target platform.
 
 1. Navigate to **Edit > Project Settings**.
 1. Under **Project Settings**, navigate to **MRTK3** and then switch to the standalone tab. Note that the profile is initially unspecified.
-1. Populate the field with the default MRTK profile that ships with the core package. You can type in the keyword "MRTKprofile" in the search bar of the project window; make sure you search in `All`. Alternatively, you can find the profile under `Packages/org.mixedrealitytoolkit.core/Configuration/Default Profiles/MRTKProfile.asset`.
+1. Populate the field with the default MRTK profile that ships with the core package. You can click the "Assign MRTK Default" button to auto-populate this field. Alternatively, you can find the profile under `Packages/org.mixedrealitytoolkit.core/Configuration/Default Profiles/MRTKProfile.asset`.
 
     > [!NOTE]
     > Not all of the MRTK subsystems are shown in the screenshot below. The MRTK subsystems that you see may be different depending on the MRTK3 packages you've added to your project.
 
-    ![assign the default MRTK profile](../../images/mrtk-profile.png)
+    ![Assign the default MRTK profile](../../images/mrtk-profile.png)
 
 1. Switch to the tabs of other build target(s) you want to use (for example, UWP, Android) and check to see if the profile is assigned. If not, repeat the previous step on the current tab.
 
 ### 5. Configure OpenXR-related settings
 
-Once imported, MRTK3 requires some configuration on OpenXR if you're targeting an XR device such as HoloLens 2 or Quest.
+Once imported, MRTK3 requires some configuration on OpenXR if you're targeting a specific XR device. Refer to the instructions on the following pages for platform-specific guidance.
 
-> [!NOTE]
-> The following instructions apply to HoloLens 2 or WMR headsets. If you're targeting Quest, refer to the instructions on the [Quest deployment page](../../test-and-deploy/quest-deployment.md#deployment-prerequisites).
-
-1. Navigate to **Edit > Project Settings**.
-
-1. Under **Project Settings**, navigate to **XR Plug-in Management** and enable **OpenXR** under both the Standalone and UWP tabs. Under each tab, ensure that **Initialize XR on Startup** is selected and that the **Windows Mixed Reality feature group under Standalone** and the **Microsoft HoloLens feature group under UWP** are enabled.
-
-    > [!NOTE]
-    > A yellow warning icon may appear after checking the **OpenXR** option. Click that icon to open the **OpenXR Project Validation** tool. Click **Fix all** and ignore the interaction profile issue that can't be auto-fixed. The profiles will be added in the step below.
-
-   For standalone:
-
-   [![Standalone XR Plug-in Management window](../../images/standalone-xr-plug-in-management.png)](../../images/standalone-xr-plug-in-management.png)
-
-   For UWP:
-
-   [![UWP XR Plug-in Management window](../../images/uwp-xr-plug-in-management.png)](../../images/uwp-xr-plug-in-management.png)
-
-1. Under **Project Settings**, navigate to **XR Plug-in Management > OpenXR > Interaction Profiles** and add the following three profiles for UWP and Standalone:
-
-    - **Eye Gaze Interaction Profile**
-    - **Microsoft Hand Interaction Profile**
-    - **Microsoft Motion Controller Profile**
-
-    > [!NOTE]
-    > You might need to use the **OpenXR Project Validation** tool to eliminate the yellow triangle. Some of the warnings may be resolved manually: <br/> 1. Under **Project Settings**, navigate to **Player > Resolution and Presentation**. Ensure that **Run in Background** is unchecked. <br/> 2. For UWP, under **Player > Publishing Settings > Capabilities**, ensure that **WebCam**, **Microphone**, **SpatialPerception**, and **GazeInput** are checked if these features are needed by the application. For more information about Window's App Capabilities see [App capability declarations](https://learn.microsoft.com/windows/uwp/packaging/app-capability-declarations).
-
-   For standalone:
-
-   [![Standalone OpenXR](../../images/standalone-openxr.png)](../../images/standalone-openxr.png)
-
-   For UWP:
-
-   [![UWP OpenXR](../../images/uwp-openxr.png)](../../images/uwp-openxr.png)
-
-1. For HoloLens 2, we recommend that you set **Depth Submission Mode** to 16-bit in the settings above.
-1. For immersive headsets, you can use 24-bit depth submission. See the [Microsoft development docs for Unity](https://learn.microsoft.com/windows/mixed-reality/develop/unity/recommended-settings-for-unity?tabs=openxr#enable-depth-buffer-sharing) for more info.
+- [Deploy to a Quest device](../../test-and-deploy/quest-deployment.md#deployment-prerequisites)
+- [Deploy to HoloLens 2](../../test-and-deploy/hololens2-deployment.md#deployment-prerequisites)
 
 ### 6. Congratulations, the project setup is now finished
 

docs/mrtk3-overview/images/android-xr-plug-in-management.png

@@ -1,25 +1,90 @@
 ---
-title: Deploy an MRTK3 project to HoloLens 2
+title: Deploy to HoloLens 2
 parent: Test and experience overview
-nav_order: 2
+nav_order: 4
 ---
 
-# Deploy an MRTK3 project to HoloLens 2
+# Deploy to HoloLens 2
 
 This page describes how to deploy your Unity Project with MRTK3 onto a HoloLens 2.
 
 > [!NOTE]
 > We strongly recommend using [Holographic remoting](streaming.md) for rapid iteration and testing on HoloLens 2, which allows for instant testing on the device without the need for compile + deploy.
 
-## Deployment Pre-requisites
+## Deployment Prerequisites
 
-- Add MRTK to your project and ensure your [project settings](../getting-started/setting-up/setup-new-project.md#5-configure-openxr-related-settings) are configured correctly to use the OpenXR pipeline and MRTK's feature set. **These features are required to deploy your project onto your HoloLens**.
+1. Add MRTK to your project and ensure your [project settings](../getting-started/setting-up/setup-new-project.md#5-configure-openxr-related-settings) are configured correctly to use the OpenXR pipeline and MRTK's feature set. **These features are required to deploy your project onto your HoloLens**.
+
+    > [!NOTE]
+    > If starting from our [template project](../getting-started/setting-up/setup-template.md), these project settings should already be configured for you.
+
+1. Navigate to **File > Build Settings**.
+
+1. Under **Platform**, select **Universal Windows Platform**. Switch the platform to **Universal Windows Platform**, and wait for the operation to finish.
+
+1. Navigate to **Edit > Project Settings**.
+
+1. Under **Project Settings**, navigate to **XR Plug-in Management** and enable **OpenXR** under both the **Standalone** and **UWP** tabs. Under each tab, ensure that **Initialize XR on Startup** is selected and that the **Windows Mixed Reality feature group** under **Standalone** and the **Microsoft HoloLens feature group** under **UWP** are enabled.
+
+    > [!NOTE]
+    > If you don't see these **feature groups**, ensure the **Mixed Reality OpenXR Plugin** is imported into your project.
+
+    For standalone:
+
+    [![Standalone XR Plug-in Management window](../images/standalone-xr-plug-in-management.png)](../images/standalone-xr-plug-in-management.png)
+
+    For UWP:
+
+    [![UWP XR Plug-in Management window](../images/uwp-xr-plug-in-management.png)](../images/uwp-xr-plug-in-management.png)
+
+    > [!NOTE]
+    > A yellow warning icon may appear after checking the **OpenXR** option. Click that icon to open the **OpenXR Project Validation** tool. Click **Fix all** and ignore the interaction profile issue that can't be auto-fixed. The profiles will be added in the step below.
+
+1. Under **Project Settings**, navigate to **XR Plug-in Management > OpenXR > Interaction Profiles** and ensure the following profiles are listed based on the MRTK features you'd like to use:
+
+    | Profile | MRTK |
+    |---------|------|
+    | Eye Gaze Interaction Profile | For eye tracking input |
+    | Hand Interaction Profile | For articulated hand input |
+    | Microsoft Motion Controller Profile | For controller input |
+
+1. Under **Project Settings**, navigate to **XR Plug-in Management > OpenXR > OpenXR Feature Groups** and ensure the following features are checked under **All Features** based on the MRTK features you'd like to use (these are likely to be already checked after selecting the **feature groups** above):
+
+    | Feature | MRTK |
+    |---------|------|
+    | Hand Tracking Subsystem | For rendering the articulated hand joints |
+    | Mixed Reality Features | For general HoloLens and WMR support |
+    | Motion Controller Model | For rendering the motion controller models |
+
+    For standalone:
+
+    [![Standalone OpenXR](../images/standalone-openxr.png)](../images/standalone-openxr.png)
+
+    For UWP:
+
+    [![UWP OpenXR](../images/uwp-openxr.png)](../images/uwp-openxr.png)
+
+    > [!NOTE]
+    > You can enable additional features as needed, but in-scene support for them will come from other packages, like AR Foundation.
+
+1. For HoloLens 2, we recommend that you set **Depth Submission Mode** to 16-bit in the settings above.
+
+1. For immersive headsets, you can use 24-bit depth submission. See the [Microsoft development docs for Unity](https://learn.microsoft.com/windows/mixed-reality/develop/unity/recommended-settings-for-unity?tabs=openxr#enable-depth-buffer-sharing) for more info.
+
+1. A yellow warning icon or red error icon may appear during this process. Click that icon to open the **OpenXR Project Validation** tool. Select **Fix All** to address the issues. There may be several items to address. For more information about Windows App Capabilities, see [App capability declarations](https://learn.microsoft.com/windows/uwp/packaging/app-capability-declarations)
+
+## Using platform controller models
 
 > [!NOTE]
-> If starting from our [template project](../getting-started/setting-up/setup-template.md), these project settings should already be configured for you.
+> **Controller models** are stored in a format that is not natively supported by Unity. To use MRTK Controller Visualization on WMR, you will need to make sure you have the following package in your project:
+>
+> - [glTFast importer](https://github.com/atteneder/glTFast) which enables the use of glTF asset files in Unity and allows the use of MRTK Controller Visualization on WMR
+>
+> If you started with the MRTK3 template project, this package has already been included in the project.
+> If not, an MRTK project validation rule will help you import the package.
 
 ## Deploying to Device
 
-1. After you have the project configured, proceed to [Build the Unity Project](/windows/mixed-reality/develop/unity/build-and-deploy-to-hololens#build-the-unity-project).
+1. After you have the project configured, proceed to [Build the Unity Project](https://learn.microsoft.com/windows/mixed-reality/develop/unity/build-and-deploy-to-hololens#build-the-unity-project).
 
-1. Once built, you'll need to deploy the project through [Visual Studio](/windows/mixed-reality/develop/advanced-concepts/using-visual-studio?tabs=hl2).
+1. Once built, you'll need to deploy the project through [Visual Studio](https://learn.microsoft.com/windows/mixed-reality/develop/advanced-concepts/using-visual-studio?tabs=hl2).