Skip to content

Commit 70f3f1b

Browse files
StephenHodgsonStephen Hodgson
authored andcommitted
updates Project Settings Window
1 parent 3be0532 commit 70f3f1b

File tree

1 file changed

+10
-53
lines changed

1 file changed

+10
-53
lines changed

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

Lines changed: 10 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected override void ApplySettings()
5555
}
5656
else
5757
{
58-
EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows);
58+
EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);
5959
}
6060
}
6161

@@ -102,11 +102,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
102102
{
103103
using (var webRequest = UnityWebRequest.Get(SharingServiceURL))
104104
{
105-
#if UNITY_2017_2_OR_NEWER
106-
webRequest.SendWebRequest();
107-
#else
108105
webRequest.Send();
109-
#endif
110106

111107
while (!webRequest.isDone)
112108
{
@@ -153,7 +149,6 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
153149

154150
var inputManagerPath = Directory.GetParent(Path.GetFullPath(Application.dataPath)).FullName + "\\ProjectSettings\\InputManager.asset";
155151
bool userPermission = Values[ProjectSetting.XboxControllerSupport];
156-
bool previouslySupported = userPermission;
157152

158153
if (userPermission)
159154
{
@@ -167,11 +162,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
167162
{
168163
using (var webRequest = UnityWebRequest.Get(InputManagerAssetURL))
169164
{
170-
#if UNITY_2017_2_OR_NEWER
171-
webRequest.SendWebRequest();
172-
#else
173165
webRequest.Send();
174-
#endif
175166

176167
while (!webRequest.isDone)
177168
{
@@ -210,7 +201,7 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
210201
File.Delete(inputManagerPath + ".old");
211202
Debug.Log("Previous Input Mapping Restored.");
212203
}
213-
else if (previouslySupported)
204+
else
214205
{
215206
Debug.LogWarning("No old Input Mapping found!");
216207
}
@@ -290,44 +281,10 @@ private void UpdateSettings(BuildTarget currentBuildTarget)
290281

291282
EditorPrefsUtility.SetEditorPref(Names[ProjectSetting.TargetOccludedDevices], Values[ProjectSetting.TargetOccludedDevices]);
292283

293-
if (BuildDeployTools.Il2CppAvailable() || BuildDeployTools.DotNetAvailable())
294-
{
295-
296-
if (Values[ProjectSetting.DotNetScriptingBackend])
297-
{
298-
if (!BuildDeployTools.DotNetAvailable())
299-
{
300-
Values[ProjectSetting.DotNetScriptingBackend] = false;
301-
EditorUtility.DisplayDialog("Attention!",
302-
"Hi there, we noticed that you've enabled the .Net scripting backend, but you haven't installed the required Module.\n\n" +
303-
"You'll need to use the Unity Installer to get the module for your version of the Editor.\n\n",
304-
"OK");
305-
}
306-
}
307-
else
308-
{
309-
if (!BuildDeployTools.Il2CppAvailable())
310-
{
311-
Values[ProjectSetting.DotNetScriptingBackend] = true;
312-
EditorUtility.DisplayDialog("Attention!",
313-
"Hi there, we noticed that you've enabled the il2cpp scripting backend, but you haven't installed the required Module.\n\n" +
314-
"You'll need to use the Unity Installer to get the module for your version of the Editor.\n\n",
315-
"OK");
316-
}
317-
}
318-
319-
PlayerSettings.SetScriptingBackend(BuildTargetGroup.WSA,
320-
Values[ProjectSetting.DotNetScriptingBackend]
321-
? ScriptingImplementation.WinRTDotNET
322-
: ScriptingImplementation.IL2CPP);
323-
}
324-
else
325-
{
326-
EditorUtility.DisplayDialog("Attention!",
327-
"Hi there, we noticed that you haven't installed the required modules for Mixed Reality Applications.\n\n" +
328-
"You'll need to use the Unity Installer to get the modules for your version of the Editor.\n\n",
329-
"OK");
330-
}
284+
PlayerSettings.SetScriptingBackend(BuildTargetGroup.WSA,
285+
Values[ProjectSetting.DotNetScriptingBackend]
286+
? ScriptingImplementation.WinRTDotNET
287+
: ScriptingImplementation.IL2CPP);
331288

332289
AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
333290
Close();
@@ -339,12 +296,12 @@ protected override void OnGuiChanged()
339296

340297
protected override void LoadStrings()
341298
{
342-
Names[ProjectSetting.BuildWsaUwp] = "Target Universal Windows Platform";
299+
Names[ProjectSetting.BuildWsaUwp] = "Target Windows Universal UWP";
343300
Descriptions[ProjectSetting.BuildWsaUwp] =
344301
"<b>Required</b>\n\n" +
345-
"Switches the currently active target to produce a Universal Windows Platform application.\n\n" +
346-
"<color=#ffff00ff><b>Note:</b></color> Cross platform development can be done with this toolkit, but many tools and" +
347-
"features will not work if the build target is a different platform.";
302+
"Switches the currently active target to produce a Store app targeting the Universal Windows Platform.\n\n" +
303+
"<color=#ffff00ff><b>Note:</b></color> Cross platform development can be done with this toolkit, but many features and" +
304+
"tools will not work if the build target is not Windows Universal.";
348305

349306
Names[ProjectSetting.WsaEnableXR] = "Enable XR";
350307
Descriptions[ProjectSetting.WsaEnableXR] =

0 commit comments

Comments
 (0)