diff --git a/Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp b/Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp index d1f4dc6fb..88f993f20 100644 --- a/Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp +++ b/Source/Editor/Cooker/Platform/Android/AndroidPlatformTools.cpp @@ -174,19 +174,19 @@ bool AndroidPlatformTools::OnPostProcess(CookingData& data) String orientation = String("fullSensor"); switch (defaultOrienation) { - case AndroidScreenOrientation::Portrait: + case AndroidPlatformSettings::ScreenOrientation::Portrait: orientation = String("portrait"); break; - case AndroidScreenOrientation::PortraitReverse: + case AndroidPlatformSettings::ScreenOrientation::PortraitReverse: orientation = String("reversePortrait"); break; - case AndroidScreenOrientation::LandscapeRight: + case AndroidPlatformSettings::ScreenOrientation::LandscapeRight: orientation = String("landscape"); break; - case AndroidScreenOrientation::LandscapeLeft: + case AndroidPlatformSettings::ScreenOrientation::LandscapeLeft: orientation = String("reverseLandscape"); break; - case AndroidScreenOrientation::AutoRotation: + case AndroidPlatformSettings::ScreenOrientation::AutoRotation: orientation = String("fullSensor"); break; default: diff --git a/Source/Engine/Platform/Android/AndroidPlatformSettings.h b/Source/Engine/Platform/Android/AndroidPlatformSettings.h index f9f12d811..974a4c488 100644 --- a/Source/Engine/Platform/Android/AndroidPlatformSettings.h +++ b/Source/Engine/Platform/Android/AndroidPlatformSettings.h @@ -9,37 +9,6 @@ class Texture; -/// -/// Android screen orientation options. -/// -API_ENUM() enum class FLAXENGINE_API AndroidScreenOrientation -{ - /// - /// "portrait" mode - /// - Portrait, - - /// - /// "reversePortrait" mode - /// - PortraitReverse, - - /// - /// "landscape" mode - /// - LandscapeRight, - - /// - /// "reverseLandscape" mode - /// - LandscapeLeft, - - /// - /// "fullSensor" mode - /// - AutoRotation, -}; - /// /// Android platform settings. /// @@ -48,6 +17,37 @@ API_CLASS(sealed, Namespace="FlaxEditor.Content.Settings") class FLAXENGINE_API DECLARE_SCRIPTING_TYPE_MINIMAL(AndroidPlatformSettings); API_AUTO_SERIALIZATION(); + /// + /// Android screen orientation options. + /// + API_ENUM() enum class FLAXENGINE_API ScreenOrientation + { + /// + /// "portrait" mode + /// + Portrait, + + /// + /// "reversePortrait" mode + /// + PortraitReverse, + + /// + /// "landscape" mode + /// + LandscapeRight, + + /// + /// "reverseLandscape" mode + /// + LandscapeLeft, + + /// + /// "fullSensor" mode + /// + AutoRotation, + }; + /// /// The application package name (eg. com.company.product). Custom tokens: ${PROJECT_NAME}, ${COMPANY_NAME}. /// @@ -64,7 +64,7 @@ API_CLASS(sealed, Namespace="FlaxEditor.Content.Settings") class FLAXENGINE_API /// The default screen orientation. /// API_FIELD(Attributes = "EditorOrder(110), EditorDisplay(\"General\")") - AndroidScreenOrientation DefaultOrientation = AndroidScreenOrientation::AutoRotation; + ScreenOrientation DefaultOrientation = ScreenOrientation::AutoRotation; /// /// Custom icon texture to use for the application (overrides the default one).