Skip to content

Commit

Permalink
+ Versioning for spectator view releases.
Browse files Browse the repository at this point in the history
+ Add UnityPackage for a minimum subset of the 1.5.5.0 release of the HoloToolkit.
+ Add zip for a minimum subset of the 1.5.5.0 external sharing exe's.
+ Add UnityPackage for a 1.5.5.0 compatible spectator view addon.
+ Update CopyDLL to copy a gitignore for the copied dlls and pdbs.
+ Update CopyDLL to work for Unity projects with spaces.
+ Update documentation to include backwards compatibility UnityPackages.
+ Update documentation to include an alternative method of mounting the HoloLens to your camera.
  • Loading branch information
fieldsJacksonG committed Feb 23, 2017
1 parent 588c6b8 commit 8573acf
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 5 deletions.
11 changes: 11 additions & 0 deletions SpectatorView/Compositor/PluginGitIgnore/.gitignore
@@ -0,0 +1,11 @@
# dlls
WSA/x64/*.dll
WSA/x64/*.pdb
WSA/x86/*.dll
WSA/x86/*.pdb

x64/*.dll
x64/*.pdb

x86/*.dll
x86/*.pdb
13 changes: 11 additions & 2 deletions SpectatorView/CopyDLL.cmd
Expand Up @@ -14,7 +14,7 @@ Setlocal EnableDelayedExpansion

set /a returnValue=0

if [%~1] NEQ [] (
if "%~1" NEQ "" (
call :CopyDLL "%~1"
)

Expand Down Expand Up @@ -46,7 +46,7 @@ ECHO.
ECHO ===================================================
ECHO Copy DLL's to %~1

IF EXIST %~1\Addons\HolographicCameraRig (
IF EXIST "%~1\Addons\HolographicCameraRig" (
REM Copy UnityCompositorInterface
ECHO.
ECHO Copy UnityCompositorInterface files:
Expand Down Expand Up @@ -118,6 +118,15 @@ IF EXIST %~1\Addons\HolographicCameraRig (
copy /y "%~dp0\Compositor\x64\Release\OpenCV*.dll" "%~1\Addons\HolographicCameraRig\Plugins\x64\"
if !ERRORLEVEL! NEQ 0 ( set /a returnValue += 1 )


REM Copy GitIgnore
ECHO.
ECHO ---------------------------------------------------
ECHO Copy GitIgnore:
copy /y "%~dp0\Compositor\PluginGitIgnore\*" "%~1\Addons\HolographicCameraRig\Plugins\"
if !ERRORLEVEL! NEQ 0 ( set /a returnValue += 1 )


) ELSE (
ECHO.
ECHO "%~1\Addons\HolographicCameraRig" does not exist.
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions SpectatorView/README.md
Expand Up @@ -141,6 +141,33 @@ This section assumes you are using the included HoloLens bracket. Alternative m
+ Attach the bracket with 4 1/4" nuts and bolts using the 7/16 nut driver.


## Alternate Spectator View Rig Setup
The spectator view rig assembly can be made without any custom hardware.

![Alternate Assembly](./DocumentationImages/alternate_mount.png)

### Material List
+ [1 Hotshoe Fastener](https://www.amazon.com/gp/product/B00HPAPFNU/ref=oh_aui_detailpage_o03_s01?ie=UTF8&psc=1)
+ [1 Dual Flash Bracket](https://www.amazon.com/gp/product/B01LZKI0BQ/ref=oh_aui_detailpage_o03_s01?ie=UTF8&psc=1)
+ [1 Washer](https://www.amazon.com/gp/product/B009OJIH7G/ref=oh_aui_search_detailpage?ie=UTF8&psc=1)
+ [2 Clamps](https://www.amazon.com/gp/product/B012ZYK3FA/ref=oh_aui_detailpage_o02_s01?ie=UTF8&psc=1)
+ [2 6/32 Bolts](https://www.amazon.com/gp/product/B00HYK8O84/ref=oh_aui_detailpage_o00_s00?ie=UTF8&psc=1)
+ [2 6/32 Nuts](https://www.amazon.com/gp/product/B00HYK8MPO/ref=oh_aui_detailpage_o00_s00?ie=UTF8&psc=1)
+ Cardboard or stiff foam

### Assembly
+ Attach the hotshoe fastener to the camera's hotshoe using one of the included nuts.
+ Place a washer on the hotshoe fastener above the nut.
+ Attach the dual flash bracket to the hotshoe fastener.
+ The washer should guarantee that the bracket is perpendicular to the lens.
+ Remove the included thumbscrews from the dual flash bracket.
+ Attach the clamps to each side of the dual flash bracket with the 6/32 nuts and bolts.
+ Ensure the arms of the HoloLens will be able to fit in the clamps with the visor centered on the camera's lens.
+ Place each HoloLens arm in the open clamps.
+ Place some cardboard or stiff foam in between the headband and the arms to act as a buffer against the clamp's tension.
+ Without overtightening, tighten the clamps to keep the HoloLens in place.


## Recommended PC Specs
Any PC that can run the HoloLens emulator can run spectator view.

Expand Down Expand Up @@ -168,6 +195,23 @@ Any PC that can run the HoloLens emulator can run spectator view.
Each capture card has required software dependencies including runtimes and SDK's. See the **Software** section above.


## Adding Spectator View Support to Your Unity App
+ If your application does not use the HoloToolkit, you must first **add the HoloToolkit**.
+ This can be done from the UnityPackage directory for a minimum set of the HoloToolkit for spectator view compatibility.
+ Find the largest number subdirectory for the latest official release.
+ Import the **HoloToolkit_Min_%number%.unitypackage**
+ Import the **SpectatorView_%number%.unitypackage** to add the spectator view code to your project.
+ Unzip the **External_%number%.zip** archive adjacent to your project's Assets directory.
+ Ensure the unzipped directory is titled "External" and does not have another "External" subdirectory.
+ Add the **"Addons\HolographicCameraRig\Prefabs\SpectatorViewManager"** prefab to your Hierarchy.
+ Build **"Compositor\Compositor.sln"** and run **CopyDLL.cmd** with the Assets directory of your project as the only parameter.
+ For more information and build configuration options, read the [compositor README](Compositor/README.md).
+ For more information, read the [sample README](Samples/README.md).


**NOTE:** You can alternatively use the latest HoloToolkit from the [github repository](https://github.com/Microsoft/HoloToolkit-Unity) - The sample project is kept up to date with breaking changes before official drops are made, but this code is constantly changing so additional work may be required to ensure compatibility. If you are using this HoloToolkit, you can use the spectator view UnityPackage in "UnityPackage\HoloToolkit_master".


##Documentation
+ **Overview**
+ [Calibration](Calibration/README.md)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 11 additions & 0 deletions SpectatorView/UnityPackage/HoloToolkit_master/README.md
@@ -0,0 +1,11 @@
# README

This UnityPackage will pull in the SpectatorView specific addon files for your application using the latest HoloToolkit.

You will also need to add the latest HoloToolkit master branch for: Sharing (including the External directory) and Spatial Mapping.

This can be found here:
https://github.com/Microsoft/HoloToolkit-Unity


**NOTE:** The latest HoloToolkit is constantly changing, so consider using one of the numbered releases in the UnityPackage directory.
7 changes: 4 additions & 3 deletions SpectatorView/UnityPackage/README.md
@@ -1,6 +1,7 @@
# README

This UnityPackage will pull in the SpectatorView specific addon files for your application. You will also need the latest HoloToolkit for Sharing (including the External directory) and Spatial Mapping.
These UnityPackages will import the spectator view code.

This can be found here:
https://github.com/Microsoft/HoloToolkit-Unity
If using a numbered release, there will also be a UnityPackage for the archived minimum set of the HoloToolkit, and the matching External directory.

If using the latest HoloToolkit_master code, you will need to import the HoloToolkit from the master branch [here](https://github.com/Microsoft/HoloToolkit-Unity).

0 comments on commit 8573acf

Please sign in to comment.