godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43511 from m4gr3d/fix_project_orientation_settings_3_2 

[3.2] Remove duplicate Android `orientation` settings
This commit is contained in:
Rémi Verschelde 2020-11-13 22:32:08 +01:00 committed by GitHub
parent 231e075048 c9b5e912dd
commit f5bf92faf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/android/export/export.cpp
View File

@ -837,7 +837,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
int version_code = p_preset->get("version/code"); int version_code = p_preset->get("version/code");
String package_name = p_preset->get("package/unique_name"); String package_name = p_preset->get("package/unique_name");
int orientation = p_preset->get("screen/orientation"); const int screen_orientation = _get_android_orientation_value(_get_screen_orientation());
bool min_gles3 = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name") == "GLES3" && bool min_gles3 = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name") == "GLES3" &&
!ProjectSettings::get_singleton()->get("rendering/quality/driver/fallback_to_gles2"); !ProjectSettings::get_singleton()->get("rendering/quality/driver/fallback_to_gles2");
@ -955,7 +955,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
if (tname == "activity" && attrname == "screenOrientation") { if (tname == "activity" && attrname == "screenOrientation") {
encode_uint32(orientation == 0 ? 0 : 1, &p_manifest.write[iofs + 16]); encode_uint32(screen_orientation, &p_manifest.write[iofs + 16]);
} }
if (tname == "supports-screens") { if (tname == "supports-screens") {
@ -1673,7 +1673,6 @@ public:
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name [default if blank]"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/name", PROPERTY_HINT_PLACEHOLDER_TEXT, "Game Name [default if blank]"), ""));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/signed"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/signed"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/immersive_mode"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/immersive_mode"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "screen/orientation", PROPERTY_HINT_ENUM, "Landscape,Portrait"), 0));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_small"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_small"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_normal"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_normal"), true));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_large"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_large"), true));

51
platform/android/export/gradle_export_util.h
View File

@ -44,6 +44,55 @@ const String godot_project_name_xml_string = R"(<?xml version="1.0" encoding="ut
</resources> </resources>
)"; )";
OS::ScreenOrientation _get_screen_orientation() {
String orientation_settings = ProjectSettings::get_singleton()->get("display/window/handheld/orientation");
OS::ScreenOrientation screen_orientation;
if (orientation_settings == "portrait")
screen_orientation = OS::SCREEN_PORTRAIT;
else if (orientation_settings == "reverse_landscape")
screen_orientation = OS::SCREEN_REVERSE_LANDSCAPE;
else if (orientation_settings == "reverse_portrait")
screen_orientation = OS::SCREEN_REVERSE_PORTRAIT;
else if (orientation_settings == "sensor_landscape")
screen_orientation = OS::SCREEN_SENSOR_LANDSCAPE;
else if (orientation_settings == "sensor_portrait")
screen_orientation = OS::SCREEN_SENSOR_PORTRAIT;
else if (orientation_settings == "sensor")
screen_orientation = OS::SCREEN_SENSOR;
else
screen_orientation = OS::SCREEN_LANDSCAPE;
return screen_orientation;
}
int _get_android_orientation_value(OS::ScreenOrientation screen_orientation) {
switch (screen_orientation) {
case OS::SCREEN_PORTRAIT: return 1;
case OS::SCREEN_REVERSE_LANDSCAPE: return 8;
case OS::SCREEN_REVERSE_PORTRAIT: return 9;
case OS::SCREEN_SENSOR_LANDSCAPE: return 11;
case OS::SCREEN_SENSOR_PORTRAIT: return 12;
case OS::SCREEN_SENSOR: return 13;
case OS::SCREEN_LANDSCAPE:
default:
return 0;
}
}
String _get_android_orientation_label(OS::ScreenOrientation screen_orientation) {
switch (screen_orientation) {
case OS::SCREEN_PORTRAIT: return "portrait";
case OS::SCREEN_REVERSE_LANDSCAPE: return "reverseLandscape";
case OS::SCREEN_REVERSE_PORTRAIT: return "reversePortrait";
case OS::SCREEN_SENSOR_LANDSCAPE: return "userLandscape";
case OS::SCREEN_SENSOR_PORTRAIT: return "userPortrait";
case OS::SCREEN_SENSOR: return "fullUser";
case OS::SCREEN_LANDSCAPE:
default:
return "landscape";
}
}
// Utility method used to create a directory. // Utility method used to create a directory.
Error create_directory(const String &p_dir) { Error create_directory(const String &p_dir) {
if (!DirAccess::exists(p_dir)) { if (!DirAccess::exists(p_dir)) {
@ -209,7 +258,7 @@ String _get_plugins_tag(const String &plugins_names) {
String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) { String _get_activity_tag(const Ref<EditorExportPreset> &p_preset) {
bool uses_xr = (int)(p_preset->get("xr_features/xr_mode")) == 1; bool uses_xr = (int)(p_preset->get("xr_features/xr_mode")) == 1;
String orientation = (int)(p_preset->get("screen/orientation")) == 1 ? "portrait" : "landscape"; String orientation = _get_android_orientation_label(_get_screen_orientation());
String manifest_activity_text = vformat( String manifest_activity_text = vformat(
" <activity android:name=\"com.godot.game.GodotApp\" " " <activity android:name=\"com.godot.game.GodotApp\" "
"tools:replace=\"android:screenOrientation\" " "tools:replace=\"android:screenOrientation\" "