1 files changed, 185 insertions, 9 deletions

diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 329c3fc1bb..1d4d8f6d4b 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -242,6 +242,11 @@ protected:
 			return true;
 		}
 
+		if (String(p_name)=="export") {
+			script->set_variable_export(var,p_value);
+			return true;
+		}
+
 
 		return false;
 	}
@@ -271,6 +276,11 @@ protected:
 			return true;
 		}
 
+		if (String(p_name)=="export") {
+			r_ret=script->get_variable_export(var);
+			return true;
+		}
+
 		return false;
 	}
 	void _get_property_list( List<PropertyInfo> *p_list) const {
@@ -286,6 +296,7 @@ protected:
 		p_list->push_back(PropertyInfo(script->get_variable_info(var).type,"value",script->get_variable_info(var).hint,script->get_variable_info(var).hint_string,PROPERTY_USAGE_DEFAULT));
 		p_list->push_back(PropertyInfo(Variant::INT,"hint",PROPERTY_HINT_ENUM,"None,Range,ExpRange,Enum,ExpEasing,Length,SpriteFrame,KeyAccel,BitFlags,AllFlags,File,Dir,GlobalFile,GlobalDir,ResourceType,MultilineText"));
 		p_list->push_back(PropertyInfo(Variant::STRING,"hint_string"));
+		p_list->push_back(PropertyInfo(Variant::BOOL,"export"));
 
 	}
 
@@ -302,9 +313,45 @@ public:
 };
 
 static Color _color_from_type(Variant::Type p_type) {
-
 	Color color;
-	color.set_hsv(p_type/float(Variant::VARIANT_MAX),0.7,0.7);
+	switch(p_type) {
+		case Variant::NIL: color = Color::html("69ecbd"); break;
+
+		case Variant::BOOL: color = Color::html("8da6f0"); break;
+		case Variant::INT: color = Color::html("7dc6ef"); break;
+		case Variant::REAL: color = Color::html("61daf4"); break;
+		case Variant::STRING: color = Color::html("6ba7ec"); break;
+
+		case Variant::VECTOR2: color = Color::html("bd91f1"); break;
+		case Variant::RECT2: color = Color::html("f191a5"); break;
+		case Variant::VECTOR3: color = Color::html("d67dee"); break;
+		case Variant::MATRIX32: color = Color::html("c4ec69"); break;
+		case Variant::PLANE: color = Color::html("f77070"); break;
+		case Variant::QUAT: color = Color::html("ec69a3"); break;
+		case Variant::_AABB: color = Color::html("ee7991"); break;
+		case Variant::MATRIX3: color = Color::html("e3ec69"); break;
+		case Variant::TRANSFORM: color = Color::html("ecd669"); break;
+
+		case Variant::COLOR: color = Color::html("9dff70"); break;
+		case Variant::IMAGE: color = Color::html("93f1b9"); break;
+		case Variant::NODE_PATH: color = Color::html("6993ec"); break;
+		case Variant::_RID: color = Color::html("69ec9a"); break;
+		case Variant::OBJECT: color = Color::html("79f3e8"); break;
+		case Variant::INPUT_EVENT: color = Color::html("adf18f"); break;
+		case Variant::DICTIONARY: color = Color::html("77edb1"); break;
+
+		case Variant::ARRAY: color = Color::html("e0e0e0"); break;
+		case Variant::RAW_ARRAY: color = Color::html("aaf4c8"); break;
+		case Variant::INT_ARRAY: color = Color::html("afdcf5"); break;
+		case Variant::REAL_ARRAY: color = Color::html("97e7f8"); break;
+		case Variant::STRING_ARRAY: color = Color::html("9dc4f2"); break;
+		case Variant::VECTOR2_ARRAY: color = Color::html("d1b3f5"); break;
+		case Variant::VECTOR3_ARRAY: color = Color::html("df9bf2"); break;
+		case Variant::COLOR_ARRAY: color = Color::html("e9ff97"); break;
+
+		default:
+			color.set_hsv(p_type/float(Variant::VARIANT_MAX),0.7,0.7);
+	}
 	return color;
 }
 
@@ -649,12 +696,48 @@ void VisualScriptEditor::_update_members() {
 	variables->add_button(0,Control::get_icon("Add","EditorIcons"));
 	variables->set_custom_bg_color(0,Control::get_color("prop_section","Editor"));
 
+	Ref<Texture> type_icons[Variant::VARIANT_MAX]={
+		Control::get_icon("MiniVariant","EditorIcons"),
+		Control::get_icon("MiniBoolean","EditorIcons"),
+		Control::get_icon("MiniInteger","EditorIcons"),
+		Control::get_icon("MiniFloat","EditorIcons"),
+		Control::get_icon("MiniString","EditorIcons"),
+		Control::get_icon("MiniVector2","EditorIcons"),
+		Control::get_icon("MiniRect2","EditorIcons"),
+		Control::get_icon("MiniVector3","EditorIcons"),
+		Control::get_icon("MiniMatrix32","EditorIcons"),
+		Control::get_icon("MiniPlane","EditorIcons"),
+		Control::get_icon("MiniQuat","EditorIcons"),
+		Control::get_icon("MiniAabb","EditorIcons"),
+		Control::get_icon("MiniMatrix3","EditorIcons"),
+		Control::get_icon("MiniTransform","EditorIcons"),
+		Control::get_icon("MiniColor","EditorIcons"),
+		Control::get_icon("MiniImage","EditorIcons"),
+		Control::get_icon("MiniPath","EditorIcons"),
+		Control::get_icon("MiniRid","EditorIcons"),
+		Control::get_icon("MiniObject","EditorIcons"),
+		Control::get_icon("MiniInput","EditorIcons"),
+		Control::get_icon("MiniDictionary","EditorIcons"),
+		Control::get_icon("MiniArray","EditorIcons"),
+		Control::get_icon("MiniRawArray","EditorIcons"),
+		Control::get_icon("MiniIntArray","EditorIcons"),
+		Control::get_icon("MiniFloatArray","EditorIcons"),
+		Control::get_icon("MiniStringArray","EditorIcons"),
+		Control::get_icon("MiniVector2Array","EditorIcons"),
+		Control::get_icon("MiniVector3Array","EditorIcons"),
+		Control::get_icon("MiniColorArray","EditorIcons")
+	};
 
 	List<StringName> var_names;
 	script->get_variable_list(&var_names);
 	for (List<StringName>::Element *E=var_names.front();E;E=E->next()) {
 		TreeItem *ti = members->create_item(variables);
+
 		ti->set_text(0,E->get());
+		Variant var = script->get_variable_default_value(E->get());
+		ti->set_suffix(0,"="+String(var));
+		ti->set_icon(0,type_icons[script->get_variable_info(E->get()).type]);
+
 		ti->set_selectable(0,true);
 		ti->set_editable(0,true);
 		ti->add_button(0,Control::get_icon("Edit","EditorIcons"),0);
@@ -1426,6 +1509,8 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2& p_point,const Variant& p
 					String(d["type"])=="visual_script_variable_drag" ||
 					String(d["type"])=="visual_script_signal_drag" ||
 					String(d["type"])=="obj_property" ||
+					String(d["type"])=="resource" ||
+					String(d["type"])=="files" ||
 					String(d["type"])=="nodes"
 				) ) {
 
@@ -1586,13 +1671,14 @@ void VisualScriptEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat
 			Ref<VisualScriptFunctionCall> vnode;
 			vnode.instance();
 			vnode->set_call_mode(VisualScriptFunctionCall::CALL_MODE_SELF);
-			vnode->set_base_type(script->get_instance_base_type());
-			vnode->set_function(d["function"]);
 
 			int new_id = script->get_available_id();
 
 			undo_redo->create_action(TTR("Add Node"));
 			undo_redo->add_do_method(script.ptr(),"add_node",edited_func,new_id,vnode,ofs);
+			undo_redo->add_do_method(vnode.ptr(),"set_base_type",script->get_instance_base_type());
+			undo_redo->add_do_method(vnode.ptr(),"set_function",d["function"]);
+
 			undo_redo->add_undo_method(script.ptr(),"remove_node",edited_func,new_id);
 			undo_redo->add_do_method(this,"_update_graph");
 			undo_redo->add_undo_method(this,"_update_graph");
@@ -1634,8 +1720,90 @@ void VisualScriptEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat
 			if (node) {
 				graph->set_selected(node);
 				_node_selected(node);
+			}			
+		}
+
+		if (d.has("type") && String(d["type"])=="resource") {
+
+			Vector2 ofs = graph->get_scroll_ofs() + p_point;
+			if (graph->is_using_snap()) {
+				int snap = graph->get_snap();
+				ofs = ofs.snapped(Vector2(snap,snap));
+			}
+
+			ofs/=EDSCALE;
+
+			Ref<VisualScriptPreload> prnode;
+			prnode.instance();
+			prnode->set_preload(d["resource"]);
+
+			int new_id = script->get_available_id();
+
+			undo_redo->create_action(TTR("Add Preload Node"));
+			undo_redo->add_do_method(script.ptr(),"add_node",edited_func,new_id,prnode,ofs);
+			undo_redo->add_undo_method(script.ptr(),"remove_node",edited_func,new_id);
+			undo_redo->add_do_method(this,"_update_graph");
+			undo_redo->add_undo_method(this,"_update_graph");
+			undo_redo->commit_action();
+
+			Node* node = graph->get_node(itos(new_id));
+			if (node) {
+				graph->set_selected(node);
+				_node_selected(node);
 			}
 		}
+
+		if (d.has("type") && String(d["type"])=="files") {
+
+			Vector2 ofs = graph->get_scroll_ofs() + p_point;
+			if (graph->is_using_snap()) {
+				int snap = graph->get_snap();
+				ofs = ofs.snapped(Vector2(snap,snap));
+			}
+
+			ofs/=EDSCALE;
+
+			Array files = d["files"];
+
+			List<int> new_ids;
+			int new_id = script->get_available_id();
+
+			if (files.size()) {
+				undo_redo->create_action(TTR("Add Preload Node"));
+
+				for(int i=0;i<files.size();i++) {
+
+					Ref<Resource> res = ResourceLoader::load(files[i]);
+					if (!res.is_valid())
+						continue;
+
+					Ref<VisualScriptPreload> prnode;
+					prnode.instance();
+					prnode->set_preload(res);
+
+					undo_redo->add_do_method(script.ptr(),"add_node",edited_func,new_id,prnode,ofs);
+					undo_redo->add_undo_method(script.ptr(),"remove_node",edited_func,new_id);
+					new_ids.push_back(new_id);
+					new_id++;
+					ofs+=Vector2(20,20)*EDSCALE;
+				}
+
+
+				undo_redo->add_do_method(this,"_update_graph");
+				undo_redo->add_undo_method(this,"_update_graph");
+				undo_redo->commit_action();
+			}
+
+			for(List<int>::Element *E=new_ids.front();E;E=E->next()) {
+
+				Node* node = graph->get_node(itos(E->get()));
+				if (node) {
+					graph->set_selected(node);
+					_node_selected(node);
+				}
+			}
+		}
+
 		if (d.has("type") && String(d["type"])=="nodes") {
 
 			Node* sn = _find_script_node(get_tree()->get_edited_scene_root(),get_tree()->get_edited_scene_root(),script);
@@ -1808,16 +1976,24 @@ void VisualScriptEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat
 
 					Ref<VisualScriptPropertySet> pset;
 					pset.instance();
-					pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_NODE_PATH);
-					pset->set_base_path(sn->get_path_to(node));
+					if (sn==node) {
+						pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_SELF);
+					} else {
+						pset->set_call_mode(VisualScriptPropertySet::CALL_MODE_NODE_PATH);
+						pset->set_base_path(sn->get_path_to(node));
+					}
 
 					vnode=pset;
 				} else {
 
 					Ref<VisualScriptPropertyGet> pget;
 					pget.instance();
-					pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_NODE_PATH);
-					pget->set_base_path(sn->get_path_to(node));
+					if (sn==node) {
+						pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_SELF);
+					} else {
+						pget->set_call_mode(VisualScriptPropertyGet::CALL_MODE_NODE_PATH);
+						pget->set_base_path(sn->get_path_to(node));
+					}
 					vnode=pget;
 
 				}
@@ -2491,7 +2667,7 @@ void VisualScriptEditor::_comment_node_resized(const Vector2& p_new_size,int p_n
 
 	graph->set_block_minimum_size_adjust(true); //faster resize
 
-	undo_redo->create_action("Resize Comment",true);
+	undo_redo->create_action("Resize Comment",UndoRedo::MERGE_ENDS);
 	undo_redo->add_do_method(vsc.ptr(),"set_size",p_new_size/EDSCALE);
 	undo_redo->add_undo_method(vsc.ptr(),"set_size",vsc->get_size());
 	undo_redo->commit_action();