asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added option to restart custom scene

Browse source
This commit is contained in:
Ignacio Etcheverry 2016-02-17 20:51:56 +01:00
parent d8f06085a2
commit 8c0accc4ba
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/editor/editor_node.cpp
View file

@ -1795,6 +1795,8 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
//pause_button->set_pressed(false); //pause_button->set_pressed(false);
play_scene_button->set_pressed(false); play_scene_button->set_pressed(false);
play_scene_button->set_icon(gui_base->get_icon("PlayScene","EditorIcons")); play_scene_button->set_icon(gui_base->get_icon("PlayScene","EditorIcons"));
play_custom_scene_button->set_pressed(false);
play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom","EditorIcons"));
String current_filename; String current_filename;
String run_filename; String run_filename;
@ -1804,7 +1806,6 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
if (p_current || (editor_data.get_edited_scene_root() && p_custom==editor_data.get_edited_scene_root()->get_filename())) { if (p_current || (editor_data.get_edited_scene_root() && p_custom==editor_data.get_edited_scene_root()->get_filename())) {
Node *scene = editor_data.get_edited_scene_root(); Node *scene = editor_data.get_edited_scene_root();
if (!scene) { if (!scene) {
@ -1913,6 +1914,10 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
if (p_current) { if (p_current) {
play_scene_button->set_pressed(true); play_scene_button->set_pressed(true);
play_scene_button->set_icon(gui_base->get_icon("Reload","EditorIcons")); play_scene_button->set_icon(gui_base->get_icon("Reload","EditorIcons"));
} else if (p_custom!="") {
run_custom_filename=run_filename;
play_custom_scene_button->set_pressed(true);
play_custom_scene_button->set_icon(gui_base->get_icon("Reload","EditorIcons"));
} else { } else {
play_button->set_pressed(true); play_button->set_pressed(true);
play_button->set_icon(gui_base->get_icon("Reload","EditorIcons")); play_button->set_icon(gui_base->get_icon("Reload","EditorIcons"));
@ -2595,9 +2600,15 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
} break; } break;
case RUN_PLAY_CUSTOM_SCENE: { case RUN_PLAY_CUSTOM_SCENE: {
_menu_option_confirm(RUN_STOP,true); if (run_custom_filename.empty() || editor_run.get_status()==EditorRun::STATUS_STOP) {
quick_run->popup("PackedScene",true); _menu_option_confirm(RUN_STOP,true);
quick_run->set_title("Quick Run Scene.."); quick_run->popup("PackedScene",true);
quick_run->set_title("Quick Run Scene..");
} else {
String last_custom_scene=run_custom_filename;
_menu_option_confirm(RUN_STOP,true);
_run(false,last_custom_scene);
}
} break; } break;
case RUN_PAUSE: { case RUN_PAUSE: {
@ -2611,10 +2622,13 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
break; break;
editor_run.stop(); editor_run.stop();
run_custom_filename.clear();
play_button->set_pressed(false); play_button->set_pressed(false);
play_button->set_icon(gui_base->get_icon("MainPlay","EditorIcons")); play_button->set_icon(gui_base->get_icon("MainPlay","EditorIcons"));
play_scene_button->set_pressed(false); play_scene_button->set_pressed(false);
play_scene_button->set_icon(gui_base->get_icon("PlayScene","EditorIcons")); play_scene_button->set_icon(gui_base->get_icon("PlayScene","EditorIcons"));
play_custom_scene_button->set_pressed(false);
play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom","EditorIcons"));
//pause_button->set_pressed(false); //pause_button->set_pressed(false);
emit_signal("stop_pressed"); emit_signal("stop_pressed");

1
tools/editor/editor_node.h
View file

@ -355,6 +355,7 @@ class EditorNode : public Node {
Object *current; Object *current;
bool _playing_edited; bool _playing_edited;
String run_custom_filename;
bool reference_resource_mem; bool reference_resource_mem;
bool save_external_resources_mem; bool save_external_resources_mem;
uint64_t saved_version; uint64_t saved_version;