removal of old XboxOneStuff
This commit is contained in:
@@ -1 +1,4 @@
|
||||
#pragma once
|
||||
|
||||
#define COMPILE_WITH_DEV_ENV 0
|
||||
#define OFFICIAL_BUILD 1
|
||||
|
||||
@@ -49,12 +49,14 @@ IMPLEMENT_SETTINGS_GETTER(StreamingSettings, Streaming);
|
||||
#if !USE_EDITOR
|
||||
#if PLATFORM_WINDOWS
|
||||
IMPLEMENT_SETTINGS_GETTER(WindowsPlatformSettings, WindowsPlatform);
|
||||
#elif PLATFORM_UWP || PLATFORM_XBOX_ONE
|
||||
#elif PLATFORM_UWP
|
||||
IMPLEMENT_SETTINGS_GETTER(UWPPlatformSettings, UWPPlatform);
|
||||
#elif PLATFORM_LINUX
|
||||
IMPLEMENT_SETTINGS_GETTER(LinuxPlatformSettings, LinuxPlatform);
|
||||
#elif PLATFORM_PS4
|
||||
IMPLEMENT_SETTINGS_GETTER(PS4PlatformSettings, PS4Platform);
|
||||
#elif PLATFORM_XBOX_ONE
|
||||
IMPLEMENT_SETTINGS_GETTER(XboxOnePlatformSettings, XboxOnePlatform);
|
||||
#elif PLATFORM_XBOX_SCARLETT
|
||||
IMPLEMENT_SETTINGS_GETTER(XboxScarlettPlatformSettings, XboxScarlettPlatform);
|
||||
#elif PLATFORM_ANDROID
|
||||
@@ -217,6 +219,7 @@ void GameSettings::Deserialize(DeserializeStream& stream, ISerializeModifier* mo
|
||||
DESERIALIZE(UWPPlatform);
|
||||
DESERIALIZE(LinuxPlatform);
|
||||
DESERIALIZE(PS4Platform);
|
||||
DESERIALIZE(XboxOnePlatform);
|
||||
DESERIALIZE(XboxScarlettPlatform);
|
||||
DESERIALIZE(AndroidPlatform);
|
||||
DESERIALIZE(SwitchPlatform);
|
||||
|
||||
@@ -10,6 +10,7 @@ namespace FlaxEditor.Content.Settings
|
||||
partial class GameSettings
|
||||
{
|
||||
internal const string PS4PlatformSettingsTypename = "FlaxEditor.Content.Settings.PS4PlatformSettings";
|
||||
internal const string XboxOnePlatformSettingsTypename = "FlaxEditor.Content.Settings.XboxOnePlatformSettings";
|
||||
internal const string XboxScarlettPlatformSettingsTypename = "FlaxEditor.Content.Settings.XboxScarlettPlatformSettings";
|
||||
internal const string SwitchPlatformSettingsTypename = "FlaxEditor.Content.Settings.SwitchPlatformSettings";
|
||||
|
||||
@@ -111,7 +112,7 @@ namespace FlaxEditor.Content.Settings
|
||||
public JsonAsset WindowsPlatform;
|
||||
#endif
|
||||
|
||||
#if FLAX_EDITOR || PLATFORM_UWP || PLATFORM_XBOX_ONE
|
||||
#if FLAX_EDITOR || PLATFORM_UWP
|
||||
/// <summary>
|
||||
/// Reference to <see cref="UWPPlatformSettings"/> asset. Used to apply configuration on Universal Windows Platform.
|
||||
/// </summary>
|
||||
@@ -135,6 +136,14 @@ namespace FlaxEditor.Content.Settings
|
||||
public JsonAsset PS4Platform;
|
||||
#endif
|
||||
|
||||
#if FLAX_EDITOR || PLATFORM_XBOX_ONE
|
||||
/// <summary>
|
||||
/// Reference to Xbox One Platform Settings asset. Used to apply configuration on Xbox ScOnearlett platform.
|
||||
/// </summary>
|
||||
[EditorOrder(2050), EditorDisplay("Platform Settings", "Xbox One"), AssetReference(XboxOnePlatformSettingsTypename, true), Tooltip("Reference to Xbox One Platform Settings asset")]
|
||||
public JsonAsset XboxOnePlatform;
|
||||
#endif
|
||||
|
||||
#if FLAX_EDITOR || PLATFORM_XBOX_SCARLETT
|
||||
/// <summary>
|
||||
/// Reference to Xbox Scarlett Platform Settings asset. Used to apply configuration on Xbox Scarlett platform.
|
||||
@@ -245,7 +254,7 @@ namespace FlaxEditor.Content.Settings
|
||||
if (type == typeof(WindowsPlatformSettings))
|
||||
return LoadAsset<WindowsPlatformSettings>(gameSettings.WindowsPlatform) as T;
|
||||
#endif
|
||||
#if FLAX_EDITOR || PLATFORM_UWP || PLATFORM_XBOX_ONE
|
||||
#if FLAX_EDITOR || PLATFORM_UWP
|
||||
if (type == typeof(UWPPlatformSettings))
|
||||
return LoadAsset<UWPPlatformSettings>(gameSettings.UWPPlatform) as T;
|
||||
#endif
|
||||
@@ -257,6 +266,10 @@ namespace FlaxEditor.Content.Settings
|
||||
if (type.FullName == PS4PlatformSettingsTypename)
|
||||
return LoadAsset(gameSettings.PS4Platform, PS4PlatformSettingsTypename) as T;
|
||||
#endif
|
||||
#if FLAX_EDITOR || PLATFORM_XBOX_ONE
|
||||
if (type.FullName == XboxOnePlatformSettingsTypename)
|
||||
return LoadAsset(gameSettings.XboxOnePlatform, XboxOnePlatformSettingsTypename) as T;
|
||||
#endif
|
||||
#if FLAX_EDITOR || PLATFORM_XBOX_SCARLETT
|
||||
if (type.FullName == XboxScarlettPlatformSettingsTypename)
|
||||
return LoadAsset(gameSettings.XboxScarlettPlatform, XboxScarlettPlatformSettingsTypename) as T;
|
||||
|
||||
@@ -77,6 +77,7 @@ public:
|
||||
Guid UWPPlatform;
|
||||
Guid LinuxPlatform;
|
||||
Guid PS4Platform;
|
||||
Guid XboxOnePlatform;
|
||||
Guid XboxScarlettPlatform;
|
||||
Guid AndroidPlatform;
|
||||
Guid SwitchPlatform;
|
||||
|
||||
@@ -17,6 +17,9 @@
|
||||
#if PLATFORM_PS4
|
||||
#include "Platforms/PS4/Engine/Platform/PS4PlatformSettings.h"
|
||||
#endif
|
||||
#if PLATFORM_XBOX_ONE
|
||||
#include "Platforms/XboxOne/Engine/Platform/XboxOnePlatformSettings.h"
|
||||
#endif
|
||||
#if PLATFORM_XBOX_SCARLETT
|
||||
#include "Platforms/XboxScarlett/Engine/Platform/XboxScarlettPlatformSettings.h"
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user