1 files changed, 518 insertions, 0 deletions

diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index 13734f2c4..2e1fa2814 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -241,6 +241,8 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
 			lv[level]=it;
 		}
 
+		le_clear->set_disabled(false);
+		le_set->set_disabled(false);
 
 	} else if (p_msg=="stack_dump") {
 
@@ -342,6 +344,63 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
 		perf_history.push_front(p);
 		perf_draw->update();
 
+	} else if (p_msg=="error") {
+
+		Array err = p_data[0];
+
+		Array vals;
+		vals.push_back(err[0]);
+		vals.push_back(err[1]);
+		vals.push_back(err[2]);
+		vals.push_back(err[3]);
+
+		bool warning = err[9];
+		bool e;
+		String time = String("%d:%02d:%02d:%04d").sprintf(vals,&e);
+		String txt=time+" - "+String(err[8]);
+
+		String tooltip="Type:"+String(warning?"Warning":"Error");
+		tooltip+="\nDescription: "+String(err[8]);
+		tooltip+="\nTime: "+time;
+		tooltip+="\nC Error: "+String(err[7]);
+		tooltip+="\nC Source: "+String(err[5])+":"+String(err[6]);
+		tooltip+="\nC Function: "+String(err[4]);
+
+
+
+		error_list->add_item(txt,EditorNode::get_singleton()->get_gui_base()->get_icon(warning?"Warning":"Error","EditorIcons"));
+		error_list->set_item_tooltip( error_list->get_item_count() -1,tooltip );
+
+		int scc = p_data[1];
+
+		Array stack;
+		stack.resize(scc);
+		for(int i=0;i<scc;i++) {
+			stack[i]=p_data[2+i];
+		}
+
+		error_list->set_item_metadata( error_list->get_item_count() -1,stack );
+
+		error_count++;
+		/*
+		int count = p_data[1];
+
+		Array cstack;
+
+		OutputError oe = errors.front()->get();
+
+		packet_peer_stream->put_var(oe.hr);
+		packet_peer_stream->put_var(oe.min);
+		packet_peer_stream->put_var(oe.sec);
+		packet_peer_stream->put_var(oe.msec);
+		packet_peer_stream->put_var(oe.source_func);
+		packet_peer_stream->put_var(oe.source_file);
+		packet_peer_stream->put_var(oe.source_line);
+		packet_peer_stream->put_var(oe.error);
+		packet_peer_stream->put_var(oe.error_descr);
+		packet_peer_stream->put_var(oe.warning);
+		packet_peer_stream->put_var(oe.callstack);
+		*/
 	} else if (p_msg=="kill_me") {
 
 		editor->call_deferred("stop_child_process");
@@ -443,10 +502,23 @@ void ScriptEditorDebugger::_notification(int p_what) {
 			tb->set_hover_texture( get_icon("CloseHover","EditorIcons"));
 			tb->set_pressed_texture( get_icon("Close","EditorIcons"));
 			scene_tree_refresh->set_icon( get_icon("Reload","EditorIcons"));
+			le_set->connect("pressed",this,"_live_edit_set");
+			le_clear->connect("pressed",this,"_live_edit_clear");
+			error_list->connect("item_selected",this,"_error_selected");
+			error_stack->connect("item_selected",this,"_error_stack_selected");
 
 		} break;
 		case NOTIFICATION_PROCESS: {
 
+			if (error_count!=last_error_count) {
+
+				if (error_count==0) {
+					error_split->set_name("Errors");
+				} else {
+					error_split->set_name("Errors ("+itos(error_count)+")");
+				}
+				last_error_count=error_count;
+			}
 			if (connection.is_null()) {
 
 				if (server->is_connection_available()) {
@@ -468,6 +540,15 @@ void ScriptEditorDebugger::_notification(int p_what) {
 					emit_signal("show_debugger",true);
 					reason->set_text("Child Process Connected");
 					reason->set_tooltip("Child Process Connected");
+					scene_tree->clear();
+					le_set->set_disabled(true);
+					le_clear->set_disabled(false);
+					error_list->clear();
+					error_stack->clear();
+					error_count=0;
+					//live_edit_root->set_text("/root");
+
+					update_live_edit_root();
 
 				} else {
 
@@ -613,6 +694,10 @@ void ScriptEditorDebugger::stop(){
 		log_forced_visible=false;
 	}
 
+	node_path_cache.clear();
+	res_path_cache.clear();
+	le_clear->set_disabled(false);
+	le_set->set_disabled(true);
 
 
 	hide();
@@ -664,6 +749,381 @@ String ScriptEditorDebugger::get_var_value(const String& p_var) const {
 	return variables->get_var_value(p_var);
 }
 
+int ScriptEditorDebugger::_get_node_path_cache(const NodePath& p_path) {
+
+	const int *r = node_path_cache.getptr(p_path);
+	if (r)
+		return *r;
+
+	last_path_id++;
+
+	node_path_cache[p_path]=last_path_id;
+	Array msg;
+	msg.push_back("live_node_path");
+	msg.push_back(p_path);
+	msg.push_back(last_path_id);
+	ppeer->put_var(msg);
+
+
+	return last_path_id;
+}
+
+int ScriptEditorDebugger::_get_res_path_cache(const String& p_path) {
+
+	Map<String,int>::Element *E=res_path_cache.find(p_path);
+
+	if (E)
+		return E->get();
+
+	last_path_id++;
+
+	res_path_cache[p_path]=last_path_id;
+	Array msg;
+	msg.push_back("live_res_path");
+	msg.push_back(p_path);
+	msg.push_back(last_path_id);
+	ppeer->put_var(msg);
+
+
+	return last_path_id;
+}
+
+void ScriptEditorDebugger::_method_changed(Object*p_base,const StringName& p_name,VARIANT_ARG_DECLARE) {
+
+	if (!p_base || !live_debug || !connection.is_valid() || !editor->get_edited_scene())
+		return;
+
+	Node *node = p_base->cast_to<Node>();
+
+	VARIANT_ARGPTRS
+
+	for(int i=0;i<VARIANT_ARG_MAX;i++) {
+		//no pointers, sorry
+		if (argptr[i] && (argptr[i]->get_type()==Variant::OBJECT || argptr[i]->get_type()==Variant::_RID))
+			return;
+	}
+
+	if (node) {
+
+		NodePath path = editor->get_edited_scene()->get_path_to(node);
+		int pathid = _get_node_path_cache(path);
+
+
+
+		Array msg;
+		msg.push_back("live_node_call");
+		msg.push_back(pathid);
+		msg.push_back(p_name);
+		for(int i=0;i<VARIANT_ARG_MAX;i++) {
+			//no pointers, sorry
+			msg.push_back(*argptr[i]);
+		}
+		ppeer->put_var(msg);
+
+		return;
+
+	}
+
+	Resource *res = p_base->cast_to<Resource>();
+
+	if (res && res->get_path()!=String()) {
+
+		String respath = res->get_path();
+		int pathid = _get_res_path_cache(respath);
+
+		Array msg;
+		msg.push_back("live_res_call");
+		msg.push_back(pathid);
+		msg.push_back(p_name);
+		for(int i=0;i<VARIANT_ARG_MAX;i++) {
+			//no pointers, sorry
+			msg.push_back(*argptr[i]);
+		}
+		ppeer->put_var(msg);
+
+		return;
+	}
+
+	//print_line("method");
+}
+
+void ScriptEditorDebugger::_property_changed(Object*p_base,const StringName& p_property,const Variant& p_value){
+
+	if (!p_base || !live_debug || !connection.is_valid() || !editor->get_edited_scene())
+		return;
+
+	Node *node = p_base->cast_to<Node>();
+
+	if (node) {
+
+		NodePath path = editor->get_edited_scene()->get_path_to(node);
+		int pathid = _get_node_path_cache(path);
+
+
+		if (p_value.is_ref()) {
+			Ref<Resource> res = p_value;
+			if (res.is_valid() && res->get_path()!=String()) {
+
+				Array msg;
+				msg.push_back("live_node_prop_res");
+				msg.push_back(pathid);
+				msg.push_back(p_property);
+				msg.push_back(res->get_path());
+				ppeer->put_var(msg);
+			}
+		} else {
+
+			Array msg;
+			msg.push_back("live_node_prop");
+			msg.push_back(pathid);
+			msg.push_back(p_property);
+			msg.push_back(p_value);
+			ppeer->put_var(msg);
+		}
+
+
+		return;
+
+	}
+
+	Resource *res = p_base->cast_to<Resource>();
+
+	if (res && res->get_path()!=String()) {
+
+		String respath = res->get_path();
+		int pathid = _get_res_path_cache(respath);
+
+
+		if (p_value.is_ref()) {
+			Ref<Resource> res = p_value;
+			if (res.is_valid() && res->get_path()!=String()) {
+
+				Array msg;
+				msg.push_back("live_res_prop_res");
+				msg.push_back(pathid);
+				msg.push_back(p_property);
+				msg.push_back(res->get_path());
+				ppeer->put_var(msg);
+			}
+		} else {
+
+			Array msg;
+			msg.push_back("live_res_prop");
+			msg.push_back(pathid);
+			msg.push_back(p_property);
+			msg.push_back(p_value);
+			ppeer->put_var(msg);
+		}
+
+
+		return;
+	}
+
+
+	//print_line("prop");
+}
+
+void ScriptEditorDebugger::_method_changeds(void *p_ud,Object*p_base,const StringName& p_name,VARIANT_ARG_DECLARE) {
+
+	ScriptEditorDebugger *sed = (ScriptEditorDebugger*)p_ud;
+	sed->_method_changed(p_base,p_name,VARIANT_ARG_PASS);
+
+
+}
+
+void ScriptEditorDebugger::_property_changeds(void *p_ud,Object*p_base,const StringName& p_property,const Variant& p_value){
+
+	ScriptEditorDebugger *sed = (ScriptEditorDebugger*)p_ud;
+	sed->_property_changed(p_base,p_property,p_value);
+
+}
+
+void ScriptEditorDebugger::set_live_debugging(bool p_enable) {
+
+	live_debug=p_enable;
+}
+
+void ScriptEditorDebugger::_live_edit_set() {
+
+	if (!connection.is_valid())
+		return;
+
+	TreeItem* ti = scene_tree->get_selected();
+	if (!ti)
+		return;
+	String path;
+
+	while(ti) {
+		String lp=ti->get_text(0);
+		path="/"+lp+path;
+		ti=ti->get_parent();
+
+	}
+
+	NodePath np = path;
+
+	editor->get_editor_data().set_edited_scene_live_edit_root(np);
+
+	update_live_edit_root();
+
+
+}
+
+void ScriptEditorDebugger::_live_edit_clear() {
+
+	NodePath np = NodePath("/root");
+	editor->get_editor_data().set_edited_scene_live_edit_root(np);
+
+	update_live_edit_root();
+
+}
+
+void ScriptEditorDebugger::update_live_edit_root() {
+
+	NodePath np = editor->get_editor_data().get_edited_scene_live_edit_root();
+
+	if (connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_set_root");
+		msg.push_back(np);
+		if (editor->get_edited_scene())
+			msg.push_back(editor->get_edited_scene()->get_filename());
+		else
+			msg.push_back("");
+		ppeer->put_var(msg);
+	}
+	live_edit_root->set_text(np);
+
+}
+
+void ScriptEditorDebugger::live_debug_create_node(const NodePath& p_parent,const String& p_type,const String& p_name) {
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_create_node");
+		msg.push_back(p_parent);
+		msg.push_back(p_type);
+		msg.push_back(p_name);
+		ppeer->put_var(msg);
+	}
+}
+
+void ScriptEditorDebugger::live_debug_instance_node(const NodePath& p_parent,const String& p_path,const String& p_name){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_instance_node");
+		msg.push_back(p_parent);
+		msg.push_back(p_path);
+		msg.push_back(p_name);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_remove_node(const NodePath& p_at){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_remove_node");
+		msg.push_back(p_at);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_remove_and_keep_node(const NodePath& p_at,ObjectID p_keep_id) {
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_remove_and_keep_node");
+		msg.push_back(p_at);
+		msg.push_back(p_keep_id);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_restore_node(ObjectID p_id, const NodePath& p_at, int p_at_pos){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_restore_node");
+		msg.push_back(p_id);
+		msg.push_back(p_at);
+		msg.push_back(p_at_pos);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_duplicate_node(const NodePath& p_at,const String& p_new_name){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_duplicate_node");
+		msg.push_back(p_at);
+		msg.push_back(p_new_name);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_reparent_node(const NodePath& p_at, const NodePath& p_new_place, const String &p_new_name, int p_at_pos){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_reparent_node");
+		msg.push_back(p_at);
+		msg.push_back(p_new_place);
+		msg.push_back(p_new_name);
+		msg.push_back(p_at_pos);
+		ppeer->put_var(msg);
+	}
+
+}
+
+void ScriptEditorDebugger::set_breakpoint(const String& p_path,int p_line,bool p_enabled) {
+
+	if (connection.is_valid()) {
+	       Array msg;
+	       msg.push_back("breakpoint");
+	       msg.push_back(p_path);
+	       msg.push_back(p_line);
+	       msg.push_back(p_enabled);
+	       ppeer->put_var(msg);
+       }
+}
+
+
+void ScriptEditorDebugger::_error_selected(int p_idx) {
+
+	error_stack->clear();
+	Array st=error_list->get_item_metadata(p_idx);
+	for(int i=0;i<st.size();i+=2) {
+
+		String script=st[i];
+		int line=st[i+1];
+		Array md;
+		md.push_back(st[i]);
+		md.push_back(st[i+1]);
+
+		String str = script.get_file()+":"+itos(line);
+
+		error_stack->add_item(str);
+		error_stack->set_item_metadata(error_stack->get_item_count()-1,md);
+		error_stack->set_item_tooltip(error_stack->get_item_count()-1,"File: "+String(st[i])+"\nLine: "+itos(line));
+	}
+}
+
+void ScriptEditorDebugger:: _error_stack_selected(int p_idx){
+
+	Array arr = error_stack->get_item_metadata(p_idx);
+	if (arr.size()!=2)
+		return;
+
+
+	Ref<Script> s = ResourceLoader::load(arr[0]);
+	emit_signal("goto_script_line",s,int(arr[1])-1);
+
+}
+
+
 void ScriptEditorDebugger::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_stack_dump_frame_selected"),&ScriptEditorDebugger::_stack_dump_frame_selected);
@@ -676,6 +1136,19 @@ void ScriptEditorDebugger::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_performance_draw"),&ScriptEditorDebugger::_performance_draw);
 	ObjectTypeDB::bind_method(_MD("_performance_select"),&ScriptEditorDebugger::_performance_select);
 	ObjectTypeDB::bind_method(_MD("_scene_tree_request"),&ScriptEditorDebugger::_scene_tree_request);
+	ObjectTypeDB::bind_method(_MD("_live_edit_set"),&ScriptEditorDebugger::_live_edit_set);
+	ObjectTypeDB::bind_method(_MD("_live_edit_clear"),&ScriptEditorDebugger::_live_edit_clear);
+
+	ObjectTypeDB::bind_method(_MD("_error_selected"),&ScriptEditorDebugger::_error_selected);
+	ObjectTypeDB::bind_method(_MD("_error_stack_selected"),&ScriptEditorDebugger::_error_stack_selected);
+
+	ObjectTypeDB::bind_method(_MD("live_debug_create_node"),&ScriptEditorDebugger::live_debug_create_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_instance_node"),&ScriptEditorDebugger::live_debug_instance_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_remove_node"),&ScriptEditorDebugger::live_debug_remove_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_remove_and_keep_node"),&ScriptEditorDebugger::live_debug_remove_and_keep_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_restore_node"),&ScriptEditorDebugger::live_debug_restore_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_duplicate_node"),&ScriptEditorDebugger::live_debug_duplicate_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_reparent_node"),&ScriptEditorDebugger::live_debug_reparent_node);
 
 	ADD_SIGNAL(MethodInfo("goto_script_line"));
 	ADD_SIGNAL(MethodInfo("breaked",PropertyInfo(Variant::BOOL,"reallydid")));
@@ -789,6 +1262,23 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	vbc->add_child(hbc);
 
 
+	error_split = memnew( HSplitContainer );
+	VBoxContainer *errvb = memnew( VBoxContainer );
+	errvb->set_h_size_flags(SIZE_EXPAND_FILL);
+	error_list = memnew( ItemList );
+	errvb->add_margin_child("Errors:",error_list,true);
+	error_split->add_child(errvb);
+
+	errvb = memnew( VBoxContainer );
+	errvb->set_h_size_flags(SIZE_EXPAND_FILL);
+	error_stack = memnew( ItemList );
+	errvb->add_margin_child("Stack Trace (if applies):",error_stack,true);
+	error_split->add_child(errvb);
+
+	error_split->set_name("Errors");
+	tabs->add_child(error_split);
+
+
 	HSplitContainer *hsp = memnew( HSplitContainer );
 
 	perf_monitors = memnew(Tree);
@@ -843,6 +1333,26 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	info_left->add_margin_child("Clicked Control:",clicked_ctrl);
 	clicked_ctrl_type = memnew( LineEdit );
 	info_left->add_margin_child("Clicked Control Type:",clicked_ctrl_type);
+
+	live_edit_root = memnew( LineEdit );
+
+	{
+		HBoxContainer *lehb = memnew( HBoxContainer );
+		Label *l = memnew( Label("Live Edit Root:") );
+		lehb->add_child(l);
+		l->set_h_size_flags(SIZE_EXPAND_FILL);
+		le_set = memnew( Button("Set From Tree") );
+		lehb->add_child(le_set);
+		le_clear = memnew( Button("Clear") );
+		lehb->add_child(le_clear);
+		info_left->add_child(lehb);
+		MarginContainer *mc = memnew( MarginContainer );
+		mc->add_child(live_edit_root);
+		info_left->add_child(mc);
+		le_set->set_disabled(true);
+		le_clear->set_disabled(true);
+	}
+
 	VBoxContainer *info_right = memnew(VBoxContainer);
 	info_right->set_h_size_flags(SIZE_EXPAND_FILL);
 	info->add_child(info_right);
@@ -868,6 +1378,14 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	hide();
 	log_forced_visible=false;
 
+	p_editor->get_undo_redo()->set_method_notify_callback(_method_changeds,this);
+	p_editor->get_undo_redo()->set_property_notify_callback(_property_changeds,this);
+	live_debug=false;
+	last_path_id=false;
+	error_count=0;
+	last_error_count=0;
+
+
 }
 
 ScriptEditorDebugger::~ScriptEditorDebugger() {