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

Merge pull request #3744 from neikeq/issue_3742

Browse source 
Fix "Play custom scene" button and allow to restart
This commit is contained in:
Rémi Verschelde 2016-02-17 21:33:18 +01:00
commit b28fc0a3d8
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
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);
play_scene_button->set_pressed(false);
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 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())) {
Node *scene = editor_data.get_edited_scene_root();
if (!scene) {
@ -1913,6 +1914,10 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
if (p_current) {
play_scene_button->set_pressed(true);
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 {
play_button->set_pressed(true);
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;
case RUN_PLAY_CUSTOM_SCENE: {
_menu_option_confirm(RUN_STOP,true);
quick_run->popup("PackedScene",true);
quick_run->set_title("Quick Run Scene..");
if (run_custom_filename.empty() || editor_run.get_status()==EditorRun::STATUS_STOP) {
_menu_option_confirm(RUN_STOP,true);
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;
case RUN_PAUSE: {
@ -2611,10 +2622,13 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
break;
editor_run.stop();
run_custom_filename.clear();
play_button->set_pressed(false);
play_button->set_icon(gui_base->get_icon("MainPlay","EditorIcons"));
play_scene_button->set_pressed(false);
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);
emit_signal("stop_pressed");
@ -3843,9 +3857,9 @@ void EditorNode::_quick_opened() {
}
}
void EditorNode::_quick_run(const String& p_resource) {
void EditorNode::_quick_run() {
_run(false,p_resource);
_run(false,quick_run->get_selected());
}

3
tools/editor/editor_node.h
View file

@ -355,6 +355,7 @@ class EditorNode : public Node {
Object *current;
bool _playing_edited;
String run_custom_filename;
bool reference_resource_mem;
bool save_external_resources_mem;
uint64_t saved_version;
@ -447,7 +448,7 @@ class EditorNode : public Node {
void _hide_top_editors();
void _quick_opened();
void _quick_run(const String& p_resource);
void _quick_run();
void _run(bool p_current=false, const String &p_custom="");