Revert "Updated Capability window and Auto Configure window."

This reverts commit c374d34.

Author: StephenHodgson

Assets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureWindow.cs

@@ -61,7 +61,7 @@ private void SettingToggle(TSetting setting)
         /// </summary>
         protected virtual void Awake()
         {
-            wrapStyle = new GUIStyle("label") { wordWrap = true };
+            wrapStyle = new GUIStyle() { wordWrap = true };
         }
         protected virtual void OnEnable()
         {
@@ -112,7 +112,7 @@ protected virtual void OnGUI()
         /// <summary>
         /// Gets the descriptions of the settings.
         /// </summary>
-        protected Dictionary<TSetting, string> Descriptions
+        public Dictionary<TSetting, string> Descriptions
         {
             get
             {
@@ -128,7 +128,7 @@ protected Dictionary<TSetting, string> Descriptions
         /// <summary>
         /// Gets the names of the settings.
         /// </summary>
-        protected Dictionary<TSetting, string> Names
+        public Dictionary<TSetting, string> Names
         {
             get
             {
@@ -144,7 +144,7 @@ protected Dictionary<TSetting, string> Names
         /// <summary>
         /// Gets the values of the settings.
         /// </summary>
-        protected Dictionary<TSetting, bool> Values
+        public Dictionary<TSetting, bool> Values
         {
             get
             {
@@ -160,7 +160,7 @@ protected Dictionary<TSetting, bool> Values
         /// <summary>
         /// Gets or sets the status message displayed at the bottom of the window.
         /// </summary>
-        private string StatusMessage { get { return statusMessage; } set { statusMessage = value; } }
+        public string StatusMessage { get { return statusMessage; } set { statusMessage = value; } }
         #endregion // Public Properties
     }
 }

Assets/HoloToolkit/Utilities/Scripts/Editor/CapabilitySettingsWindow.cs

@@ -12,7 +12,6 @@ namespace HoloToolkit.Unity
     public class CapabilitySettingsWindow : AutoConfigureWindow<PlayerSettings.WSACapability>
     {
         #region Internal Methods
-
         private void ApplySetting(PlayerSettings.WSACapability setting)
         {
             PlayerSettings.WSA.SetCapability(setting, Values[setting]);
@@ -31,8 +30,6 @@ protected override void ApplySettings()
             ApplySetting(PlayerSettings.WSACapability.SpatialPerception);
             ApplySetting(PlayerSettings.WSACapability.WebCam);
             ApplySetting(PlayerSettings.WSACapability.InternetClient);
-            ApplySetting(PlayerSettings.WSACapability.InternetClientServer);
-            ApplySetting(PlayerSettings.WSACapability.PrivateNetworkClientServer);
         }
 
         protected override void LoadSettings()
@@ -41,8 +38,6 @@ protected override void LoadSettings()
             LoadSetting(PlayerSettings.WSACapability.SpatialPerception);
             LoadSetting(PlayerSettings.WSACapability.WebCam);
             LoadSetting(PlayerSettings.WSACapability.InternetClient);
-            LoadSetting(PlayerSettings.WSACapability.InternetClientServer);
-            LoadSetting(PlayerSettings.WSACapability.PrivateNetworkClientServer);
         }
 
         protected override void LoadStrings()
@@ -58,12 +53,6 @@ protected override void LoadStrings()
 
             Names[PlayerSettings.WSACapability.InternetClient] = "Internet Client";
             Descriptions[PlayerSettings.WSACapability.InternetClient] = "Required if your application needs to access the Internet.\n\nRecommendation: Leave unchecked unless your application uses online services.";
-
-            Names[PlayerSettings.WSACapability.InternetClientServer] = "Internet Client Server";
-            Descriptions[PlayerSettings.WSACapability.InternetClientServer] = "Required if your application uses the Sharing Services.";
-
-            Names[PlayerSettings.WSACapability.PrivateNetworkClientServer] = "Private Network Client Server";
-            Descriptions[PlayerSettings.WSACapability.PrivateNetworkClientServer] = "Required if your application uses the Sharing Services.";
         }
 
         protected override void OnEnable()
@@ -72,7 +61,7 @@ protected override void OnEnable()
             base.OnEnable();
 
             // Set size
-            minSize = new Vector2(350, 350);
+            minSize = new Vector2(350, 255);
             maxSize = minSize;
         }
         #endregion // Overrides / Event Handlers

Assets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs

@@ -21,16 +21,15 @@ public enum ProjectSetting
             BuildWsaUwp,
             WsaUwpBuildToD3D,
             WsaFastestQuality,
-            WsaEnableVR,
-            SharingServices
+            WsaEnableVR
         }
         #endregion // Nested Types
 
         #region Internal Methods
         /// <summary>
         /// Enables virtual reality for WSA and ensures HoloLens is in the supported SDKs.
         /// </summary>
-        private static void EnableVirtualReality()
+        private void EnableVirtualReality()
         {
             try
             {
@@ -78,7 +77,7 @@ private static void EnableVirtualReality()
                             }
                             else
                             {
-                                // The target VR settings were found but the others
+                                // The target VR settngs were found but the others
                                 // still need to be searched for.
                                 foundBuildTargetVRSettings = true;
                             }
@@ -120,12 +119,12 @@ private static void EnableVirtualReality()
                         // If this isn't an element in the device list
                         if (!line.Contains("-"))
                         {
-                            // add the HoloLens element, and mark it found
+                            // add the hololens element, and mark it found
                             builder.Append("    - HoloLens\n");
                             foundHoloLens = true;
                         }
 
-                        // Otherwise test if this is the HoloLens device
+                        // Otherwise test if this is the hololens device
                         else if (line.Contains("HoloLens"))
                         {
                             foundHoloLens = true;
@@ -156,7 +155,7 @@ private static void EnableVirtualReality()
         /// <summary>
         /// Modifies the WSA default quality setting to the fastest
         /// </summary>
-        private static void SetFastestDefaultQuality()
+        private void SetFastestDefaultQuality()
         {
             try
             {
@@ -180,44 +179,46 @@ private static void SetFastestDefaultQuality()
         #region Overrides / Event Handlers
         protected override void ApplySettings()
         {
+            // See the blow notes for why text asset serialization is required
+            if (EditorSettings.serializationMode != SerializationMode.ForceText)
+            {
+                // NOTE: PlayerSettings.virtualRealitySupported would be ideal, except that it only reports/affects whatever platform tab
+                // is currently selected in the Player settings window. As we don't have code control over what view is selected there
+                // this property is fairly useless from script.
+
+                // NOTE: There is no current way to change the default quality setting from script
+
+                string dialogTitle = "Updates require text serialization of assets";
+                string message = "Unity doesn't provide apis for updating the default quality or enabling VR support.\n\n" +
+                    "Is it ok if we force text serialization of assets so that we can modify the properties directly?";
+
+                bool forceText = EditorUtility.DisplayDialog(dialogTitle, message, "Yes", "No");
+                if (!forceText)
+                {
+                    return;
+                }
+
+                EditorSettings.serializationMode = SerializationMode.ForceText;
+            }
+
             // Apply individual settings
             if (Values[ProjectSetting.BuildWsaUwp])
             {
                 EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.WSA, BuildTarget.WSAPlayer);
             }
-
             if (Values[ProjectSetting.WsaUwpBuildToD3D])
             {
                 EditorUserBuildSettings.wsaUWPBuildType = WSAUWPBuildType.D3D;
             }
-
             if (Values[ProjectSetting.WsaFastestQuality])
             {
                 SetFastestDefaultQuality();
             }
-
             if (Values[ProjectSetting.WsaEnableVR])
             {
                 EnableVirtualReality();
             }
 
-            if (Values[ProjectSetting.SharingServices])
-            {
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.Microphone, true);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.InternetClient, true);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.SpatialPerception, true);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.InternetClientServer, true);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.PrivateNetworkClientServer, true);
-            }
-            else
-            {
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.Microphone, false);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.InternetClient, false);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.SpatialPerception, false);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.InternetClientServer, false);
-                PlayerSettings.WSA.SetCapability(PlayerSettings.WSACapability.PrivateNetworkClientServer, false);
-            }
-
             // Since we went behind Unity's back to tweak some settings we 
             // need to reload the project to have them take effect
             bool canReload = EditorUtility.DisplayDialog(
@@ -234,7 +235,7 @@ protected override void ApplySettings()
 
         protected override void LoadSettings()
         {
-            for (int i = (int)ProjectSetting.BuildWsaUwp; i <= (int)ProjectSetting.SharingServices; i++)
+            for (int i = (int)ProjectSetting.BuildWsaUwp; i <= (int)ProjectSetting.WsaEnableVR; i++)
             {
                 Values[(ProjectSetting)i] = true;
             }
@@ -253,11 +254,6 @@ protected override void LoadStrings()
 
             Names[ProjectSetting.WsaEnableVR] = "Enable VR";
             Descriptions[ProjectSetting.WsaEnableVR] = "Required\n\nEnables VR for Windows Store apps and adds the HoloLens as a target VR device.\n\nThe application will not compile for HoloLens and tools like Holographic Remoting will not function without this enabled. Therefore this option should remain checked unless you plan to manually perform these steps later.";
-
-            Names[ProjectSetting.SharingServices] = "Enable Sharing Services";
-            Descriptions[ProjectSetting.SharingServices] = "Enables the use of the Sharing Services in your project.\n\n" +
-                "Requires the SpatialPerception, InternetClient, InternetClientServer, PrivateNetworkClientServer, and Microphone Capabilities.\n\n" +
-                "Start the Sharing Server though HoloToolkit->Sharing Service->Launch Sharing Service.";
         }
 
         protected override void OnEnable()
@@ -266,7 +262,7 @@ protected override void OnEnable()
             base.OnEnable();
 
             // Set size
-            minSize = new Vector2(350, 350);
+            minSize = new Vector2(350, 260);
             maxSize = minSize;
         }
         #endregion // Overrides / Event Handlers