Merge pull request #1525 from StephenHodgson/MRTK-Update

Updated Unity Editor Version to 2017.2.1f1

Author: keveleigh

Assets/HoloToolkit/Input/Scripts/Utilities/Managers/MixedRealityCameraManager.cs

@@ -3,12 +3,8 @@
 
 using UnityEngine;
 
-#if UNITY_WSA
-#if UNITY_2017_2_OR_NEWER
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
 using UnityEngine.XR.WSA;
-#else
-using UnityEngine.VR.WSA;
-#endif
 #endif
 
 namespace HoloToolkit.Unity.InputModule
@@ -62,29 +58,29 @@ public enum DisplayType
 
         private void Start()
         {
-            if (!Application.isEditor)
-            {
+            CurrentDisplayType = DisplayType.Opaque;
+
 #if UNITY_WSA
 #if UNITY_2017_2_OR_NEWER
             if (!HolographicSettings.IsDisplayOpaque)
 #endif
-                {
-                    CurrentDisplayType = DisplayType.Transparent;
-                    ApplySettingsForTransparentDisplay();
-                    if (OnDisplayDetected != null)
-                    {
-                        OnDisplayDetected(DisplayType.Transparent);
-                    }
-                    return;
-                }
+            {
+                CurrentDisplayType = DisplayType.Transparent;
+            }
 #endif
+
+            if (CurrentDisplayType == DisplayType.Opaque)
+            {
+                ApplySettingsForOpaqueDisplay();
+            }
+            else
+            {
+                ApplySettingsForTransparentDisplay();
             }
 
-            CurrentDisplayType = DisplayType.Opaque;
-            ApplySettingsForOpaqueDisplay();
             if (OnDisplayDetected != null)
             {
-                OnDisplayDetected(DisplayType.Opaque);
+                OnDisplayDetected(CurrentDisplayType);
             }
         }
 

GettingStarted.md

@@ -34,8 +34,8 @@ You can install more components and UWP SDK's as you wish.
 
 Make sure you are running the appropriate version of Unity 3D on your machine. You should [download and install the latest version](https://unity3d.com/get-unity/download/archive) this project says it supports on the [main readme page](/README.md).
 
-[unity-release]:             http://beta.unity3d.com/download/a07ad30bae31/download.html
-[unity-version-badge]:       https://img.shields.io/badge/Latest%20Mixed%20Reality%20Technical%20Preview-2017.2.0p2%20MRTP5-green.svg
+[unity-release]:             https://unity3d.com/unity/whats-new/unity-2017.2.1
+[unity-version-badge]:       https://img.shields.io/badge/Unity%20Editor-2017.2.1f1-green.svg
 
 > The Mixed Reality Toolkit now recommends the following Unity 3D version:
 > [![Github Release][unity-version-badge]][unity-release] 

ProjectSettings/ProjectSettings.asset

@@ -103,6 +103,8 @@ PlayerSettings:
   n3dsEnableVSync: 0
   ignoreAlphaClear: 0
   xboxOneResolution: 0
+  xboxOneSResolution: 0
+  xboxOneXResolution: 3
   xboxOneMonoLoggingLevel: 0
   xboxOneLoggingLevel: 1
   xboxOneDisableEsram: 0
@@ -125,7 +127,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.0
+  bundleVersion: 2017.2.1.0
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 0
@@ -151,7 +153,7 @@ PlayerSettings:
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Android: com.Company.ProductName
-    Standalone: unity.DefaultCompany.HoloToolkit-Unity
+    Standalone: Microsoft.HoloToolkit-Unity
     Tizen: com.Company.ProductName
     iOS: com.Company.ProductName
     tvOS: com.Company.ProductName
@@ -617,7 +619,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: MixedRealityToolkit-Unity
-  metroPackageVersion: 1.2017.2.0
+  metroPackageVersion: 2017.2.1.0
   metroCertificatePath: Assets/WSATestCertificate.pfx
   metroCertificatePassword: 
   metroCertificateSubject: Microsoft

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.2.0p2-MRTP5
+m_EditorVersion: 2017.2.1f1

README.md

@@ -19,8 +19,8 @@ _Note: The latest release should work for both HoloLens and Windows Mixed Realit
 [mrtk-version-badge]:            https://img.shields.io/github/tag/microsoft/MixedRealityToolkit-unity.svg?label=Latest%20Master%20Branch%20Release&colorB=9acd32
 [![Github Release][mrtk-version-badge]][github-rel]
 
-[unity-download]:                 http://beta.unity3d.com/download/a07ad30bae31/download.html
-[unity-version-badge]:            https://img.shields.io/badge/Current%20Unity%20Editor%20Version-2017.2.0p2%20MRTP5-green.svg
+[unity-download]:                 https://unity3d.com/unity/whats-new/unity-2017.2.1
+[unity-version-badge]:            https://img.shields.io/badge/Current%20Unity%20Editor%20Version-2017.2.1f1-green.svg
 [![Github Release][unity-version-badge]][unity-download]
 
 > Check out the updates from the [Fall Creators update](/FallCreatorsUpdate.md) for Windows Mixed Reality.