diff options
Diffstat (limited to 'editor/editor_run_native.cpp')
| -rw-r--r-- | editor/editor_run_native.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index d4450acea2..9a834977fd 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -35,21 +35,18 @@ #include "editor_scale.h" void EditorRunNative::_notification(int p_what) { - if (p_what == NOTIFICATION_ENTER_TREE) { - for (int i = 0; i < EditorExport::get_singleton()->get_export_platform_count(); i++) { - Ref<EditorExportPlatform> eep = EditorExport::get_singleton()->get_export_platform(i); - if (eep.is_null()) + if (eep.is_null()) { continue; + } Ref<ImageTexture> icon = eep->get_run_icon(); if (!icon.is_null()) { Ref<Image> im = icon->get_data(); im = im->duplicate(); im->clear_mipmaps(); if (!im->empty()) { - im->resize(16 * EDSCALE, 16 * EDSCALE); Ref<ImageTexture> small_icon; small_icon.instance(); @@ -66,13 +63,10 @@ void EditorRunNative::_notification(int p_what) { } if (p_what == NOTIFICATION_PROCESS) { - bool changed = EditorExport::get_singleton()->poll_export_platforms() || first; if (changed) { - for (Map<int, MenuButton *>::Element *E = menus.front(); E; E = E->next()) { - Ref<EditorExportPlatform> eep = EditorExport::get_singleton()->get_export_platform(E->key()); MenuButton *mb = E->get(); int dc = eep->get_options_count(); @@ -98,7 +92,6 @@ void EditorRunNative::_notification(int p_what) { } void EditorRunNative::_run_native(int p_idx, int p_platform) { - if (!EditorNode::get_singleton()->ensure_main_scene(true)) { resume_idx = p_idx; resume_platform = p_platform; @@ -120,7 +113,6 @@ void EditorRunNative::_run_native(int p_idx, int p_platform) { Ref<EditorExportPreset> preset; for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); i++) { - Ref<EditorExportPreset> ep = EditorExport::get_singleton()->get_export_preset(i); if (ep->is_runnable() && ep->get_platform() == eep) { preset = ep; @@ -142,14 +134,18 @@ void EditorRunNative::_run_native(int p_idx, int p_platform) { bool debug_collisions = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_collisons", false); bool debug_navigation = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_navigation", false); - if (deploy_debug_remote) + if (deploy_debug_remote) { flags |= EditorExportPlatform::DEBUG_FLAG_REMOTE_DEBUG; - if (deploy_dumb) + } + if (deploy_dumb) { flags |= EditorExportPlatform::DEBUG_FLAG_DUMB_CLIENT; - if (debug_collisions) + } + if (debug_collisions) { flags |= EditorExportPlatform::DEBUG_FLAG_VIEW_COLLISONS; - if (debug_navigation) + } + if (debug_navigation) { flags |= EditorExportPlatform::DEBUG_FLAG_VIEW_NAVIGATION; + } eep->run(preset, p_idx, flags); } @@ -159,12 +155,10 @@ void EditorRunNative::resume_run_native() { } void EditorRunNative::_bind_methods() { - ADD_SIGNAL(MethodInfo("native_run", PropertyInfo(Variant::OBJECT, "preset", PROPERTY_HINT_RESOURCE_TYPE, "EditorExportPreset"))); } bool EditorRunNative::is_deploy_debug_remote_enabled() const { - return EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_deploy_remote_debug", false); } |