Skip to content

Commit 23775f9

Browse files
author
lawwong
committed
Add compatable script for Unity 2018.1
1 parent 0e17efd commit 23775f9

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUVersionCheck.cs

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,6 @@ private static void InitializeSettins()
249249
recommendedValue = true,
250250
});
251251

252-
s_settings.Add(new RecommendedSetting<bool>()
253-
{
254-
settingTitle = "Default Is Fullscreen",
255-
skipCheckFunc = () => VRModule.isSteamVRPluginDetected || VIUSettingsEditor.activeBuildTargetGroup != BuildTargetGroup.Standalone,
256-
currentValueFunc = () => PlayerSettings.defaultIsFullScreen,
257-
setValueFunc = v => PlayerSettings.defaultIsFullScreen = v,
258-
recommendedValue = false,
259-
});
260-
261252
s_settings.Add(new RecommendedSetting<Vector2>()
262253
{
263254
settingTitle = "Default Screen Size",
@@ -294,6 +285,16 @@ private static void InitializeSettins()
294285
recommendedValue = true,
295286
});
296287

288+
#if !UNITY_2018_1_OR_NEWER
289+
s_settings.Add(new RecommendedSetting<bool>()
290+
{
291+
settingTitle = "Default Is Fullscreen",
292+
skipCheckFunc = () => VRModule.isSteamVRPluginDetected || VIUSettingsEditor.activeBuildTargetGroup != BuildTargetGroup.Standalone,
293+
currentValueFunc = () => PlayerSettings.defaultIsFullScreen,
294+
setValueFunc = v => PlayerSettings.defaultIsFullScreen = v,
295+
recommendedValue = false,
296+
});
297+
297298
s_settings.Add(new RecommendedSetting<D3D11FullscreenMode>()
298299
{
299300
settingTitle = "D3D11 Fullscreen Mode",
@@ -302,6 +303,16 @@ private static void InitializeSettins()
302303
setValueFunc = v => PlayerSettings.d3d11FullscreenMode = v,
303304
recommendedValue = D3D11FullscreenMode.FullscreenWindow,
304305
});
306+
#else
307+
s_settings.Add(new RecommendedSetting<FullScreenMode>()
308+
{
309+
settingTitle = "Fullscreen Mode",
310+
skipCheckFunc = () => VRModule.isSteamVRPluginDetected || VIUSettingsEditor.activeBuildTargetGroup != BuildTargetGroup.Standalone,
311+
currentValueFunc = () => PlayerSettings.fullScreenMode,
312+
setValueFunc = v => PlayerSettings.fullScreenMode = v,
313+
recommendedValue = FullScreenMode.FullScreenWindow,
314+
});
315+
#endif
305316

306317
s_settings.Add(new RecommendedSetting<bool>()
307318
{

0 commit comments

Comments
 (0)