Skip to content
This repository was archived by the owner on Jun 14, 2024. It is now read-only.

Commit bbaeeac

Browse files
Merge pull request #290 from chrisfromwork/documentationFixes
Improve documentation for release/1.1.0
2 parents b80d0cd + 4b8bdbb commit bbaeeac

17 files changed

+136
-42
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
Spectator View is an augmented reality product that enables viewing HoloLens experiences from secondary devices. Spectator View has multiple configurations and supports a variety of scenarios from filming quick prototypes to producing keynote demos.
44

5-
## Getting Started
5+
## Samples
6+
7+
The Spectator View repository contains multiple sample projects. **The instructions for building and running samples will differ from instructions for adding the Spectator View codebase to your own project.** To see how to set up samples go [here](samples/README.md). To add Spectator View to your own project, see below.
8+
9+
## Getting started with your own project
610

711
### Obtaining the code
812

@@ -49,13 +53,9 @@ Depending on what release you are using the correct setup script may vary. Choos
4953

5054
![Marker](doc/images/SetupRepo.png)
5155

52-
### Samples
53-
54-
After going through the setup steps in 'Obtaining the code' and 'Setting up your local environment', sample projects will be configured for use in your clone of the MixedReality-SpectatorView repository. It's easy to get started by building off one of the samples or by inspecting them to understand project setup. For more information, see [Samples](samples/README.md).
55-
5656
### Adding references to your own project
5757

58-
After obtaining a local clone of the MixedReality-SpectatorView repository and resolving its external dependencies (see above), the suggested mechanism for referencing the code is by adding symbolic linked directories to your Unity project's Assets folder. You can do this with the following:
58+
After setting up a submodule for the MixedReality-SpectatorView repository and resolving its external dependencies (see above), the suggested mechanism for referencing the code is by adding symbolic linked directories to your Unity project's Assets folder. You can do this with the following:
5959

6060
> Note: Symbolic linked directories should be setup as relative paths. Using relative paths should allow directories to resolve correctly regardless of where you or your team members clone your project repository in their local file systems. The instructions below demonstrate setting up symbolic linked directories based on the following paths:
6161
>* **Project repository directory:** c:\Your\Unity\Project

doc/SpectatorView.Architecture.md

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

2121
### 2. Spectating with a video camera rig
2222

23-
1. A HoloLens is mounted to the video camera. [Calibration](SpectatorView.Setup.VideoCamera.md) is then performed to calculate camera intrinsics (Properties such as lens focal length and principal points that are needed for compositing holograms into the video camera feed) and camera extrinsics (The transform of the video camera to the mounted HoloLens). This data is stored on this HoloLens mounted to the video camera.
23+
1. A HoloLens is mounted to the video camera. [Calibration](SpectatorView.Setup.VideoCamera.md#calibration) is then performed to calculate camera intrinsics (Properties such as lens focal length and principal points that are needed for compositing holograms into the video camera feed) and camera extrinsics (The transform of the video camera to the mounted HoloLens). This data is stored on this HoloLens mounted to the video camera.
2424
2. The PC obtains a video camera stream through a capture card.
2525
3. The PC connects to sockets open on both the user HoloLens and video camera rig HoloLens through the unity editor.
2626
4. The PC obtains camera intrinsic and extrinsic information from the DSLR mounted HoloLens and updates its unity camera to reflect these values.

doc/SpectatorView.Setup.VideoCamera.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Documentation below highlights the process of setting up a Video Camera filming
2929

3030
Video camera filming relies on a physically mounted HoloLens 2 device generating position and orientation information for your video camera in the shared application space. This allows the Unity editor to understand where the video frame was filmed from in order to generate and composite Holograms into the feed. To get accurate tracking of your video camera in the physical world, you need to calculate the physical transform between the HoloLens 2 device and the video camera sensor. This is achieved through calibration.
3131

32-
The below instructions assume that you have already gone through the repository setup instructions [here](../README.md) to obtain and reference the Spectator View codebase.
32+
The below instructions assume that you have already gone through the repository setup instructions [here](../README.md#getting-started-with-your-own-project) to obtain and reference the Spectator View codebase.
3333

3434
## Setup
3535

doc/SpectatorView.Setup.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ To setup spectator view with a video camera, see [here](SpectatorView.Setup.Vide
3939
4040
# Preparing your project
4141

42-
To use the Spectator View codebase, its suggested to clone and reference the MixedReality-SpectatorView repository through symbolic linked directories in your Unity project. Before beginning on the steps below, go through the repository setup process [here](../README.md). This will ensure that the Unity editor components referenced below exist in your project.
42+
To use the Spectator View codebase, its suggested to clone and reference the MixedReality-SpectatorView repository through symbolic linked directories in your Unity project. Before beginning on the steps below, go through the repository setup process [here](../README.md#getting-started-with-your-own-project). This will ensure that the Unity editor components referenced below exist in your project.
4343

4444
## Spatial Alignment Strategy Dependencies
4545

46-
Spectator View requires multiple devices understanding a shared application origin in the physical world. In order to establish this shared application origin, you will need to choose and use a spatial alignment strategy. Different dependencies are needed for different strategies. For more information on spatial alignment strategies, see [here](../src/SpectatorView.Unity/Assets/SpatialAlignment/README.md).
46+
Spectator View requires multiple devices understanding a shared application origin in the physical world. In order to establish this shared application origin, you will need to choose and use a [spatial alignment strategy](../src/SpectatorView.Unity/Assets/SpatialAlignment/README.md#detailed-breakdown-of-spatial-alignment-strategies). You will only need to go through one setup process below for the spatial alignment strategy you choose.
4747

4848
Not all spatial alignment strategies support all platforms. See the chart below to determine which strategy best addresses your intended user scenarios.
4949

@@ -122,7 +122,7 @@ If you are building Azure Spatial Anchors on iOS, you will need to take some add
122122

123123
> Note: **Asset Caches need to be updated on one development machine and shared across development machines**. Asset Caches aren't currently created in a deterministic manner and can't be recreated in new development environments. The easiest way to share this with a team is to commit changes to the Generated.StateSynchronization.AssetCaches folder that will appear in the Unity project's Assets directory. For more information on Asset Caches see [SpectatorView.StateSynchronization](../src/SpectatorView.Unity/Assets/SpectatorView/Scripts/StateSynchronization/README.md).
124124
125-
### HoloLens 2 & HoloLens
125+
### HoloLens 2 & HoloLens as the Host/User
126126

127127
1. Make sure your Unity project contains the asset caches that were created in the 'Before building' steps.
128128
2. Open the project scene that you intend to use with SpectatorView. (**Note:** For spectating with a HoloLens device, use `SpectatorView.HoloLens.Spectator` scene.)
@@ -136,6 +136,14 @@ If you are building Azure Spatial Anchors on iOS, you will need to take some add
136136
5. Press the 'HoloLens' button on the `Platform Switcher` attached to `Spectator View` in the Unity inspector (This should configure the correct build settings and app capabilities).
137137
6. Build and deploy the application to your HoloLens device.
138138

139+
### HoloLens 2 & HoloLens as a Spectator
140+
141+
1. Make sure your Unity project contains the asset caches that were created in the 'Before building' steps.
142+
2. Open the `SpectatorView.HoloLens.Spectator` Unity scene.
143+
3. Press the 'HoloLens' button on the `Platform Switcher` attached to `Spectator View` in the Unity inspector (This should configure the correct build settings and app capabilities).
144+
4. Declare the `SpectatorView.HoloLens.Spectator` as the scene included in your Unity Build settings.
145+
5. Build and deploy the application to your HoloLens device.
146+
139147
### Android
140148

141149
1. Make sure your Unity project contains the asset caches that were created in the 'Before building' steps.
@@ -147,9 +155,12 @@ If you are building Azure Spatial Anchors on iOS, you will need to take some add
147155
148156
5. Make sure to declare the SpectatorView.Android scene as the scene included. If SpectatorView.Android does not exist in your list of scenes to choose from in the build settings, open the scene in the Unity editor. Then reopen the build settings and press 'Add Open Scenes'.
149157

150-
![Marker](images/AndroidSceneSelection.png)
158+
![Marker](images/AndroidSpectatorViewExampleBuildSettings.png)
159+
160+
6. `Build and Run` the application through Unity's Build Settings. If you're targeting a new Android development device, you may need to enable developer options and debugging. For information on setting up your Android device for debugging, see [here](https://developer.android.com/studio/debug/dev-options).
151161

152-
6. Build and deploy the application. If you're targeting a new Android development device, you may need to enable developer options and debugging. For information on setting up your Android device for debugging, see [here](https://developer.android.com/studio/debug/dev-options).
162+
> Note: You may need to the `Run Device` dropdown to find your desired Android device.
163+
> ![Marker](images/AndroidDeviceSelectorBuildSettings.png)
153164
154165
### iOS
155166

142 KB
Loading
174 KB
Loading
159 KB
Loading
150 KB
Loading
165 KB
Loading
117 KB
Loading

0 commit comments

Comments
 (0)