3D Physics and Other Stuff

-=-=-=-=-=-=-=-=-=-=-=-=-=

-New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too.
-A lot of fixes to the 3D physics engine
-Added KinematicBody with demo
-Fixed the space query API for 2D (demo will come soon). 3D is WIP.
-Fixed long-standing bug with body_enter/body_exit for Area and Area2D
-Performance variables now includes physics (active bodies, collision pairs and islands)
-Ability to see what's inside of instanced scenes!
-Fixed Blend Shapes (no bs+skeleton yet)
-Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!

1 files changed, 80 insertions, 7 deletions

diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index e0202be84e..59bc24487a 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -45,6 +45,40 @@ Node *SceneTreeEditor::get_scene_node() {
 	return NULL;
 }
 
+
+void SceneTreeEditor::_subscene_option(int p_idx) {
+
+	Object *obj = ObjectDB::get_instance(instance_node);
+	if (!obj)
+		return;
+	Node *node = obj->cast_to<Node>();
+	if (!node)
+		return;
+
+	switch(p_idx) {
+
+		case SCENE_MENU_SHOW_CHILDREN: {
+
+			if (node->has_meta("__editor_show_subtree")) {
+				instance_menu->set_item_checked(0,true);
+				node->set_meta("__editor_show_subtree",Variant());
+				_update_tree();
+			} else {
+				node->set_meta("__editor_show_subtree",true);
+				_update_tree();
+			}
+
+		} break;
+		case SCENE_MENU_OPEN: {
+
+			emit_signal("open",node->get_filename());
+		} break;
+
+	}
+
+}
+
+
 void SceneTreeEditor::_cell_button_pressed(Object *p_item,int p_column,int p_id) {
 
 	TreeItem *item=p_item->cast_to<TreeItem>();
@@ -57,7 +91,19 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item,int p_column,int p_id)
 
 	if (p_id==BUTTON_SUBSCENE) {
 		//open scene request
-		emit_signal("open",n->get_filename());
+		Rect2 item_rect = tree->get_item_rect(item,0);
+		item_rect.pos.y-=tree->get_scroll().y;
+		item_rect.pos+=tree->get_global_pos();
+		instance_menu->set_pos(item_rect.pos+Vector2(0,item_rect.size.y));
+		instance_menu->set_size(Vector2(item_rect.size.x,0));
+		if (n->has_meta("__editor_show_subtree"))
+			instance_menu->set_item_checked(0,true);
+		else
+			instance_menu->set_item_checked(0,false);
+
+		instance_menu->popup();
+		instance_node=n->get_instance_ID();
+		//emit_signal("open",n->get_filename());
 	} else if (p_id==BUTTON_SCRIPT) {
 		RefPtr script=n->get_script();
 		if (!script.is_null())
@@ -119,9 +165,19 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 
 	// only owned nodes are editable, since nodes can create their own (manually owned) child nodes,
 	// which the editor needs not to know about.
-	
-	if (!display_foreign && p_node->get_owner()!=get_scene_node() && p_node!=get_scene_node())
-		return;
+
+	bool part_of_subscene=false;
+
+	if (!display_foreign && p_node->get_owner()!=get_scene_node() && p_node!=get_scene_node()) {
+
+		if ((show_enabled_subscene || can_open_instance) && p_node->get_owner() && p_node->get_owner()->get_owner()==get_scene_node() && p_node->get_owner()->has_meta("__editor_show_subtree")) {
+
+			part_of_subscene=true;
+			//allow
+		} else {
+			return;
+		}
+	}
 
 	TreeItem *item = tree->create_item(p_parent);
 	item->set_text(0, p_node->get_name() );
@@ -143,8 +199,12 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 		icon=get_icon( (has_icon(p_node->get_type(),"EditorIcons")?p_node->get_type():String("Object")),"EditorIcons");
 	item->set_icon(0, icon );
 	item->set_metadata( 0,p_node->get_path() );	
-	
-	if (marked.has(p_node)) {
+	if (part_of_subscene) {
+
+		//item->set_selectable(0,marked_selectable);
+		item->set_custom_color(0,Color(0.8,0.4,0.20));
+
+	} else if (marked.has(p_node)) {
 				
 		item->set_selectable(0,marked_selectable);
 		item->set_custom_color(0,Color(0.8,0.1,0.10));
@@ -163,7 +223,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 
 	if (p_node!=get_scene_node() && p_node->get_filename()!="" && can_open_instance) {
 
-		item->add_button(0,get_icon("Load","EditorIcons"),BUTTON_SUBSCENE);
+		item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE);
 		item->set_tooltip(0,"Instance: "+p_node->get_filename());
 	}
 
@@ -425,6 +485,7 @@ void SceneTreeEditor::_notification(int p_what) {
 
 		get_scene()->connect("tree_changed",this,"_tree_changed");
 		get_scene()->connect("node_removed",this,"_node_removed");
+		instance_menu->set_item_icon(2,get_icon("Load","EditorIcons"));
 		tree->connect("item_collapsed",this,"_cell_collapsed");
 
 //		get_scene()->connect("tree_changed",this,"_tree_changed",Vector<Variant>(),CONNECT_DEFERRED);
@@ -646,6 +707,7 @@ void SceneTreeEditor::_cell_collapsed(Object *p_obj) {
 }
 
 
+
 void SceneTreeEditor::_bind_methods() {
 	
 	ObjectTypeDB::bind_method("_tree_changed",&SceneTreeEditor::_tree_changed);
@@ -659,6 +721,7 @@ void SceneTreeEditor::_bind_methods() {
 	ObjectTypeDB::bind_method("_selection_changed",&SceneTreeEditor::_selection_changed);
 	ObjectTypeDB::bind_method("_cell_button_pressed",&SceneTreeEditor::_cell_button_pressed);
 	ObjectTypeDB::bind_method("_cell_collapsed",&SceneTreeEditor::_cell_collapsed);
+	ObjectTypeDB::bind_method("_subscene_option",&SceneTreeEditor::_subscene_option);
 
 	ObjectTypeDB::bind_method("_node_script_changed",&SceneTreeEditor::_node_script_changed);
 	ObjectTypeDB::bind_method("_node_visibility_changed",&SceneTreeEditor::_node_visibility_changed);
@@ -714,10 +777,20 @@ SceneTreeEditor::SceneTreeEditor(bool p_label,bool p_can_rename, bool p_can_open
 	error = memnew( AcceptDialog );
 	add_child(error);
 
+	show_enabled_subscene=false;
+
 	last_hash=0;
 	pending_test_update=false;
 	updating_tree=false;
 	blocked=0;
+
+	instance_menu = memnew( PopupMenu );
+	instance_menu->add_check_item("Show Children",SCENE_MENU_SHOW_CHILDREN);
+	instance_menu->add_separator();
+	instance_menu->add_item("Open in Editor",SCENE_MENU_OPEN);
+	instance_menu->connect("item_pressed",this,"_subscene_option");
+	add_child(instance_menu);
+
 }