From b6b346e8aeaa4b31f4a89b0711e48a08fa802cf5 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 17 May 2015 16:33:35 -0300 Subject: [PATCH] added a built-in scene changer API, closes #1928 --- demos/misc/scene_changer/engine.cfg | 4 ++ demos/misc/scene_changer/scene_a.gd | 17 ++++++ demos/misc/scene_changer/scene_a.scn | Bin 0 -> 1459 bytes demos/misc/scene_changer/scene_b.gd | 17 ++++++ demos/misc/scene_changer/scene_b.scn | Bin 0 -> 1448 bytes main/main.cpp | 3 +- scene/main/scene_main_loop.cpp | 76 ++++++++++++++++++++++++++- scene/main/scene_main_loop.h | 15 +++++- 8 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 demos/misc/scene_changer/engine.cfg create mode 100644 demos/misc/scene_changer/scene_a.gd create mode 100644 demos/misc/scene_changer/scene_a.scn create mode 100644 demos/misc/scene_changer/scene_b.gd create mode 100644 demos/misc/scene_changer/scene_b.scn diff --git a/demos/misc/scene_changer/engine.cfg b/demos/misc/scene_changer/engine.cfg new file mode 100644 index 0000000000..1ba1a41167 --- /dev/null +++ b/demos/misc/scene_changer/engine.cfg @@ -0,0 +1,4 @@ +[application] + +name="Scene Changer" +main_scene="res://scene_a.scn" diff --git a/demos/misc/scene_changer/scene_a.gd b/demos/misc/scene_changer/scene_a.gd new file mode 100644 index 0000000000..956878b0f7 --- /dev/null +++ b/demos/misc/scene_changer/scene_a.gd @@ -0,0 +1,17 @@ + +extends Panel + +# member variables here, example: +# var a=2 +# var b="textvar" + +func _ready(): + # Initalization here + pass + + + + +func _on_goto_scene_pressed(): + get_tree().change_scene("res://scene_b.scn") + pass # replace with function body diff --git a/demos/misc/scene_changer/scene_a.scn b/demos/misc/scene_changer/scene_a.scn new file mode 100644 index 0000000000000000000000000000000000000000..61727a57bab5c55780ce11b2a3ae377dbf537b17 GIT binary patch literal 1459 zcmWFvc6Md}0RaYvY1|A9vsoD!7#SEIFfuYEFW_R}QDEl^NKDR7O$km;%}Z6_ePGJK zz@lKsz^K5?$iSz-%vY3JoL^d$oT{Ifn48MLsUXN6pH!Ncl9QT}AjejmT$EW*qTj%l zVCta6UOF^6^CqFqcM?sRwfZ?tJuLHva z_7e^*3``0V3{ncr4D1Tb46F*w3~UO_4qZ&e3`z=|49W`33>*r~3t|&w*#Z*tQgaxD z6-2qpGK({lGIKIZD)ke%7;{n|u!}M07bGSt$T2cVJYdyjDNfBvi$5UEAoPG$nms=+ zz9heZfmcD4J25XgBfm($C^J2yB$0Q40DDq?NlAV#gQ$WMds=>SX>ojBs)7$UP)q3!lVaGk}PGZMJ1Vv^B5T<72F;$iSrbf z6s49VXT%pJmSpB9d}{ouc+ZJF@egNwd~Rw1IG_~iW3 zypjhTQVe+tYaTF3IlXc)b-2x0mROXTm{(HFAgAEx@XtZUAPGb^OR3AD^0%S(0BAUyxI(xP&dfxFoS8wOH}e z17;29iHn~(h&dEE*gJBwB$pNyr7rmJfLXl7tKrIle5VzPi&Qw0)Kruh(i=k_uuCu` z9guj!7{Z#Klb@8Bb3oi7kkQB`p~r#Cp~ta-vmmn~H7C9}FR>t@+kwGB%7K}&Dqne- zV<59f#6vp=0S9iT{IudEVfH>u=iKB^w9D8bBS!PjwUasT32h8#glbH(gi<7+{Ff%+5S*gq^q{JksI_EmLJYcxsz~Er_gy$zqa#3n( zp2|-Lg(plOo%NU*7*w1Z*ck*CurqQwH}EqgB>!-R6cseLM%yVFOS?Hkc z@WO%Jk;#GGmB)eIQO&{Go>4rd)0yvi69 V6*#z=K*ciy14B@7kTa;b1^{Azys!WO literal 0 HcmV?d00001 diff --git a/demos/misc/scene_changer/scene_b.gd b/demos/misc/scene_changer/scene_b.gd new file mode 100644 index 0000000000..4f94d6bb8f --- /dev/null +++ b/demos/misc/scene_changer/scene_b.gd @@ -0,0 +1,17 @@ + +extends Panel + +# member variables here, example: +# var a=2 +# var b="textvar" + +func _ready(): + # Initalization here + pass + + + + +func _on_goto_scene_pressed(): + get_tree().change_scene("res://scene_a.scn") + pass # replace with function body diff --git a/demos/misc/scene_changer/scene_b.scn b/demos/misc/scene_changer/scene_b.scn new file mode 100644 index 0000000000000000000000000000000000000000..ae09eeff88389528d5fe1b014bb978668ac788c0 GIT binary patch literal 1448 zcmWFvc6Md}0RaYvI&KDr39JkZj0_A97#SIo7jQA~D6n${BqnF4rUWOa=A|m|J}_lq zU{SDRU{qjcWZ+X^<||4q&Mz%WPSwv#%uQwBR1jp3Pb$qz$w^H~kYg)OF3Kz@(QjZ& zFm+I3a(4+%5NBi%P|#O!WVF&(P*j-39G|48m7v1Fr6A6dlb@WJqaev-z;IWA*MZ>y z`w52@1||gw1}Oz*26hEz237@T1~vs|hc2dK1|j5(C&)X+ zGbZLJdLEXgm5FUToXT*4M#T#{IlTC8~K z0kekl#Kq4X#2gA7>>asTl1qz-L_07zNI5VwR^==AIa)GvUg@=W5OCmT z%17_39V8qSSSsR+ z@=Fp#nQ!x-+YVG~@_^xj1A~Lz6P|}G$wjHDc`6Sb6rM2Mbk<{L zU{G*sU}xZ2z|P3&+`!Kell;Tcj@3P1p(I}+vz}4GG2w&*gM*L5E7uoH#S97xLJUa? z%nbh*FgQ9nFgWnJym7eaz;Lj}A=yFM!PSAm!P7z6VV(oK%R&cjhZhd)j!X{ht~?Ix zj%p6h9;+M}9F{wHJI{1rchPc)cc^xV_ITkC{eYRlW0gmu!(vBshjIr7hj<5Thj<5e z2Y&|!kIxR%-KIHA_t@bu-SL*gbO&h%YX@lub{KvjzuBSNq1t7e13QDXLX87EgNy>Z zgENDy0=vU^cRL4h26+X32X@Ei1BV?pJA8Lv*f`gL*Ws)KgI64bq5=mu6R1pPU|get_root()->add_child(scene); + //sml->get_root()->add_child(scene); + sml->add_current_scene(scene); String iconpath = GLOBAL_DEF("application/icon","Variant()"""); if (iconpath!="") { diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index 9f2fadcb4d..4113fd1998 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -41,7 +41,7 @@ #include "scene/scene_string_names.h" #include "io/resource_loader.h" #include "viewport.h" - +#include "scene/resources/packed_scene.h" void SceneTree::tree_changed() { @@ -51,6 +51,9 @@ void SceneTree::tree_changed() { void SceneTree::node_removed(Node *p_node) { + if (current_scene==p_node) { + current_scene=NULL; + } emit_signal(node_removed_name,p_node); if (call_lock>0) call_skip.insert(p_node); @@ -984,6 +987,63 @@ Node *SceneTree::get_edited_scene_root() const { } #endif +void SceneTree::set_current_scene(Node* p_scene) { + + ERR_FAIL_COND(p_scene && p_scene->get_parent()!=root); + current_scene=p_scene; +} + +Node* SceneTree::get_current_scene() const{ + + return current_scene; +} + +void SceneTree::_change_scene(Node* p_to) { + + if (current_scene) { + memdelete( current_scene ); + current_scene=NULL; + } + + if (p_to) { + current_scene=p_to; + root->add_child(p_to); + } +} + +Error SceneTree::change_scene(const String& p_path){ + + Ref new_scene = ResourceLoader::load(p_path); + if (new_scene.is_null()) + return ERR_CANT_OPEN; + + return change_scene_to(new_scene); + +} +Error SceneTree::change_scene_to(const Ref& p_scene){ + + Node *new_scene=NULL; + if (p_scene.is_valid()) { + new_scene = p_scene->instance(); + ERR_FAIL_COND_V(!new_scene,ERR_CANT_CREATE); + } + + call_deferred("_change_scene",new_scene); + return OK; + +} +Error SceneTree::reload_current_scene() { + + ERR_FAIL_COND_V(!current_scene,ERR_UNCONFIGURED); + String fname = current_scene->get_filename(); + return change_scene(fname); +} + +void SceneTree::add_current_scene(Node * p_current) { + + current_scene=p_current; + root->add_child(p_current); +} void SceneTree::_bind_methods() { @@ -1016,10 +1076,11 @@ void SceneTree::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_screen_stretch","mode","aspect","minsize"),&SceneTree::set_screen_stretch); - ObjectTypeDB::bind_method(_MD("queue_delete","obj"),&SceneTree::queue_delete); + + MethodInfo mi; mi.name="call_group"; mi.arguments.push_back( PropertyInfo( Variant::INT, "flags")); @@ -1033,6 +1094,16 @@ void SceneTree::_bind_methods() { ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call_group",&SceneTree::_call_group,mi,defargs); + ObjectTypeDB::bind_method(_MD("set_current_scene","child_node"),&SceneTree::set_current_scene); + ObjectTypeDB::bind_method(_MD("get_current_scene"),&SceneTree::get_current_scene); + + ObjectTypeDB::bind_method(_MD("change_scene","path"),&SceneTree::change_scene); + ObjectTypeDB::bind_method(_MD("change_scene_to","packed_scene"),&SceneTree::change_scene_to); + + ObjectTypeDB::bind_method(_MD("reload_current_scene"),&SceneTree::reload_current_scene); + + ObjectTypeDB::bind_method(_MD("_change_scene"),&SceneTree::_change_scene); + ADD_SIGNAL( MethodInfo("tree_changed") ); ADD_SIGNAL( MethodInfo("node_removed",PropertyInfo( Variant::OBJECT, "node") ) ); ADD_SIGNAL( MethodInfo("screen_resized") ); @@ -1077,6 +1148,7 @@ SceneTree::SceneTree() { //root->set_world_2d( Ref( memnew( World2D ))); root->set_as_audio_listener(true); root->set_as_audio_listener_2d(true); + current_scene=NULL; stretch_mode=STRETCH_MODE_DISABLED; stretch_aspect=STRETCH_ASPECT_IGNORE; diff --git a/scene/main/scene_main_loop.h b/scene/main/scene_main_loop.h index fec4dd3908..e49c150fbf 100644 --- a/scene/main/scene_main_loop.h +++ b/scene/main/scene_main_loop.h @@ -42,7 +42,7 @@ class SceneTree; - +class PackedScene; class Node; class Viewport; @@ -136,7 +136,9 @@ private: Array _get_nodes_in_group(const StringName& p_group); + Node *current_scene; + void _change_scene(Node* p_to); //void _call_group(uint32_t p_call_flags,const StringName& p_group,const StringName& p_function,const Variant& p_arg1,const Variant& p_arg2); friend class Node; @@ -234,6 +236,17 @@ public: Node *get_edited_scene_root() const; #endif + void set_current_scene(Node* p_scene); + Node* get_current_scene() const; + Error change_scene(const String& p_path); + Error change_scene_to(const Ref& p_scene); + Error reload_current_scene(); + + //used by Main::start, don't use otherwise + void add_current_scene(Node * p_current); + + + SceneTree(); ~SceneTree();