Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 07:17:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@5abed52fd9

Browse Source
This commit is contained in:
Spartan322
2025-06-20 02:38:24 -04:00
parent 1abe718b09 5abed52fd9
commit 7f9872092c
699 changed files with 21288 additions and 9565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/ios/export/export_plugin.cpp
View File

@@ -35,8 +35,13 @@
#include "logo_svg.gen.h"
#include "run_icon_svg.gen.h"
Vector<String> EditorExportPlatformIOS::device_types({ "iPhone", "iPad" });
EditorExportPlatformIOS::EditorExportPlatformIOS() :
EditorExportPlatformAppleEmbedded(_ios_logo_svg, _ios_run_icon_svg) {
#ifdef MACOS_ENABLED
_start_remote_device_poller_thread();
#endif
}
EditorExportPlatformIOS::~EditorExportPlatformIOS() {
@@ -49,8 +54,8 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/min_ios_version"), get_minimum_deployment_target()));
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "storyboard/image_scale_mode", PROPERTY_HINT_ENUM, "Same as Logo,Center,Scale to Fit,Scale to Fill,Scale"), 0));
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@2x", PROPERTY_HINT_FILE, "*.png,*.jpg,*.jpeg"), ""));
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@3x", PROPERTY_HINT_FILE, "*.png,*.jpg,*.jpeg"), ""));
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@2x", PROPERTY_HINT_FILE_PATH, "*.png,*.jpg,*.jpeg"), ""));
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "storyboard/custom_image@3x", PROPERTY_HINT_FILE_PATH, "*.png,*.jpg,*.jpeg"), ""));
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "storyboard/use_custom_bg_color"), false));
r_options->push_back(ExportOption(PropertyInfo(Variant::COLOR, "storyboard/custom_bg_color"), Color()));
}

4
platform/ios/export/export_plugin.h
View File

@@ -37,9 +37,11 @@
class EditorExportPlatformIOS : public EditorExportPlatformAppleEmbedded {
GDCLASS(EditorExportPlatformIOS, EditorExportPlatformAppleEmbedded);
virtual String get_platform_name() const override { return "ios"; }
static Vector<String> device_types;
virtual String get_platform_name() const override { return "ios"; }
virtual String get_sdk_name() const override { return "iphoneos"; }
virtual const Vector<String> get_device_types() const override { return device_types; }
virtual String get_minimum_deployment_target() const override { return "14.0"; }