feat: updated engine version to 4.4-rc1
This commit is contained in:
Sara
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -32,16 +32,25 @@
|
|||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "editor/debugger/editor_debugger_node.h"
|
||||
#include "editor/debugger/script_editor_debugger.h"
|
||||
#include "editor/editor_command_palette.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_quick_open.h"
|
||||
#include "editor/editor_run_native.h"
|
||||
#include "editor/editor_settings.h"
|
||||
#include "editor/editor_string_names.h"
|
||||
#include "editor/gui/editor_bottom_panel.h"
|
||||
#include "editor/gui/editor_quick_open_dialog.h"
|
||||
#include "editor/gui/editor_toaster.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/box_container.h"
|
||||
#include "scene/gui/button.h"
|
||||
#include "scene/gui/menu_button.h"
|
||||
#include "scene/gui/panel_container.h"
|
||||
|
||||
#ifndef _3D_DISABLED
|
||||
#include "servers/xr_server.h"
|
||||
#endif // _3D_DISABLED
|
||||
|
||||
EditorRunBar *EditorRunBar::singleton = nullptr;
|
||||
|
||||
void EditorRunBar::_notification(int p_what) {
|
||||
|
|
@ -50,10 +59,39 @@ void EditorRunBar::_notification(int p_what) {
|
|||
_reset_play_buttons();
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_READY: {
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
recovery_mode_show_dialog();
|
||||
}
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
main_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("LaunchPadRecoveryMode"), EditorStringName(EditorStyles)));
|
||||
recovery_mode_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("RecoveryModeButton"), EditorStringName(EditorStyles)));
|
||||
recovery_mode_button->add_theme_style_override("hover", get_theme_stylebox(SNAME("RecoveryModeButton"), EditorStringName(EditorStyles)));
|
||||
|
||||
recovery_mode_button->set_button_icon(get_editor_theme_icon(SNAME("NodeWarning")));
|
||||
recovery_mode_reload_button->set_button_icon(get_editor_theme_icon(SNAME("Reload")));
|
||||
|
||||
recovery_mode_button->begin_bulk_theme_override();
|
||||
recovery_mode_button->add_theme_color_override("icon_normal_color", Color(0.3, 0.3, 0.3, 1));
|
||||
recovery_mode_button->add_theme_color_override("icon_pressed_color", Color(0.4, 0.4, 0.4, 1));
|
||||
recovery_mode_button->add_theme_color_override("icon_hover_color", Color(0.6, 0.6, 0.6, 1));
|
||||
Color dark_color = get_theme_color("recovery_mode_text_color", EditorStringName(Editor));
|
||||
recovery_mode_button->add_theme_color_override(SceneStringName(font_color), dark_color);
|
||||
recovery_mode_button->add_theme_color_override("font_pressed_color", dark_color.lightened(0.2));
|
||||
recovery_mode_button->add_theme_color_override("font_hover_color", dark_color.lightened(0.4));
|
||||
recovery_mode_button->add_theme_color_override("font_hover_pressed_color", dark_color.lightened(0.2));
|
||||
recovery_mode_button->end_bulk_theme_override();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
_update_play_buttons();
|
||||
pause_button->set_icon(get_editor_theme_icon(SNAME("Pause")));
|
||||
stop_button->set_icon(get_editor_theme_icon(SNAME("Stop")));
|
||||
profiler_autostart_indicator->set_button_icon(get_editor_theme_icon(SNAME("ProfilerAutostartWarning")));
|
||||
pause_button->set_button_icon(get_editor_theme_icon(SNAME("Pause")));
|
||||
stop_button->set_button_icon(get_editor_theme_icon(SNAME("Stop")));
|
||||
|
||||
if (is_movie_maker_enabled()) {
|
||||
main_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("LaunchPadMovieMode"), EditorStringName(EditorStyles)));
|
||||
|
|
@ -63,7 +101,7 @@ void EditorRunBar::_notification(int p_what) {
|
|||
write_movie_panel->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("MovieWriterButtonNormal"), EditorStringName(EditorStyles)));
|
||||
}
|
||||
|
||||
write_movie_button->set_icon(get_editor_theme_icon(SNAME("MainMovieWrite")));
|
||||
write_movie_button->set_button_icon(get_editor_theme_icon(SNAME("MainMovieWrite")));
|
||||
// This button behaves differently, so color it as such.
|
||||
write_movie_button->begin_bulk_theme_override();
|
||||
write_movie_button->add_theme_color_override("icon_normal_color", get_theme_color(SNAME("movie_writer_icon_normal"), EditorStringName(EditorStyles)));
|
||||
|
|
@ -76,20 +114,28 @@ void EditorRunBar::_notification(int p_what) {
|
|||
}
|
||||
|
||||
void EditorRunBar::_reset_play_buttons() {
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
return;
|
||||
}
|
||||
|
||||
play_button->set_pressed(false);
|
||||
play_button->set_icon(get_editor_theme_icon(SNAME("MainPlay")));
|
||||
play_button->set_button_icon(get_editor_theme_icon(SNAME("MainPlay")));
|
||||
play_button->set_tooltip_text(TTR("Play the project."));
|
||||
|
||||
play_scene_button->set_pressed(false);
|
||||
play_scene_button->set_icon(get_editor_theme_icon(SNAME("PlayScene")));
|
||||
play_scene_button->set_button_icon(get_editor_theme_icon(SNAME("PlayScene")));
|
||||
play_scene_button->set_tooltip_text(TTR("Play the edited scene."));
|
||||
|
||||
play_custom_scene_button->set_pressed(false);
|
||||
play_custom_scene_button->set_icon(get_editor_theme_icon(SNAME("PlayCustom")));
|
||||
play_custom_scene_button->set_button_icon(get_editor_theme_icon(SNAME("PlayCustom")));
|
||||
play_custom_scene_button->set_tooltip_text(TTR("Play a custom scene."));
|
||||
}
|
||||
|
||||
void EditorRunBar::_update_play_buttons() {
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
return;
|
||||
}
|
||||
|
||||
_reset_play_buttons();
|
||||
if (!is_playing()) {
|
||||
return;
|
||||
|
|
@ -106,7 +152,7 @@ void EditorRunBar::_update_play_buttons() {
|
|||
|
||||
if (active_button) {
|
||||
active_button->set_pressed(true);
|
||||
active_button->set_icon(get_editor_theme_icon(SNAME("Reload")));
|
||||
active_button->set_button_icon(get_editor_theme_icon(SNAME("Reload")));
|
||||
active_button->set_tooltip_text(TTR("Reload the played scene."));
|
||||
}
|
||||
}
|
||||
|
|
@ -121,34 +167,51 @@ void EditorRunBar::_write_movie_toggled(bool p_enabled) {
|
|||
}
|
||||
}
|
||||
|
||||
void EditorRunBar::_quick_run_selected() {
|
||||
play_custom_scene(quick_run->get_selected());
|
||||
Vector<String> EditorRunBar::_get_xr_mode_play_args(int p_xr_mode_id) {
|
||||
Vector<String> play_args;
|
||||
if (p_xr_mode_id == 0) {
|
||||
// Play in regular mode, xr mode off.
|
||||
play_args.push_back("--xr-mode");
|
||||
play_args.push_back("off");
|
||||
} else if (p_xr_mode_id == 1) {
|
||||
// Play in xr mode.
|
||||
play_args.push_back("--xr-mode");
|
||||
play_args.push_back("on");
|
||||
}
|
||||
return play_args;
|
||||
}
|
||||
|
||||
void EditorRunBar::_play_custom_pressed() {
|
||||
void EditorRunBar::_quick_run_selected(const String &p_file_path, int p_id) {
|
||||
play_custom_scene(p_file_path, _get_xr_mode_play_args(p_id));
|
||||
}
|
||||
|
||||
void EditorRunBar::_play_custom_pressed(int p_id) {
|
||||
if (editor_run.get_status() == EditorRun::STATUS_STOP || current_mode != RunMode::RUN_CUSTOM) {
|
||||
stop_playing();
|
||||
|
||||
quick_run->popup_dialog("PackedScene", true);
|
||||
quick_run->set_title(TTR("Quick Run Scene..."));
|
||||
EditorNode::get_singleton()->get_quick_open_dialog()->popup_dialog({ "PackedScene" }, callable_mp(this, &EditorRunBar::_quick_run_selected).bind(p_id));
|
||||
play_custom_scene_button->set_pressed(false);
|
||||
} else {
|
||||
Vector<String> play_args = _get_xr_mode_play_args(p_id);
|
||||
|
||||
// Reload if already running a custom scene.
|
||||
String last_custom_scene = run_custom_filename; // This is necessary to have a copy of the string.
|
||||
play_custom_scene(last_custom_scene);
|
||||
play_custom_scene(last_custom_scene, play_args);
|
||||
}
|
||||
}
|
||||
|
||||
void EditorRunBar::_play_current_pressed() {
|
||||
void EditorRunBar::_play_current_pressed(int p_id) {
|
||||
Vector<String> play_args = _get_xr_mode_play_args(p_id);
|
||||
|
||||
if (editor_run.get_status() == EditorRun::STATUS_STOP || current_mode != RunMode::RUN_CURRENT) {
|
||||
play_current_scene();
|
||||
play_current_scene(false, play_args);
|
||||
} else {
|
||||
// Reload if already running the current scene.
|
||||
play_current_scene(true);
|
||||
play_current_scene(true, play_args);
|
||||
}
|
||||
}
|
||||
|
||||
void EditorRunBar::_run_scene(const String &p_scene_path) {
|
||||
void EditorRunBar::_run_scene(const String &p_scene_path, const Vector<String> &p_run_args) {
|
||||
ERR_FAIL_COND_MSG(current_mode == RUN_CUSTOM && p_scene_path.is_empty(), "Attempting to run a custom scene with an empty path.");
|
||||
|
||||
if (editor_run.get_status() == EditorRun::STATUS_PLAY) {
|
||||
|
|
@ -233,7 +296,7 @@ void EditorRunBar::_run_scene(const String &p_scene_path) {
|
|||
}
|
||||
|
||||
EditorDebuggerNode::get_singleton()->start();
|
||||
Error error = editor_run.run(run_filename, write_movie_file);
|
||||
Error error = editor_run.run(run_filename, write_movie_file, p_run_args);
|
||||
if (error != OK) {
|
||||
EditorDebuggerNode::get_singleton()->stop();
|
||||
EditorNode::get_singleton()->show_accept(TTR("Could not start subprocess(es)!"), TTR("OK"));
|
||||
|
|
@ -262,7 +325,34 @@ void EditorRunBar::_run_native(const Ref<EditorExportPreset> &p_preset) {
|
|||
}
|
||||
}
|
||||
|
||||
void EditorRunBar::_profiler_autostart_indicator_pressed() {
|
||||
// Switch to the first profiler tab in the bottom panel.
|
||||
EditorNode::get_singleton()->get_bottom_panel()->make_item_visible(EditorDebuggerNode::get_singleton(), true);
|
||||
|
||||
if (EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_profiler", false)) {
|
||||
EditorDebuggerNode::get_singleton()->get_current_debugger()->switch_to_debugger(3);
|
||||
} else if (EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_visual_profiler", false)) {
|
||||
EditorDebuggerNode::get_singleton()->get_current_debugger()->switch_to_debugger(4);
|
||||
} else {
|
||||
// Switch to the network profiler tab.
|
||||
EditorDebuggerNode::get_singleton()->get_current_debugger()->switch_to_debugger(8);
|
||||
}
|
||||
}
|
||||
|
||||
void EditorRunBar::recovery_mode_show_dialog() {
|
||||
recovery_mode_popup->popup_centered();
|
||||
}
|
||||
|
||||
void EditorRunBar::recovery_mode_reload_project() {
|
||||
EditorNode::get_singleton()->trigger_menu_option(EditorNode::PROJECT_RELOAD_CURRENT_PROJECT, false);
|
||||
}
|
||||
|
||||
void EditorRunBar::play_main_scene(bool p_from_native) {
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
EditorToaster::get_singleton()->popup_str(TTR("Recovery Mode is enabled. Disable it to run the project."), EditorToaster::SEVERITY_WARNING);
|
||||
return;
|
||||
}
|
||||
|
||||
if (p_from_native) {
|
||||
run_native->resume_run_native();
|
||||
} else {
|
||||
|
|
@ -273,7 +363,12 @@ void EditorRunBar::play_main_scene(bool p_from_native) {
|
|||
}
|
||||
}
|
||||
|
||||
void EditorRunBar::play_current_scene(bool p_reload) {
|
||||
void EditorRunBar::play_current_scene(bool p_reload, const Vector<String> &p_play_args) {
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
EditorToaster::get_singleton()->popup_str(TTR("Recovery Mode is enabled. Disable it to run the project."), EditorToaster::SEVERITY_WARNING);
|
||||
return;
|
||||
}
|
||||
|
||||
String last_current_scene = run_current_filename; // This is necessary to have a copy of the string.
|
||||
|
||||
EditorNode::get_singleton()->save_default_environment();
|
||||
|
|
@ -281,17 +376,22 @@ void EditorRunBar::play_current_scene(bool p_reload) {
|
|||
|
||||
current_mode = RunMode::RUN_CURRENT;
|
||||
if (p_reload) {
|
||||
_run_scene(last_current_scene);
|
||||
_run_scene(last_current_scene, p_play_args);
|
||||
} else {
|
||||
_run_scene();
|
||||
_run_scene("", p_play_args);
|
||||
}
|
||||
}
|
||||
|
||||
void EditorRunBar::play_custom_scene(const String &p_custom) {
|
||||
void EditorRunBar::play_custom_scene(const String &p_custom, const Vector<String> &p_play_args) {
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
EditorToaster::get_singleton()->popup_str(TTR("Recovery Mode is enabled. Disable it to run the project."), EditorToaster::SEVERITY_WARNING);
|
||||
return;
|
||||
}
|
||||
|
||||
stop_playing();
|
||||
|
||||
current_mode = RunMode::RUN_CUSTOM;
|
||||
_run_scene(p_custom);
|
||||
_run_scene(p_custom, p_play_args);
|
||||
}
|
||||
|
||||
void EditorRunBar::stop_playing() {
|
||||
|
|
@ -345,6 +445,10 @@ void EditorRunBar::stop_child_process(OS::ProcessID p_pid) {
|
|||
}
|
||||
}
|
||||
|
||||
OS::ProcessID EditorRunBar::get_current_process() const {
|
||||
return editor_run.get_current_process();
|
||||
}
|
||||
|
||||
void EditorRunBar::set_movie_maker_enabled(bool p_enabled) {
|
||||
write_movie_button->set_pressed(p_enabled);
|
||||
}
|
||||
|
|
@ -353,6 +457,29 @@ bool EditorRunBar::is_movie_maker_enabled() const {
|
|||
return write_movie_button->is_pressed();
|
||||
}
|
||||
|
||||
void EditorRunBar::update_profiler_autostart_indicator() {
|
||||
bool profiler_active = EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_profiler", false);
|
||||
bool visual_profiler_active = EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_visual_profiler", false);
|
||||
bool network_profiler_active = EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_network_profiler", false);
|
||||
bool any_profiler_active = profiler_active | visual_profiler_active | network_profiler_active;
|
||||
any_profiler_active &= !Engine::get_singleton()->is_recovery_mode_hint();
|
||||
profiler_autostart_indicator->set_visible(any_profiler_active);
|
||||
if (any_profiler_active) {
|
||||
String tooltip = TTR("Autostart is enabled for the following profilers, which can have a performance impact:");
|
||||
if (profiler_active) {
|
||||
tooltip += "\n- " + TTR("Profiler");
|
||||
}
|
||||
if (visual_profiler_active) {
|
||||
tooltip += "\n- " + TTR("Visual Profiler");
|
||||
}
|
||||
if (network_profiler_active) {
|
||||
tooltip += "\n- " + TTR("Network Profiler");
|
||||
}
|
||||
tooltip += "\n\n" + TTR("Click to open the first profiler for which autostart is enabled.");
|
||||
profiler_autostart_indicator->set_tooltip_text(tooltip);
|
||||
}
|
||||
}
|
||||
|
||||
HBoxContainer *EditorRunBar::get_buttons_container() {
|
||||
return main_hbox;
|
||||
}
|
||||
|
|
@ -365,21 +492,69 @@ void EditorRunBar::_bind_methods() {
|
|||
EditorRunBar::EditorRunBar() {
|
||||
singleton = this;
|
||||
|
||||
outer_hbox = memnew(HBoxContainer);
|
||||
add_child(outer_hbox);
|
||||
|
||||
// Use a button for the indicator since it comes with a background panel and pixel perfect centering of an icon.
|
||||
profiler_autostart_indicator = memnew(Button);
|
||||
profiler_autostart_indicator->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
|
||||
profiler_autostart_indicator->set_focus_mode(FOCUS_NONE);
|
||||
profiler_autostart_indicator->set_theme_type_variation("ProfilerAutostartIndicator");
|
||||
profiler_autostart_indicator->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::_profiler_autostart_indicator_pressed));
|
||||
outer_hbox->add_child(profiler_autostart_indicator);
|
||||
update_profiler_autostart_indicator();
|
||||
|
||||
main_panel = memnew(PanelContainer);
|
||||
add_child(main_panel);
|
||||
outer_hbox->add_child(main_panel);
|
||||
|
||||
main_hbox = memnew(HBoxContainer);
|
||||
main_panel->add_child(main_hbox);
|
||||
|
||||
if (Engine::get_singleton()->is_recovery_mode_hint()) {
|
||||
recovery_mode_popup = memnew(AcceptDialog);
|
||||
recovery_mode_popup->set_min_size(Size2(550, 70) * EDSCALE);
|
||||
recovery_mode_popup->set_title(TTR("Recovery Mode"));
|
||||
recovery_mode_popup->set_text(
|
||||
TTR("Godot opened the project in Recovery Mode, which is a special mode that can help recover projects that crash the engine upon initialization. The following features have been temporarily disabled:") +
|
||||
String::utf8("\n\n• ") + TTR("Tool scripts") +
|
||||
String::utf8("\n• ") + TTR("Editor plugins") +
|
||||
String::utf8("\n• ") + TTR("GDExtension addons") +
|
||||
String::utf8("\n• ") + TTR("Automatic scene restoring") +
|
||||
String::utf8("\n\n") + TTR("If the project cannot be opened outside of this mode, then it's very likely any of these components is preventing this project from launching. This mode is intended only for basic editing to troubleshoot such issues, and therefore it is not possible to run a project in this mode.") +
|
||||
String::utf8("\n\n") + TTR("To disable Recovery Mode, reload the project by pressing the Reload button next to the Recovery Mode banner, or by reopening the project normally."));
|
||||
recovery_mode_popup->set_autowrap(true);
|
||||
add_child(recovery_mode_popup);
|
||||
|
||||
recovery_mode_reload_button = memnew(Button);
|
||||
main_hbox->add_child(recovery_mode_reload_button);
|
||||
recovery_mode_reload_button->set_theme_type_variation("RunBarButton");
|
||||
recovery_mode_reload_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
recovery_mode_reload_button->set_tooltip_text(TTR("Disable recovery mode and reload the project."));
|
||||
recovery_mode_reload_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::recovery_mode_reload_project));
|
||||
|
||||
recovery_mode_panel = memnew(PanelContainer);
|
||||
main_hbox->add_child(recovery_mode_panel);
|
||||
|
||||
recovery_mode_button = memnew(Button);
|
||||
recovery_mode_panel->add_child(recovery_mode_button);
|
||||
recovery_mode_button->set_theme_type_variation("RunBarButton");
|
||||
recovery_mode_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
recovery_mode_button->set_text(TTR("Recovery Mode"));
|
||||
recovery_mode_button->set_tooltip_text(TTR("Recovery Mode is enabled. Click for more details."));
|
||||
recovery_mode_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::recovery_mode_show_dialog));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
play_button = memnew(Button);
|
||||
main_hbox->add_child(play_button);
|
||||
play_button->set_theme_type_variation("RunBarButton");
|
||||
play_button->set_toggle_mode(true);
|
||||
play_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
play_button->set_tooltip_text(TTR("Run the project's default scene."));
|
||||
play_button->set_tooltip_text(TTRC("Run the project's default scene."));
|
||||
play_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::play_main_scene).bind(false));
|
||||
|
||||
ED_SHORTCUT_AND_COMMAND("editor/run_project", TTR("Run Project"), Key::F5);
|
||||
ED_SHORTCUT_AND_COMMAND("editor/run_project", TTRC("Run Project"), Key::F5);
|
||||
ED_SHORTCUT_OVERRIDE("editor/run_project", "macos", KeyModifierMask::META | Key::B);
|
||||
play_button->set_shortcut(ED_GET_SHORTCUT("editor/run_project"));
|
||||
|
||||
|
|
@ -388,10 +563,10 @@ EditorRunBar::EditorRunBar() {
|
|||
pause_button->set_theme_type_variation("RunBarButton");
|
||||
pause_button->set_toggle_mode(true);
|
||||
pause_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
pause_button->set_tooltip_text(TTR("Pause the running project's execution for debugging."));
|
||||
pause_button->set_tooltip_text(TTRC("Pause the running project's execution for debugging."));
|
||||
pause_button->set_disabled(true);
|
||||
|
||||
ED_SHORTCUT("editor/pause_running_project", TTR("Pause Running Project"), Key::F7);
|
||||
ED_SHORTCUT("editor/pause_running_project", TTRC("Pause Running Project"), Key::F7);
|
||||
ED_SHORTCUT_OVERRIDE("editor/pause_running_project", "macos", KeyModifierMask::META | KeyModifierMask::CTRL | Key::Y);
|
||||
pause_button->set_shortcut(ED_GET_SHORTCUT("editor/pause_running_project"));
|
||||
|
||||
|
|
@ -399,11 +574,11 @@ EditorRunBar::EditorRunBar() {
|
|||
main_hbox->add_child(stop_button);
|
||||
stop_button->set_theme_type_variation("RunBarButton");
|
||||
stop_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
stop_button->set_tooltip_text(TTR("Stop the currently running project."));
|
||||
stop_button->set_tooltip_text(TTRC("Stop the currently running project."));
|
||||
stop_button->set_disabled(true);
|
||||
stop_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::stop_playing));
|
||||
|
||||
ED_SHORTCUT("editor/stop_running_project", TTR("Stop Running Project"), Key::F8);
|
||||
ED_SHORTCUT("editor/stop_running_project", TTRC("Stop Running Project"), Key::F8);
|
||||
ED_SHORTCUT_OVERRIDE("editor/stop_running_project", "macos", KeyModifierMask::META | Key::PERIOD);
|
||||
stop_button->set_shortcut(ED_GET_SHORTCUT("editor/stop_running_project"));
|
||||
|
||||
|
|
@ -411,27 +586,57 @@ EditorRunBar::EditorRunBar() {
|
|||
main_hbox->add_child(run_native);
|
||||
run_native->connect("native_run", callable_mp(this, &EditorRunBar::_run_native));
|
||||
|
||||
play_scene_button = memnew(Button);
|
||||
bool add_play_xr_mode_options = false;
|
||||
#ifndef _3D_DISABLED
|
||||
if (OS::get_singleton()->has_feature("xr_editor") &&
|
||||
(XRServer::get_xr_mode() == XRServer::XRMODE_ON ||
|
||||
(XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT && GLOBAL_GET("xr/openxr/enabled")))) {
|
||||
// If this is the XR editor and openxr is enabled, we turn the `play_scene_button` and
|
||||
// `play_custom_scene_button` into MenuButtons to provide the option to start a scene in
|
||||
// either regular mode or XR mode.
|
||||
add_play_xr_mode_options = true;
|
||||
}
|
||||
#endif // _3D_DISABLED
|
||||
|
||||
if (add_play_xr_mode_options) {
|
||||
MenuButton *menu_button = memnew(MenuButton);
|
||||
PopupMenu *popup = menu_button->get_popup();
|
||||
popup->add_item(TTRC("Run Scene in Regular Mode"), 0);
|
||||
popup->add_item(TTRC("Run Scene in XR Mode"), 1);
|
||||
popup->connect(SceneStringName(id_pressed), callable_mp(this, &EditorRunBar::_play_current_pressed));
|
||||
play_scene_button = menu_button;
|
||||
} else {
|
||||
play_scene_button = memnew(Button);
|
||||
play_scene_button->set_toggle_mode(true);
|
||||
play_scene_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::_play_current_pressed).bind(-1));
|
||||
}
|
||||
main_hbox->add_child(play_scene_button);
|
||||
play_scene_button->set_theme_type_variation("RunBarButton");
|
||||
play_scene_button->set_toggle_mode(true);
|
||||
play_scene_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
play_scene_button->set_tooltip_text(TTR("Run the currently edited scene."));
|
||||
play_scene_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::_play_current_pressed));
|
||||
play_scene_button->set_tooltip_text(TTRC("Run the currently edited scene."));
|
||||
|
||||
ED_SHORTCUT_AND_COMMAND("editor/run_current_scene", TTR("Run Current Scene"), Key::F6);
|
||||
ED_SHORTCUT_AND_COMMAND("editor/run_current_scene", TTRC("Run Current Scene"), Key::F6);
|
||||
ED_SHORTCUT_OVERRIDE("editor/run_current_scene", "macos", KeyModifierMask::META | Key::R);
|
||||
play_scene_button->set_shortcut(ED_GET_SHORTCUT("editor/run_current_scene"));
|
||||
|
||||
play_custom_scene_button = memnew(Button);
|
||||
if (add_play_xr_mode_options) {
|
||||
MenuButton *menu_button = memnew(MenuButton);
|
||||
PopupMenu *popup = menu_button->get_popup();
|
||||
popup->add_item(TTRC("Run in Regular Mode"), 0);
|
||||
popup->add_item(TTRC("Run in XR Mode"), 1);
|
||||
popup->connect(SceneStringName(id_pressed), callable_mp(this, &EditorRunBar::_play_custom_pressed));
|
||||
play_custom_scene_button = menu_button;
|
||||
} else {
|
||||
play_custom_scene_button = memnew(Button);
|
||||
play_custom_scene_button->set_toggle_mode(true);
|
||||
play_custom_scene_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::_play_custom_pressed).bind(-1));
|
||||
}
|
||||
main_hbox->add_child(play_custom_scene_button);
|
||||
play_custom_scene_button->set_theme_type_variation("RunBarButton");
|
||||
play_custom_scene_button->set_toggle_mode(true);
|
||||
play_custom_scene_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
play_custom_scene_button->set_tooltip_text(TTR("Run a specific scene."));
|
||||
play_custom_scene_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::_play_custom_pressed));
|
||||
play_custom_scene_button->set_tooltip_text(TTRC("Run a specific scene."));
|
||||
|
||||
ED_SHORTCUT_AND_COMMAND("editor/run_specific_scene", TTR("Run Specific Scene"), KeyModifierMask::CTRL | KeyModifierMask::SHIFT | Key::F5);
|
||||
ED_SHORTCUT_AND_COMMAND("editor/run_specific_scene", TTRC("Run Specific Scene"), KeyModifierMask::CTRL | KeyModifierMask::SHIFT | Key::F5);
|
||||
ED_SHORTCUT_OVERRIDE("editor/run_specific_scene", "macos", KeyModifierMask::META | KeyModifierMask::SHIFT | Key::R);
|
||||
play_custom_scene_button->set_shortcut(ED_GET_SHORTCUT("editor/run_specific_scene"));
|
||||
|
||||
|
|
@ -445,9 +650,5 @@ EditorRunBar::EditorRunBar() {
|
|||
write_movie_button->set_pressed(false);
|
||||
write_movie_button->set_focus_mode(Control::FOCUS_NONE);
|
||||
write_movie_button->set_tooltip_text(TTR("Enable Movie Maker mode.\nThe project will run at stable FPS and the visual and audio output will be recorded to a video file."));
|
||||
write_movie_button->connect("toggled", callable_mp(this, &EditorRunBar::_write_movie_toggled));
|
||||
|
||||
quick_run = memnew(EditorQuickOpen);
|
||||
add_child(quick_run);
|
||||
quick_run->connect("quick_open", callable_mp(this, &EditorRunBar::_quick_run_selected));
|
||||
write_movie_button->connect(SceneStringName(toggled), callable_mp(this, &EditorRunBar::_write_movie_toggled));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue