diff options
Diffstat (limited to 'editor/script_editor_debugger.cpp')
| -rw-r--r-- | editor/script_editor_debugger.cpp | 1189 |
1 files changed, 521 insertions, 668 deletions
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index fa33ffe5c7..b7a904c255 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -28,150 +28,134 @@ /*************************************************************************/ #include "script_editor_debugger.h" -#include "scene/gui/separator.h" -#include "scene/gui/label.h" -#include "scene/gui/split_container.h" -#include "scene/gui/tree.h" -#include "scene/gui/texture_button.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/rich_text_label.h" -#include "scene/gui/margin_container.h" -#include "property_editor.h" -#include "global_config.h" #include "editor_node.h" -#include "main/performance.h" #include "editor_profiler.h" #include "editor_settings.h" +#include "global_config.h" +#include "main/performance.h" +#include "property_editor.h" +#include "scene/gui/dialogs.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/margin_container.h" +#include "scene/gui/rich_text_label.h" +#include "scene/gui/separator.h" +#include "scene/gui/split_container.h" +#include "scene/gui/tab_container.h" +#include "scene/gui/texture_button.h" +#include "scene/gui/tree.h" class ScriptEditorDebuggerVariables : public Object { - GDCLASS( ScriptEditorDebuggerVariables, Object ); + GDCLASS(ScriptEditorDebuggerVariables, Object); List<PropertyInfo> props; - Map<StringName,Variant> values; -protected: + Map<StringName, Variant> values; - bool _set(const StringName& p_name, const Variant& p_value) { +protected: + bool _set(const StringName &p_name, const Variant &p_value) { return false; } - bool _get(const StringName& p_name,Variant &r_ret) const { + bool _get(const StringName &p_name, Variant &r_ret) const { if (!values.has(p_name)) return false; - r_ret=values[p_name]; + r_ret = values[p_name]; return true; } - void _get_property_list( List<PropertyInfo> *p_list) const { + void _get_property_list(List<PropertyInfo> *p_list) const { - for(const List<PropertyInfo>::Element *E=props.front();E;E=E->next() ) + for (const List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) p_list->push_back(E->get()); } - public: - - void clear() { props.clear(); values.clear(); } - String get_var_value(const String& p_var) const { + String get_var_value(const String &p_var) const { - for(Map<StringName,Variant>::Element *E=values.front();E;E=E->next()) { - String v = E->key().operator String().get_slice("/",1); - if (v==p_var) + for (Map<StringName, Variant>::Element *E = values.front(); E; E = E->next()) { + String v = E->key().operator String().get_slice("/", 1); + if (v == p_var) return E->get(); } return ""; } - void add_property(const String &p_name, const Variant& p_value) { + void add_property(const String &p_name, const Variant &p_value) { PropertyInfo pinfo; - pinfo.name=p_name; - pinfo.type=p_value.get_type(); + pinfo.name = p_name; + pinfo.type = p_value.get_type(); props.push_back(pinfo); - values[p_name]=p_value; - + values[p_name] = p_value; } void update() { _change_notify(); } - ScriptEditorDebuggerVariables() { - } }; - class ScriptEditorDebuggerInspectedObject : public Object { - GDCLASS( ScriptEditorDebuggerInspectedObject, Object); - - - + GDCLASS(ScriptEditorDebuggerInspectedObject, Object); protected: - - bool _set(const StringName& p_name, const Variant& p_value) { + bool _set(const StringName &p_name, const Variant &p_value) { if (!prop_values.has(p_name)) return false; - emit_signal("value_edited",p_name,p_value); - prop_values[p_name]=p_value; + emit_signal("value_edited", p_name, p_value); + prop_values[p_name] = p_value; return true; } - bool _get(const StringName& p_name,Variant &r_ret) const { + bool _get(const StringName &p_name, Variant &r_ret) const { if (!prop_values.has(p_name)) return false; - r_ret=prop_values[p_name]; + r_ret = prop_values[p_name]; return true; - } - void _get_property_list( List<PropertyInfo> *p_list) const { + void _get_property_list(List<PropertyInfo> *p_list) const { p_list->clear(); //sorry, no want category - for (const List<PropertyInfo>::Element *E=prop_list.front();E;E=E->next()) { + for (const List<PropertyInfo>::Element *E = prop_list.front(); E; E = E->next()) { p_list->push_back(E->get()); } } - static void _bind_methods() { ADD_SIGNAL(MethodInfo("value_edited")); } public: - ObjectID last_edited_id; List<PropertyInfo> prop_list; - Map<StringName,Variant> prop_values; + Map<StringName, Variant> prop_values; void update() { _change_notify(); } - void update_single(const char* p_prop) { + void update_single(const char *p_prop) { _change_notify(p_prop); } - ScriptEditorDebuggerInspectedObject() { last_edited_id=0; } - - + ScriptEditorDebuggerInspectedObject() { last_edited_id = 0; } }; void ScriptEditorDebugger::debug_next() { @@ -184,7 +168,6 @@ void ScriptEditorDebugger::debug_next() { ppeer->put_var(msg); stack_dump->clear(); inspector->edit(NULL); - } void ScriptEditorDebugger::debug_step() { @@ -208,7 +191,6 @@ void ScriptEditorDebugger::debug_break() { Array msg; msg.push_back("break"); ppeer->put_var(msg); - } void ScriptEditorDebugger::debug_continue() { @@ -222,18 +204,15 @@ void ScriptEditorDebugger::debug_continue() { Array msg; msg.push_back("continue"); ppeer->put_var(msg); - - } -void ScriptEditorDebugger::_scene_tree_folded(Object* obj) { - +void ScriptEditorDebugger::_scene_tree_folded(Object *obj) { if (updating_scene_tree) { return; } - TreeItem *item=obj->cast_to<TreeItem>(); + TreeItem *item = obj->cast_to<TreeItem>(); if (!item) return; @@ -244,13 +223,10 @@ void ScriptEditorDebugger::_scene_tree_folded(Object* obj) { } else { unfold_cache.insert(id); } - - } void ScriptEditorDebugger::_scene_tree_selected() { - if (updating_scene_tree) { return; @@ -267,11 +243,9 @@ void ScriptEditorDebugger::_scene_tree_selected() { msg.push_back("inspect_object"); msg.push_back(inspected_object_id); ppeer->put_var(msg); - } -void ScriptEditorDebugger::_scene_tree_property_value_edited(const String& p_prop,const Variant& p_value) { - +void ScriptEditorDebugger::_scene_tree_property_value_edited(const String &p_prop, const Variant &p_value) { Array msg; msg.push_back("set_object_property"); @@ -279,17 +253,16 @@ void ScriptEditorDebugger::_scene_tree_property_value_edited(const String& p_pro msg.push_back(p_prop); msg.push_back(p_value); ppeer->put_var(msg); - inspect_edited_object_timeout=0.7; //avoid annoyance, don't request soon after editing + inspect_edited_object_timeout = 0.7; //avoid annoyance, don't request soon after editing } void ScriptEditorDebugger::_scene_tree_property_select_object(ObjectID p_object) { - inspected_object_id=p_object; + inspected_object_id = p_object; Array msg; msg.push_back("inspect_object"); msg.push_back(inspected_object_id); ppeer->put_var(msg); - } void ScriptEditorDebugger::_scene_tree_request() { @@ -300,7 +273,6 @@ void ScriptEditorDebugger::_scene_tree_request() { Array msg; msg.push_back("request_scene_tree"); ppeer->put_var(msg); - } void ScriptEditorDebugger::_video_mem_request() { @@ -311,38 +283,34 @@ void ScriptEditorDebugger::_video_mem_request() { Array msg; msg.push_back("request_video_mem"); ppeer->put_var(msg); - } Size2 ScriptEditorDebugger::get_minimum_size() const { Size2 ms = Control::get_minimum_size(); - ms.y = MAX(ms.y , 250 ); + ms.y = MAX(ms.y, 250); return ms; - } -void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_data) { +void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_data) { - - - if (p_msg=="debug_enter") { + if (p_msg == "debug_enter") { Array msg; msg.push_back("get_stack_dump"); ppeer->put_var(msg); - ERR_FAIL_COND(p_data.size()!=2); - bool can_continue=p_data[0]; + ERR_FAIL_COND(p_data.size() != 2); + bool can_continue = p_data[0]; String error = p_data[1]; step->set_disabled(!can_continue); next->set_disabled(!can_continue); reason->set_text(error); reason->set_tooltip(error); - breaked=true; + breaked = true; dobreak->set_disabled(true); docontinue->set_disabled(false); - emit_signal("breaked",true,can_continue); + emit_signal("breaked", true, can_continue); OS::get_singleton()->move_window_to_foreground(); - if (error!="") { + if (error != "") { tabs->set_current_tab(0); } @@ -350,12 +318,11 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat EditorNode::get_singleton()->get_pause_button()->set_pressed(true); - EditorNode::get_singleton()->make_bottom_panel_item_visible(this); - } else if (p_msg=="debug_exit") { + } else if (p_msg == "debug_exit") { - breaked=false; + breaked = false; step->set_disabled(true); next->set_disabled(true); reason->set_text(""); @@ -364,47 +331,45 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat forward->set_disabled(true); dobreak->set_disabled(false); docontinue->set_disabled(true); - emit_signal("breaked",false,false,Variant()); + emit_signal("breaked", false, false, Variant()); //tabs->set_current_tab(0); profiler->set_enabled(true); profiler->disable_seeking(); EditorNode::get_singleton()->get_pause_button()->set_pressed(false); - - } else if (p_msg=="message:click_ctrl") { + } else if (p_msg == "message:click_ctrl") { clicked_ctrl->set_text(p_data[0]); clicked_ctrl_type->set_text(p_data[1]); - } else if (p_msg=="message:scene_tree") { + } else if (p_msg == "message:scene_tree") { inspect_scene_tree->clear(); - Map<int,TreeItem*> lv; + Map<int, TreeItem *> lv; - updating_scene_tree=true; + updating_scene_tree = true; - for(int i=0;i<p_data.size();i+=4) { + for (int i = 0; i < p_data.size(); i += 4) { TreeItem *p; int level = p_data[i]; - if (level==0) { + if (level == 0) { p = NULL; } else { - ERR_CONTINUE(!lv.has(level-1)); - p=lv[level-1]; + ERR_CONTINUE(!lv.has(level - 1)); + p = lv[level - 1]; } - TreeItem *it = inspect_scene_tree->create_item(p); - ObjectID id = ObjectID(p_data[i+3]); + ObjectID id = ObjectID(p_data[i + 3]); - it->set_text(0,p_data[i+1]); - if (has_icon(p_data[i+2],"EditorIcons")) - it->set_icon(0,get_icon(p_data[i+2],"EditorIcons")); - it->set_metadata(0,id); - if (id==inspected_object_id) { + it->set_text(0, p_data[i + 1]); + if (has_icon(p_data[i + 2], "EditorIcons")) + it->set_icon(0, get_icon(p_data[i + 2], "EditorIcons")); + it->set_metadata(0, id); + if (id == inspected_object_id) { it->select(0); } @@ -417,100 +382,93 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat it->set_collapsed(true); } } - lv[level]=it; + lv[level] = it; } - updating_scene_tree=false; + updating_scene_tree = false; le_clear->set_disabled(false); le_set->set_disabled(false); - } else if (p_msg=="message:inspect_object") { - + } else if (p_msg == "message:inspect_object") { ObjectID id = p_data[0]; String type = p_data[1]; Variant path = p_data[2]; //what to do yet, i don't know - int prop_count=p_data[3]; + int prop_count = p_data[3]; - int idx=4; + int idx = 4; - - if (inspected_object->last_edited_id!=id) { + if (inspected_object->last_edited_id != id) { inspected_object->prop_list.clear(); inspected_object->prop_values.clear(); } - for(int i=0;i<prop_count;i++) { + for (int i = 0; i < prop_count; i++) { PropertyInfo pinfo; - pinfo.name=p_data[idx++]; - pinfo.type=Variant::Type(int(p_data[idx++])); - pinfo.hint=PropertyHint(int(p_data[idx++])); - pinfo.hint_string=p_data[idx++]; + pinfo.name = p_data[idx++]; + pinfo.type = Variant::Type(int(p_data[idx++])); + pinfo.hint = PropertyHint(int(p_data[idx++])); + pinfo.hint_string = p_data[idx++]; if (pinfo.name.begins_with("*")) { - pinfo.name=pinfo.name.substr(1,pinfo.name.length()); - pinfo.usage=PROPERTY_USAGE_CATEGORY; + pinfo.name = pinfo.name.substr(1, pinfo.name.length()); + pinfo.usage = PROPERTY_USAGE_CATEGORY; } else { - pinfo.usage=PROPERTY_USAGE_EDITOR; + pinfo.usage = PROPERTY_USAGE_EDITOR; } - if (inspected_object->last_edited_id!=id) { + if (inspected_object->last_edited_id != id) { //don't update.. it's the same, instead refresh inspected_object->prop_list.push_back(pinfo); } + inspected_object->prop_values[pinfo.name] = p_data[idx++]; - inspected_object->prop_values[pinfo.name]=p_data[idx++]; - - if (inspected_object->last_edited_id==id) { + if (inspected_object->last_edited_id == id) { //same, just update value, don't rebuild inspected_object->update_single(pinfo.name.ascii().get_data()); } - } - - - if (inspected_object->last_edited_id!=id) { + if (inspected_object->last_edited_id != id) { //only if different inspected_object->update(); } - inspected_object->last_edited_id=id; - + inspected_object->last_edited_id = id; inspect_properties->edit(inspected_object); - } else if (p_msg=="message:video_mem") { + } else if (p_msg == "message:video_mem") { vmem_tree->clear(); - TreeItem* root=vmem_tree->create_item(); + TreeItem *root = vmem_tree->create_item(); - int total=0; + int total = 0; - for(int i=0;i<p_data.size();i+=4) { + for (int i = 0; i < p_data.size(); i += 4) { TreeItem *it = vmem_tree->create_item(root); - String type=p_data[i+1]; - int bytes=p_data[i+3].operator int(); - it->set_text(0,p_data[i+0]); //path - it->set_text(1,type); //type - it->set_text(2,p_data[i+2]); //type - it->set_text(3,String::humanize_size(bytes)); //type - total+=bytes; - - if (has_icon(type,"EditorIcons")) - it->set_icon(0,get_icon(type,"EditorIcons")); + String type = p_data[i + 1]; + int bytes = p_data[i + 3].operator int(); + it->set_text(0, p_data[i + 0]); //path + it->set_text(1, type); //type + it->set_text(2, p_data[i + 2]); //type + it->set_text(3, String::humanize_size(bytes)); //type + total += bytes; + + if (has_icon(type, "EditorIcons")) + it->set_icon(0, get_icon(type, "EditorIcons")); } - vmem_total->set_tooltip(TTR("Bytes:")+" "+itos(total)); + vmem_total->set_tooltip(TTR("Bytes:") + " " + itos(total)); vmem_total->set_text(String::humanize_size(total)); - } else if (p_msg=="stack_dump") { + } else if (p_msg == "stack_dump") { stack_dump->clear(); TreeItem *r = stack_dump->create_item(); - for(int i=0;i<p_data.size();i++) { + for (int i = 0; i < p_data.size(); i++) { Dictionary d = p_data[i]; ERR_CONTINUE(!d.has("function")); @@ -518,65 +476,61 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat ERR_CONTINUE(!d.has("line")); ERR_CONTINUE(!d.has("id")); TreeItem *s = stack_dump->create_item(r); - d["frame"]=i; - s->set_metadata(0,d); + d["frame"] = i; + s->set_metadata(0, d); //String line = itos(i)+" - "+String(d["file"])+":"+itos(d["line"])+" - at func: "+d["function"]; - String line = itos(i)+" - "+String(d["file"])+":"+itos(d["line"]); - s->set_text(0,line); + String line = itos(i) + " - " + String(d["file"]) + ":" + itos(d["line"]); + s->set_text(0, line); - if (i==0) + if (i == 0) s->select(0); } - } else if (p_msg=="stack_frame_vars") { - + } else if (p_msg == "stack_frame_vars") { variables->clear(); - - - int ofs =0; + int ofs = 0; int mcount = p_data[ofs]; ofs++; - for(int i=0;i<mcount;i++) { + for (int i = 0; i < mcount; i++) { - String n = p_data[ofs+i*2+0]; - Variant v = p_data[ofs+i*2+1]; + String n = p_data[ofs + i * 2 + 0]; + Variant v = p_data[ofs + i * 2 + 1]; if (n.begins_with("*")) { - n=n.substr(1,n.length()); + n = n.substr(1, n.length()); } - variables->add_property("members/"+n,v); + variables->add_property("members/" + n, v); } - ofs+=mcount*2; + ofs += mcount * 2; mcount = p_data[ofs]; ofs++; - for(int i=0;i<mcount;i++) { + for (int i = 0; i < mcount; i++) { - String n = p_data[ofs+i*2+0]; - Variant v = p_data[ofs+i*2+1]; + String n = p_data[ofs + i * 2 + 0]; + Variant v = p_data[ofs + i * 2 + 1]; if (n.begins_with("*")) { - n=n.substr(1,n.length()); + n = n.substr(1, n.length()); } - - variables->add_property("locals/"+n,v); + variables->add_property("locals/" + n, v); } variables->update(); inspector->edit(variables); - } else if (p_msg=="output") { + } else if (p_msg == "output") { //OUT - for(int i=0;i<p_data.size();i++) { + for (int i = 0; i < p_data.size(); i++) { String t = p_data[i]; //LOG @@ -587,26 +541,24 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat } } EditorNode::get_log()->add_message(t); - } - } else if (p_msg=="performance") { + } else if (p_msg == "performance") { Array arr = p_data[0]; Vector<float> p; p.resize(arr.size()); - for(int i=0;i<arr.size();i++) { - p[i]=arr[i]; - if (i<perf_items.size()) { - perf_items[i]->set_text(1,rtos(p[i])); - if (p[i]>perf_max[i]) - perf_max[i]=p[i]; + for (int i = 0; i < arr.size(); i++) { + p[i] = arr[i]; + if (i < perf_items.size()) { + perf_items[i]->set_text(1, rtos(p[i])); + if (p[i] > perf_max[i]) + perf_max[i] = p[i]; } - } perf_history.push_front(p); perf_draw->update(); - } else if (p_msg=="error") { + } else if (p_msg == "error") { Array err = p_data[0]; @@ -618,30 +570,28 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat bool warning = err[9]; bool e; - String time = String("%d:%02d:%02d:%04d").sprintf(vals,&e); - String txt=time+" - "+(err[8].is_zero()?String(err[7]):String(err[8])); - - String tooltip=TTR("Type:")+String(warning?TTR("Warning"):TTR("Error")); - tooltip+="\n"+TTR("Description:")+" "+String(err[8]); - tooltip+="\n"+TTR("Time:")+" "+time; - tooltip+="\nC "+TTR("Error:")+" "+String(err[7]); - tooltip+="\nC "+TTR("Source:")+" "+String(err[5])+":"+String(err[6]); - tooltip+="\nC "+TTR("Function:")+" "+String(err[4]); - + String time = String("%d:%02d:%02d:%04d").sprintf(vals, &e); + String txt = time + " - " + (err[8].is_zero() ? String(err[7]) : String(err[8])); + String tooltip = TTR("Type:") + String(warning ? TTR("Warning") : TTR("Error")); + tooltip += "\n" + TTR("Description:") + " " + String(err[8]); + tooltip += "\n" + TTR("Time:") + " " + time; + tooltip += "\nC " + TTR("Error:") + " " + String(err[7]); + tooltip += "\nC " + TTR("Source:") + " " + String(err[5]) + ":" + String(err[6]); + tooltip += "\nC " + TTR("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 ); + 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]; + 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_list->set_item_metadata(error_list->get_item_count() - 1, stack); error_count++; /* @@ -664,252 +614,230 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat packet_peer_stream->put_var(oe.callstack); */ - } else if (p_msg=="profile_sig") { + } else if (p_msg == "profile_sig") { //cache a signature - print_line("SIG: "+String(Variant(p_data))); - profiler_signature[p_data[1]]=p_data[0]; + print_line("SIG: " + String(Variant(p_data))); + profiler_signature[p_data[1]] = p_data[0]; - } else if (p_msg=="profile_frame" || p_msg=="profile_total") { + } else if (p_msg == "profile_frame" || p_msg == "profile_total") { EditorProfiler::Metric metric; - metric.valid=true; - metric.frame_number=p_data[0]; - metric.frame_time=p_data[1]; - metric.idle_time=p_data[2]; - metric.fixed_time=p_data[3]; - metric.fixed_frame_time=p_data[4]; + metric.valid = true; + metric.frame_number = p_data[0]; + metric.frame_time = p_data[1]; + metric.idle_time = p_data[2]; + metric.fixed_time = p_data[3]; + metric.fixed_frame_time = p_data[4]; int frame_data_amount = p_data[6]; int frame_function_amount = p_data[7]; - if (frame_data_amount) { EditorProfiler::Metric::Category frame_time; - frame_time.signature="category_frame_time"; - frame_time.name="Frame Time"; - frame_time.total_time=metric.frame_time; + frame_time.signature = "category_frame_time"; + frame_time.name = "Frame Time"; + frame_time.total_time = metric.frame_time; EditorProfiler::Metric::Category::Item item; - item.calls=1; - item.line=0; - item.name="Fixed Time"; - item.total=metric.fixed_time; - item.self=item.total; - item.signature="fixed_time"; - + item.calls = 1; + item.line = 0; + item.name = "Fixed Time"; + item.total = metric.fixed_time; + item.self = item.total; + item.signature = "fixed_time"; frame_time.items.push_back(item); - item.name="Idle Time"; - item.total=metric.idle_time; - item.self=item.total; - item.signature="idle_time"; + item.name = "Idle Time"; + item.total = metric.idle_time; + item.self = item.total; + item.signature = "idle_time"; frame_time.items.push_back(item); - item.name="Fixed Frame Time"; - item.total=metric.fixed_frame_time; - item.self=item.total; - item.signature="fixed_frame_time"; + item.name = "Fixed Frame Time"; + item.total = metric.fixed_frame_time; + item.self = item.total; + item.signature = "fixed_frame_time"; frame_time.items.push_back(item); metric.categories.push_back(frame_time); - } - - - int idx=8; - for(int i=0;i<frame_data_amount;i++) { + int idx = 8; + for (int i = 0; i < frame_data_amount; i++) { EditorProfiler::Metric::Category c; - String name=p_data[idx++]; - Array values=p_data[idx++]; - c.name=name.capitalize(); - c.items.resize(values.size()/2); - c.total_time=0; - c.signature="categ::"+name; - for(int i=0;i<values.size();i+=2) { + String name = p_data[idx++]; + Array values = p_data[idx++]; + c.name = name.capitalize(); + c.items.resize(values.size() / 2); + c.total_time = 0; + c.signature = "categ::" + name; + for (int i = 0; i < values.size(); i += 2) { EditorProfiler::Metric::Category::Item item; - item.name=values[i]; - item.calls=1; - item.self=values[i+1]; - item.total=item.self; - item.signature="categ::"+name+"::"+item.name; - item.name=item.name.capitalize(); - c.total_time+=item.total; - c.items[i/2]=item; - - + item.name = values[i]; + item.calls = 1; + item.self = values[i + 1]; + item.total = item.self; + item.signature = "categ::" + name + "::" + item.name; + item.name = item.name.capitalize(); + c.total_time += item.total; + c.items[i / 2] = item; } metric.categories.push_back(c); } EditorProfiler::Metric::Category funcs; - funcs.total_time=p_data[5]; //script time + funcs.total_time = p_data[5]; //script time funcs.items.resize(frame_function_amount); - funcs.name="Script Functions"; - funcs.signature="script_functions"; - for(int i=0;i<frame_function_amount;i++) { + funcs.name = "Script Functions"; + funcs.signature = "script_functions"; + for (int i = 0; i < frame_function_amount; i++) { int signature = p_data[idx++]; int calls = p_data[idx++]; float total = p_data[idx++]; float self = p_data[idx++]; - - EditorProfiler::Metric::Category::Item item; if (profiler_signature.has(signature)) { - item.signature=profiler_signature[signature]; + item.signature = profiler_signature[signature]; String name = profiler_signature[signature]; Vector<String> strings = name.split("::"); - if (strings.size()==3) { - item.name=strings[2]; - item.script=strings[0]; - item.line=strings[1].to_int(); + if (strings.size() == 3) { + item.name = strings[2]; + item.script = strings[0]; + item.line = strings[1].to_int(); } } else { - item.name="SigErr "+itos(signature); + item.name = "SigErr " + itos(signature); } - - - - item.calls=calls; - item.self=self; - item.total=total; - funcs.items[i]=item; - + item.calls = calls; + item.self = self; + item.total = total; + funcs.items[i] = item; } metric.categories.push_back(funcs); - if (p_msg=="profile_frame") - profiler->add_frame_metric(metric,false); + if (p_msg == "profile_frame") + profiler->add_frame_metric(metric, false); else - profiler->add_frame_metric(metric,true); + profiler->add_frame_metric(metric, true); - } else if (p_msg=="kill_me") { + } else if (p_msg == "kill_me") { editor->call_deferred("stop_child_process"); } - } - -void ScriptEditorDebugger::_performance_select(Object*,int,bool) { +void ScriptEditorDebugger::_performance_select(Object *, int, bool) { perf_draw->update(); - } void ScriptEditorDebugger::_performance_draw() { - Vector<int> which; - for(int i=0;i<perf_items.size();i++) { - + for (int i = 0; i < perf_items.size(); i++) { if (perf_items[i]->is_selected(0)) which.push_back(i); } - - if(which.empty()) + if (which.empty()) return; - Ref<StyleBox> graph_sb = get_stylebox("normal","TextEdit"); - Ref<Font> graph_font = get_font("font","TextEdit"); + Ref<StyleBox> graph_sb = get_stylebox("normal", "TextEdit"); + Ref<Font> graph_font = get_font("font", "TextEdit"); int cols = Math::ceil(Math::sqrt((float)which.size())); - int rows = (which.size()+1)/cols; - if (which.size()==1) - rows=1; - - - int margin =3; - int point_sep=5; - Size2i s = Size2i(perf_draw->get_size())/Size2i(cols,rows); - for(int i=0;i<which.size();i++) { - - Point2i p(i%cols,i/cols); - Rect2i r(p*s,s); - r.pos+=Point2(margin,margin); - r.size-=Point2(margin,margin)*2.0; - perf_draw->draw_style_box(graph_sb,r); - r.pos+=graph_sb->get_offset(); - r.size-=graph_sb->get_minimum_size(); - int pi=which[i]; - Color c = Color(0.7,0.9,0.5); - c.set_hsv(Math::fmod(c.get_h()+pi*0.7654,1),c.get_s(),c.get_v()); - - c.a=0.8; - perf_draw->draw_string(graph_font,r.pos+Point2(0,graph_font->get_ascent()),perf_items[pi]->get_text(0),c,r.size.x); - c.a=0.6; - perf_draw->draw_string(graph_font,r.pos+Point2(graph_font->get_char_size('X').width,graph_font->get_ascent()+graph_font->get_height()),perf_items[pi]->get_text(1),c,r.size.y); - - float spacing=point_sep/float(cols); + int rows = (which.size() + 1) / cols; + if (which.size() == 1) + rows = 1; + + int margin = 3; + int point_sep = 5; + Size2i s = Size2i(perf_draw->get_size()) / Size2i(cols, rows); + for (int i = 0; i < which.size(); i++) { + + Point2i p(i % cols, i / cols); + Rect2i r(p * s, s); + r.pos += Point2(margin, margin); + r.size -= Point2(margin, margin) * 2.0; + perf_draw->draw_style_box(graph_sb, r); + r.pos += graph_sb->get_offset(); + r.size -= graph_sb->get_minimum_size(); + int pi = which[i]; + Color c = Color(0.7, 0.9, 0.5); + c.set_hsv(Math::fmod(c.get_h() + pi * 0.7654, 1), c.get_s(), c.get_v()); + + c.a = 0.8; + perf_draw->draw_string(graph_font, r.pos + Point2(0, graph_font->get_ascent()), perf_items[pi]->get_text(0), c, r.size.x); + c.a = 0.6; + perf_draw->draw_string(graph_font, r.pos + Point2(graph_font->get_char_size('X').width, graph_font->get_ascent() + graph_font->get_height()), perf_items[pi]->get_text(1), c, r.size.y); + + float spacing = point_sep / float(cols); float from = r.size.width; - List<Vector<float> >::Element *E=perf_history.front(); - float prev=-1; - while(from>=0 && E) { + List<Vector<float> >::Element *E = perf_history.front(); + float prev = -1; + while (from >= 0 && E) { float m = perf_max[pi]; - if (m==0) - m=0.00001; - float h = E->get()[pi]/m; - h=(1.0-h)*r.size.y; - - c.a=0.7; - if (E!=perf_history.front()) - perf_draw->draw_line(r.pos+Point2(from,h),r.pos+Point2(from+spacing,prev),c,2.0); - prev=h; - E=E->next(); - from-=spacing; + if (m == 0) + m = 0.00001; + float h = E->get()[pi] / m; + h = (1.0 - h) * r.size.y; + + c.a = 0.7; + if (E != perf_history.front()) + perf_draw->draw_line(r.pos + Point2(from, h), r.pos + Point2(from + spacing, prev), c, 2.0); + prev = h; + E = E->next(); + from -= spacing; } - } - } void ScriptEditorDebugger::_notification(int p_what) { - switch(p_what) { + switch (p_what) { case NOTIFICATION_ENTER_TREE: { inspector->edit(variables); - step->set_icon( get_icon("DebugStep","EditorIcons")); - next->set_icon( get_icon("DebugNext","EditorIcons")); - back->set_icon( get_icon("Back","EditorIcons")); - forward->set_icon( get_icon("Forward","EditorIcons")); - dobreak->set_icon( get_icon("Pause","EditorIcons")); - docontinue->set_icon( get_icon("DebugContinue","EditorIcons")); + step->set_icon(get_icon("DebugStep", "EditorIcons")); + next->set_icon(get_icon("DebugNext", "EditorIcons")); + back->set_icon(get_icon("Back", "EditorIcons")); + forward->set_icon(get_icon("Forward", "EditorIcons")); + dobreak->set_icon(get_icon("Pause", "EditorIcons")); + docontinue->set_icon(get_icon("DebugContinue", "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"); - vmem_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"); + vmem_refresh->set_icon(get_icon("Reload", "EditorIcons")); } break; case NOTIFICATION_PROCESS: { if (connection.is_valid()) { - inspect_scene_tree_timeout-=get_process_delta_time(); - if (inspect_scene_tree_timeout<0) { - inspect_scene_tree_timeout=EditorSettings::get_singleton()->get("debugger/scene_tree_refresh_interval"); + inspect_scene_tree_timeout -= get_process_delta_time(); + if (inspect_scene_tree_timeout < 0) { + inspect_scene_tree_timeout = EditorSettings::get_singleton()->get("debugger/scene_tree_refresh_interval"); if (inspect_scene_tree->is_visible_in_tree()) { _scene_tree_request(); - if (inspected_object_id!=0) { + if (inspected_object_id != 0) { //take the chance and re-inspect selected object Array msg; msg.push_back("inspect_object"); @@ -919,9 +847,9 @@ void ScriptEditorDebugger::_notification(int p_what) { } } - inspect_edited_object_timeout-=get_process_delta_time(); - if (inspect_edited_object_timeout<0) { - inspect_edited_object_timeout=EditorSettings::get_singleton()->get("debugger/remote_inspect_refresh_interval"); + inspect_edited_object_timeout -= get_process_delta_time(); + if (inspect_edited_object_timeout < 0) { + inspect_edited_object_timeout = EditorSettings::get_singleton()->get("debugger/remote_inspect_refresh_interval"); if (inspect_scene_tree->is_visible_in_tree() && inspected_object_id) { //take the chance and re-inspect selected object Array msg; @@ -932,20 +860,20 @@ void ScriptEditorDebugger::_notification(int p_what) { } } - if (error_count!=last_error_count) { + if (error_count != last_error_count) { - if (error_count==0) { + if (error_count == 0) { error_split->set_name(TTR("Errors")); debugger_button->set_text(TTR("Debugger")); debugger_button->set_icon(Ref<Texture>()); - tabs->set_tab_icon(error_split->get_index(),Ref<Texture>()); + tabs->set_tab_icon(error_split->get_index(), Ref<Texture>()); } else { - error_split->set_name(TTR("Errors")+" ("+itos(error_count)+")"); - debugger_button->set_text(TTR("Debugger")+" ("+itos(error_count)+")"); - debugger_button->set_icon(get_icon("Error","EditorIcons")); - tabs->set_tab_icon(error_split->get_index(),get_icon("Error","EditorIcons")); + error_split->set_name(TTR("Errors") + " (" + itos(error_count) + ")"); + debugger_button->set_text(TTR("Debugger") + " (" + itos(error_count) + ")"); + debugger_button->set_icon(get_icon("Error", "EditorIcons")); + tabs->set_tab_icon(error_split->get_index(), get_icon("Error", "EditorIcons")); } - last_error_count=error_count; + last_error_count = error_count; } if (connection.is_null()) { @@ -975,7 +903,7 @@ void ScriptEditorDebugger::_notification(int p_what) { le_clear->set_disabled(false); error_list->clear(); error_stack->clear(); - error_count=0; + error_count = 0; profiler_signature.clear(); //live_edit_root->set_text("/root"); @@ -987,7 +915,6 @@ void ScriptEditorDebugger::_notification(int p_what) { _profiler_activate(true); } - } else { break; @@ -1004,86 +931,76 @@ void ScriptEditorDebugger::_notification(int p_what) { break; }; - while(ppeer->get_available_packet_count() > 0) { + while (ppeer->get_available_packet_count() > 0) { if (pending_in_queue) { - int todo = MIN( ppeer->get_available_packet_count(), pending_in_queue ); + int todo = MIN(ppeer->get_available_packet_count(), pending_in_queue); - for(int i=0;i<todo;i++) { + for (int i = 0; i < todo; i++) { Variant cmd; Error ret = ppeer->get_var(cmd); - if (ret!=OK) { + if (ret != OK) { stop(); - ERR_FAIL_COND(ret!=OK); + ERR_FAIL_COND(ret != OK); } message.push_back(cmd); pending_in_queue--; } - - if (pending_in_queue==0) { - _parse_message(message_type,message); + if (pending_in_queue == 0) { + _parse_message(message_type, message); message.clear(); - } - } else { - if (ppeer->get_available_packet_count()>=2) { - + if (ppeer->get_available_packet_count() >= 2) { Variant cmd; Error ret = ppeer->get_var(cmd); - if (ret!=OK) { + if (ret != OK) { stop(); - ERR_FAIL_COND(ret!=OK); + ERR_FAIL_COND(ret != OK); } - if (cmd.get_type()!=Variant::STRING) { + if (cmd.get_type() != Variant::STRING) { stop(); - ERR_FAIL_COND(cmd.get_type()!=Variant::STRING); + ERR_FAIL_COND(cmd.get_type() != Variant::STRING); } - message_type=cmd; + message_type = cmd; //print_line("GOT: "+message_type); ret = ppeer->get_var(cmd); - if (ret!=OK) { + if (ret != OK) { stop(); - ERR_FAIL_COND(ret!=OK); + ERR_FAIL_COND(ret != OK); } - if (cmd.get_type()!=Variant::INT) { + if (cmd.get_type() != Variant::INT) { stop(); - ERR_FAIL_COND(cmd.get_type()!=Variant::INT); + ERR_FAIL_COND(cmd.get_type() != Variant::INT); } - pending_in_queue=cmd; + pending_in_queue = cmd; - if (pending_in_queue==0) { - _parse_message(message_type,Array()); + if (pending_in_queue == 0) { + _parse_message(message_type, Array()); message.clear(); } } else { - break; } - } } - - } break; } - } - void ScriptEditorDebugger::start() { stop(); @@ -1094,28 +1011,22 @@ void ScriptEditorDebugger::start() { uint16_t port = GLOBAL_GET("network/debug/remote_port"); perf_history.clear(); - for(int i=0;i<Performance::MONITOR_MAX;i++) { + for (int i = 0; i < Performance::MONITOR_MAX; i++) { - perf_max[i]=0; + perf_max[i] = 0; } server->listen(port); set_process(true); - } -void ScriptEditorDebugger::pause(){ - - +void ScriptEditorDebugger::pause() { } -void ScriptEditorDebugger::unpause(){ - - +void ScriptEditorDebugger::unpause() { } -void ScriptEditorDebugger::stop(){ - +void ScriptEditorDebugger::stop() { set_process(false); @@ -1128,7 +1039,7 @@ void ScriptEditorDebugger::stop(){ connection.unref(); } - pending_in_queue=0; + pending_in_queue = 0; message.clear(); node_path_cache.clear(); @@ -1144,14 +1055,11 @@ void ScriptEditorDebugger::stop(){ EditorNode::get_singleton()->get_pause_button()->set_pressed(false); EditorNode::get_singleton()->get_pause_button()->set_disabled(true); - - if (hide_on_stop) { if (is_visible_in_tree()) EditorNode::get_singleton()->hide_bottom_panel(); - emit_signal("show_debugger",false); + emit_signal("show_debugger", false); } - } void ScriptEditorDebugger::_profiler_activate(bool p_enable) { @@ -1159,13 +1067,12 @@ void ScriptEditorDebugger::_profiler_activate(bool p_enable) { if (!connection.is_valid()) return; - if (p_enable) { profiler_signature.clear(); Array msg; msg.push_back("start_profiling"); int max_funcs = EditorSettings::get_singleton()->get("debugger/profiler_frame_max_functions"); - max_funcs = CLAMP(max_funcs,16,512); + max_funcs = CLAMP(max_funcs, 16, 512); msg.push_back(max_funcs); ppeer->put_var(msg); @@ -1177,9 +1084,7 @@ void ScriptEditorDebugger::_profiler_activate(bool p_enable) { ppeer->put_var(msg); print_line("END PROFILING!"); - } - } void ScriptEditorDebugger::_profiler_seeked() { @@ -1192,18 +1097,16 @@ void ScriptEditorDebugger::_profiler_seeked() { debug_break(); } - void ScriptEditorDebugger::_stack_dump_frame_selected() { TreeItem *ti = stack_dump->get_selected(); if (!ti) return; - Dictionary d = ti->get_metadata(0); Ref<Script> s = ResourceLoader::load(d["file"]); - emit_signal("goto_script_line",s,int(d["line"])-1); + emit_signal("goto_script_line", s, int(d["line"]) - 1); ERR_FAIL_COND(connection.is_null()); ERR_FAIL_COND(!connection->is_connected_to_host()); @@ -1213,23 +1116,21 @@ void ScriptEditorDebugger::_stack_dump_frame_selected() { msg.push_back("get_stack_frame_vars"); msg.push_back(d["frame"]); ppeer->put_var(msg); - } void ScriptEditorDebugger::_output_clear() { //output->clear(); //output->push_color(Color(0,0,0)); - } -String ScriptEditorDebugger::get_var_value(const String& p_var) const { +String ScriptEditorDebugger::get_var_value(const String &p_var) const { if (!breaked) return String(); return variables->get_var_value(p_var); } -int ScriptEditorDebugger::_get_node_path_cache(const NodePath& p_path) { +int ScriptEditorDebugger::_get_node_path_cache(const NodePath &p_path) { const int *r = node_path_cache.getptr(p_path); if (r) @@ -1237,38 +1138,36 @@ int ScriptEditorDebugger::_get_node_path_cache(const NodePath& p_path) { last_path_id++; - node_path_cache[p_path]=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) { +int ScriptEditorDebugger::_get_res_path_cache(const String &p_path) { - Map<String,int>::Element *E=res_path_cache.find(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; + 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) { +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; @@ -1277,9 +1176,9 @@ void ScriptEditorDebugger::_method_changed(Object*p_base,const StringName& p_nam VARIANT_ARGPTRS - for(int i=0;i<VARIANT_ARG_MAX;i++) { + 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)) + if (argptr[i] && (argptr[i]->get_type() == Variant::OBJECT || argptr[i]->get_type() == Variant::_RID)) return; } @@ -1288,25 +1187,22 @@ void ScriptEditorDebugger::_method_changed(Object*p_base,const StringName& p_nam 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++) { + 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()) { + if (res && res->get_path() != String()) { String respath = res->get_path(); int pathid = _get_res_path_cache(respath); @@ -1315,7 +1211,7 @@ void ScriptEditorDebugger::_method_changed(Object*p_base,const StringName& p_nam msg.push_back("live_res_call"); msg.push_back(pathid); msg.push_back(p_name); - for(int i=0;i<VARIANT_ARG_MAX;i++) { + for (int i = 0; i < VARIANT_ARG_MAX; i++) { //no pointers, sorry msg.push_back(*argptr[i]); } @@ -1327,7 +1223,7 @@ void ScriptEditorDebugger::_method_changed(Object*p_base,const StringName& p_nam //print_line("method"); } -void ScriptEditorDebugger::_property_changed(Object*p_base,const StringName& p_property,const Variant& p_value){ +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; @@ -1339,10 +1235,9 @@ void ScriptEditorDebugger::_property_changed(Object*p_base,const StringName& p_p 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()) { + if (res.is_valid() && res->get_path() != String()) { Array msg; msg.push_back("live_node_prop_res"); @@ -1361,22 +1256,19 @@ void ScriptEditorDebugger::_property_changed(Object*p_base,const StringName& p_p ppeer->put_var(msg); } - return; - } Resource *res = p_base->cast_to<Resource>(); - if (res && res->get_path()!=String()) { + 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()) { + if (res.is_valid() && res->get_path() != String()) { Array msg; msg.push_back("live_res_prop_res"); @@ -1395,32 +1287,27 @@ void ScriptEditorDebugger::_property_changed(Object*p_base,const StringName& p_p 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::_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::_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; + live_debug = p_enable; } void ScriptEditorDebugger::_live_edit_set() { @@ -1428,16 +1315,15 @@ void ScriptEditorDebugger::_live_edit_set() { if (!connection.is_valid()) return; - TreeItem* ti = inspect_scene_tree->get_selected(); + TreeItem *ti = inspect_scene_tree->get_selected(); if (!ti) return; String path; - while(ti) { - String lp=ti->get_text(0); - path="/"+lp+path; - ti=ti->get_parent(); - + while (ti) { + String lp = ti->get_text(0); + path = "/" + lp + path; + ti = ti->get_parent(); } NodePath np = path; @@ -1445,8 +1331,6 @@ void ScriptEditorDebugger::_live_edit_set() { editor->get_editor_data().set_edited_scene_live_edit_root(np); update_live_edit_root(); - - } void ScriptEditorDebugger::_live_edit_clear() { @@ -1455,7 +1339,6 @@ void ScriptEditorDebugger::_live_edit_clear() { editor->get_editor_data().set_edited_scene_live_edit_root(np); update_live_edit_root(); - } void ScriptEditorDebugger::update_live_edit_root() { @@ -1473,10 +1356,9 @@ void ScriptEditorDebugger::update_live_edit_root() { 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) { +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; @@ -1488,7 +1370,7 @@ void ScriptEditorDebugger::live_debug_create_node(const NodePath& p_parent,const } } -void ScriptEditorDebugger::live_debug_instance_node(const NodePath& p_parent,const String& p_path,const String& p_name){ +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; @@ -1498,9 +1380,8 @@ void ScriptEditorDebugger::live_debug_instance_node(const NodePath& p_parent,con msg.push_back(p_name); ppeer->put_var(msg); } - } -void ScriptEditorDebugger::live_debug_remove_node(const NodePath& p_at){ +void ScriptEditorDebugger::live_debug_remove_node(const NodePath &p_at) { if (live_debug && connection.is_valid()) { Array msg; @@ -1508,9 +1389,8 @@ void ScriptEditorDebugger::live_debug_remove_node(const NodePath& p_at){ 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) { +void ScriptEditorDebugger::live_debug_remove_and_keep_node(const NodePath &p_at, ObjectID p_keep_id) { if (live_debug && connection.is_valid()) { Array msg; @@ -1519,9 +1399,8 @@ void ScriptEditorDebugger::live_debug_remove_and_keep_node(const NodePath& 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){ +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; @@ -1531,9 +1410,8 @@ void ScriptEditorDebugger::live_debug_restore_node(ObjectID p_id, const NodePath 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){ +void ScriptEditorDebugger::live_debug_duplicate_node(const NodePath &p_at, const String &p_new_name) { if (live_debug && connection.is_valid()) { Array msg; @@ -1542,9 +1420,8 @@ void ScriptEditorDebugger::live_debug_duplicate_node(const NodePath& p_at,const 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){ +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; @@ -1555,67 +1432,62 @@ void ScriptEditorDebugger::live_debug_reparent_node(const NodePath& p_at, const msg.push_back(p_at_pos); ppeer->put_var(msg); } - } -void ScriptEditorDebugger::set_breakpoint(const String& p_path,int p_line,bool p_enabled) { +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); - } + 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::reload_scripts() { if (connection.is_valid()) { - Array msg; - msg.push_back("reload_scripts"); - ppeer->put_var(msg); - } + Array msg; + msg.push_back("reload_scripts"); + 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) { + 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]; + String script = st[i]; + int line = st[i + 1]; Array md; md.push_back(st[i]); - md.push_back(st[i+1]); + md.push_back(st[i + 1]); - String str = script.get_file()+":"+itos(line); + 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,TTR("File:")+" "+String(st[i])+"\n"+TTR("Line:")+" "+itos(line)); + error_stack->set_item_metadata(error_stack->get_item_count() - 1, md); + error_stack->set_item_tooltip(error_stack->get_item_count() - 1, TTR("File:") + " " + String(st[i]) + "\n" + TTR("Line:") + " " + itos(line)); } } -void ScriptEditorDebugger:: _error_stack_selected(int p_idx){ +void ScriptEditorDebugger::_error_stack_selected(int p_idx) { Array arr = error_stack->get_item_metadata(p_idx); - if (arr.size()!=2) + if (arr.size() != 2) return; - Ref<Script> s = ResourceLoader::load(arr[0]); - emit_signal("goto_script_line",s,int(arr[1])-1); - + emit_signal("goto_script_line", s, int(arr[1]) - 1); } void ScriptEditorDebugger::set_hide_on_stop(bool p_hide) { - hide_on_stop=p_hide; + hide_on_stop = p_hide; } void ScriptEditorDebugger::_paused() { @@ -1630,180 +1502,169 @@ void ScriptEditorDebugger::_paused() { if (breaked && !EditorNode::get_singleton()->get_pause_button()->is_pressed()) { debug_continue(); } - } void ScriptEditorDebugger::_bind_methods() { - ClassDB::bind_method(D_METHOD("_stack_dump_frame_selected"),&ScriptEditorDebugger::_stack_dump_frame_selected); - ClassDB::bind_method(D_METHOD("debug_next"),&ScriptEditorDebugger::debug_next); - ClassDB::bind_method(D_METHOD("debug_step"),&ScriptEditorDebugger::debug_step); - ClassDB::bind_method(D_METHOD("debug_break"),&ScriptEditorDebugger::debug_break); - ClassDB::bind_method(D_METHOD("debug_continue"),&ScriptEditorDebugger::debug_continue); - ClassDB::bind_method(D_METHOD("_output_clear"),&ScriptEditorDebugger::_output_clear); - ClassDB::bind_method(D_METHOD("_performance_draw"),&ScriptEditorDebugger::_performance_draw); - ClassDB::bind_method(D_METHOD("_performance_select"),&ScriptEditorDebugger::_performance_select); - ClassDB::bind_method(D_METHOD("_scene_tree_request"),&ScriptEditorDebugger::_scene_tree_request); - ClassDB::bind_method(D_METHOD("_video_mem_request"),&ScriptEditorDebugger::_video_mem_request); - ClassDB::bind_method(D_METHOD("_live_edit_set"),&ScriptEditorDebugger::_live_edit_set); - ClassDB::bind_method(D_METHOD("_live_edit_clear"),&ScriptEditorDebugger::_live_edit_clear); - - ClassDB::bind_method(D_METHOD("_error_selected"),&ScriptEditorDebugger::_error_selected); - ClassDB::bind_method(D_METHOD("_error_stack_selected"),&ScriptEditorDebugger::_error_stack_selected); - ClassDB::bind_method(D_METHOD("_profiler_activate"),&ScriptEditorDebugger::_profiler_activate); - ClassDB::bind_method(D_METHOD("_profiler_seeked"),&ScriptEditorDebugger::_profiler_seeked); - - ClassDB::bind_method(D_METHOD("_paused"),&ScriptEditorDebugger::_paused); - - ClassDB::bind_method(D_METHOD("_scene_tree_selected"),&ScriptEditorDebugger::_scene_tree_selected); - ClassDB::bind_method(D_METHOD("_scene_tree_folded"),&ScriptEditorDebugger::_scene_tree_folded); - - - ClassDB::bind_method(D_METHOD("live_debug_create_node"),&ScriptEditorDebugger::live_debug_create_node); - ClassDB::bind_method(D_METHOD("live_debug_instance_node"),&ScriptEditorDebugger::live_debug_instance_node); - ClassDB::bind_method(D_METHOD("live_debug_remove_node"),&ScriptEditorDebugger::live_debug_remove_node); - ClassDB::bind_method(D_METHOD("live_debug_remove_and_keep_node"),&ScriptEditorDebugger::live_debug_remove_and_keep_node); - ClassDB::bind_method(D_METHOD("live_debug_restore_node"),&ScriptEditorDebugger::live_debug_restore_node); - ClassDB::bind_method(D_METHOD("live_debug_duplicate_node"),&ScriptEditorDebugger::live_debug_duplicate_node); - ClassDB::bind_method(D_METHOD("live_debug_reparent_node"),&ScriptEditorDebugger::live_debug_reparent_node); - ClassDB::bind_method(D_METHOD("_scene_tree_property_select_object"),&ScriptEditorDebugger::_scene_tree_property_select_object); - ClassDB::bind_method(D_METHOD("_scene_tree_property_value_edited"),&ScriptEditorDebugger::_scene_tree_property_value_edited); + ClassDB::bind_method(D_METHOD("_stack_dump_frame_selected"), &ScriptEditorDebugger::_stack_dump_frame_selected); + ClassDB::bind_method(D_METHOD("debug_next"), &ScriptEditorDebugger::debug_next); + ClassDB::bind_method(D_METHOD("debug_step"), &ScriptEditorDebugger::debug_step); + ClassDB::bind_method(D_METHOD("debug_break"), &ScriptEditorDebugger::debug_break); + ClassDB::bind_method(D_METHOD("debug_continue"), &ScriptEditorDebugger::debug_continue); + ClassDB::bind_method(D_METHOD("_output_clear"), &ScriptEditorDebugger::_output_clear); + ClassDB::bind_method(D_METHOD("_performance_draw"), &ScriptEditorDebugger::_performance_draw); + ClassDB::bind_method(D_METHOD("_performance_select"), &ScriptEditorDebugger::_performance_select); + ClassDB::bind_method(D_METHOD("_scene_tree_request"), &ScriptEditorDebugger::_scene_tree_request); + ClassDB::bind_method(D_METHOD("_video_mem_request"), &ScriptEditorDebugger::_video_mem_request); + ClassDB::bind_method(D_METHOD("_live_edit_set"), &ScriptEditorDebugger::_live_edit_set); + ClassDB::bind_method(D_METHOD("_live_edit_clear"), &ScriptEditorDebugger::_live_edit_clear); + + ClassDB::bind_method(D_METHOD("_error_selected"), &ScriptEditorDebugger::_error_selected); + ClassDB::bind_method(D_METHOD("_error_stack_selected"), &ScriptEditorDebugger::_error_stack_selected); + ClassDB::bind_method(D_METHOD("_profiler_activate"), &ScriptEditorDebugger::_profiler_activate); + ClassDB::bind_method(D_METHOD("_profiler_seeked"), &ScriptEditorDebugger::_profiler_seeked); + + ClassDB::bind_method(D_METHOD("_paused"), &ScriptEditorDebugger::_paused); + + ClassDB::bind_method(D_METHOD("_scene_tree_selected"), &ScriptEditorDebugger::_scene_tree_selected); + ClassDB::bind_method(D_METHOD("_scene_tree_folded"), &ScriptEditorDebugger::_scene_tree_folded); + + ClassDB::bind_method(D_METHOD("live_debug_create_node"), &ScriptEditorDebugger::live_debug_create_node); + ClassDB::bind_method(D_METHOD("live_debug_instance_node"), &ScriptEditorDebugger::live_debug_instance_node); + ClassDB::bind_method(D_METHOD("live_debug_remove_node"), &ScriptEditorDebugger::live_debug_remove_node); + ClassDB::bind_method(D_METHOD("live_debug_remove_and_keep_node"), &ScriptEditorDebugger::live_debug_remove_and_keep_node); + ClassDB::bind_method(D_METHOD("live_debug_restore_node"), &ScriptEditorDebugger::live_debug_restore_node); + ClassDB::bind_method(D_METHOD("live_debug_duplicate_node"), &ScriptEditorDebugger::live_debug_duplicate_node); + ClassDB::bind_method(D_METHOD("live_debug_reparent_node"), &ScriptEditorDebugger::live_debug_reparent_node); + ClassDB::bind_method(D_METHOD("_scene_tree_property_select_object"), &ScriptEditorDebugger::_scene_tree_property_select_object); + ClassDB::bind_method(D_METHOD("_scene_tree_property_value_edited"), &ScriptEditorDebugger::_scene_tree_property_value_edited); ADD_SIGNAL(MethodInfo("goto_script_line")); - ADD_SIGNAL(MethodInfo("breaked",PropertyInfo(Variant::BOOL,"reallydid"),PropertyInfo(Variant::BOOL,"can_debug"))); - ADD_SIGNAL(MethodInfo("show_debugger",PropertyInfo(Variant::BOOL,"reallydid"))); + ADD_SIGNAL(MethodInfo("breaked", PropertyInfo(Variant::BOOL, "reallydid"), PropertyInfo(Variant::BOOL, "can_debug"))); + ADD_SIGNAL(MethodInfo("show_debugger", PropertyInfo(Variant::BOOL, "reallydid"))); } -ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ - - +ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { - ppeer = Ref<PacketPeerStream>( memnew( PacketPeerStream ) ); - editor=p_editor; + ppeer = Ref<PacketPeerStream>(memnew(PacketPeerStream)); + editor = p_editor; - tabs = memnew( TabContainer ); + tabs = memnew(TabContainer); tabs->set_v_size_flags(SIZE_EXPAND_FILL); tabs->set_area_as_parent_rect(); add_child(tabs); - { //debugger - VBoxContainer *vbc = memnew( VBoxContainer ); + VBoxContainer *vbc = memnew(VBoxContainer); vbc->set_name(TTR("Debugger")); //tabs->add_child(vbc); - Control *dbg=vbc; + Control *dbg = vbc; - HBoxContainer *hbc = memnew( HBoxContainer ); + HBoxContainer *hbc = memnew(HBoxContainer); vbc->add_child(hbc); - - reason = memnew( LineEdit ); + reason = memnew(LineEdit); reason->set_text(""); reason->set_editable(false); hbc->add_child(reason); - reason->add_color_override("font_color",Color(1,0.4,0.0,0.8)); + reason->add_color_override("font_color", Color(1, 0.4, 0.0, 0.8)); reason->set_h_size_flags(SIZE_EXPAND_FILL); //reason->set_clip_text(true); - hbc->add_child( memnew( VSeparator) ); + hbc->add_child(memnew(VSeparator)); - step = memnew( Button ); + step = memnew(Button); hbc->add_child(step); step->set_tooltip(TTR("Step Into")); - step->connect("pressed",this,"debug_step"); + step->connect("pressed", this, "debug_step"); - next = memnew( Button ); + next = memnew(Button); hbc->add_child(next); next->set_tooltip(TTR("Step Over")); - next->connect("pressed",this,"debug_next"); + next->connect("pressed", this, "debug_next"); - hbc->add_child( memnew( VSeparator) ); + hbc->add_child(memnew(VSeparator)); - dobreak = memnew( Button ); + dobreak = memnew(Button); hbc->add_child(dobreak); dobreak->set_tooltip(TTR("Break")); - dobreak->connect("pressed",this,"debug_break"); + dobreak->connect("pressed", this, "debug_break"); - docontinue = memnew( Button ); + docontinue = memnew(Button); hbc->add_child(docontinue); docontinue->set_tooltip(TTR("Continue")); - docontinue->connect("pressed",this,"debug_continue"); + docontinue->connect("pressed", this, "debug_continue"); //hbc->add_child( memnew( VSeparator) ); - back = memnew( Button ); + back = memnew(Button); hbc->add_child(back); back->set_tooltip(TTR("Inspect Previous Instance")); back->hide(); - forward = memnew( Button ); + forward = memnew(Button); hbc->add_child(forward); forward->set_tooltip(TTR("Inspect Next Instance")); forward->hide(); - - HSplitContainer *sc = memnew( HSplitContainer ); + HSplitContainer *sc = memnew(HSplitContainer); vbc->add_child(sc); sc->set_v_size_flags(SIZE_EXPAND_FILL); - stack_dump = memnew( Tree ); + stack_dump = memnew(Tree); stack_dump->set_columns(1); stack_dump->set_column_titles_visible(true); - stack_dump->set_column_title(0,TTR("Stack Frames")); + stack_dump->set_column_title(0, TTR("Stack Frames")); stack_dump->set_h_size_flags(SIZE_EXPAND_FILL); stack_dump->set_hide_root(true); - stack_dump->connect("cell_selected",this,"_stack_dump_frame_selected"); + stack_dump->connect("cell_selected", this, "_stack_dump_frame_selected"); sc->add_child(stack_dump); - inspector = memnew( PropertyEditor ); + inspector = memnew(PropertyEditor); inspector->set_h_size_flags(SIZE_EXPAND_FILL); inspector->hide_top_label(); - inspector->get_scene_tree()->set_column_title(0,TTR("Variable")); + inspector->get_scene_tree()->set_column_title(0, TTR("Variable")); inspector->set_capitalize_paths(false); inspector->set_read_only(true); sc->add_child(inspector); server = TCP_Server::create_ref(); - pending_in_queue=0; + pending_in_queue = 0; - variables = memnew( ScriptEditorDebuggerVariables ); + variables = memnew(ScriptEditorDebuggerVariables); - breaked=false; + breaked = false; tabs->add_child(dbg); //tabs->move_child(vbc,0); - hbc = memnew( HBoxContainer ); + hbc = memnew(HBoxContainer); vbc->add_child(hbc); - } - { //errors - + { //errors - error_split = memnew( HSplitContainer ); - VBoxContainer *errvb = memnew( VBoxContainer ); + error_split = memnew(HSplitContainer); + VBoxContainer *errvb = memnew(VBoxContainer); errvb->set_h_size_flags(SIZE_EXPAND_FILL); - error_list = memnew( ItemList ); - errvb->add_margin_child(TTR("Errors:"),error_list,true); + error_list = memnew(ItemList); + errvb->add_margin_child(TTR("Errors:"), error_list, true); error_split->add_child(errvb); - errvb = memnew( VBoxContainer ); + errvb = memnew(VBoxContainer); errvb->set_h_size_flags(SIZE_EXPAND_FILL); - error_stack = memnew( ItemList ); - errvb->add_margin_child(TTR("Stack Trace (if applicable):"),error_stack,true); + error_stack = memnew(ItemList); + errvb->add_margin_child(TTR("Stack Trace (if applicable):"), error_stack, true); error_split->add_child(errvb); error_split->set_name(TTR("Errors")); tabs->add_child(error_split); } - { // inquire - - inspect_info = memnew( HSplitContainer ); + inspect_info = memnew(HSplitContainer); inspect_info->set_name(TTR("Remote Inspector")); tabs->add_child(inspect_info); @@ -1811,10 +1672,10 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ info_left->set_h_size_flags(SIZE_EXPAND_FILL); inspect_info->add_child(info_left); - inspect_scene_tree = memnew( Tree ); - info_left->add_margin_child(TTR("Live Scene Tree:"),inspect_scene_tree,true); - inspect_scene_tree->connect("cell_selected",this,"_scene_tree_selected"); - inspect_scene_tree->connect("item_collapsed",this,"_scene_tree_folded"); + inspect_scene_tree = memnew(Tree); + info_left->add_margin_child(TTR("Live Scene Tree:"), inspect_scene_tree, true); + inspect_scene_tree->connect("cell_selected", this, "_scene_tree_selected"); + inspect_scene_tree->connect("item_collapsed", this, "_scene_tree_folded"); // @@ -1822,95 +1683,93 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ info_right->set_h_size_flags(SIZE_EXPAND_FILL); inspect_info->add_child(info_right); - inspect_properties = memnew( PropertyEditor ); + inspect_properties = memnew(PropertyEditor); inspect_properties->hide_top_label(); inspect_properties->set_show_categories(true); - inspect_properties->connect("object_id_selected",this,"_scene_tree_property_select_object"); + inspect_properties->connect("object_id_selected", this, "_scene_tree_property_select_object"); - info_right->add_margin_child(TTR("Remote Object Properties: "),inspect_properties,true); + info_right->add_margin_child(TTR("Remote Object Properties: "), inspect_properties, true); - inspect_scene_tree_timeout=EDITOR_DEF("debugger/scene_tree_refresh_interval",1.0); - inspect_edited_object_timeout=EDITOR_DEF("debugger/remote_inspect_refresh_interval",0.2); - inspected_object_id=0; - updating_scene_tree=false; + inspect_scene_tree_timeout = EDITOR_DEF("debugger/scene_tree_refresh_interval", 1.0); + inspect_edited_object_timeout = EDITOR_DEF("debugger/remote_inspect_refresh_interval", 0.2); + inspected_object_id = 0; + updating_scene_tree = false; - inspected_object = memnew( ScriptEditorDebuggerInspectedObject ); - inspected_object->connect("value_edited",this,"_scene_tree_property_value_edited"); + inspected_object = memnew(ScriptEditorDebuggerInspectedObject); + inspected_object->connect("value_edited", this, "_scene_tree_property_value_edited"); } { //profiler - profiler = memnew( EditorProfiler ); + profiler = memnew(EditorProfiler); profiler->set_name(TTR("Profiler")); tabs->add_child(profiler); - profiler->connect("enable_profiling",this,"_profiler_activate"); - profiler->connect("break_request",this,"_profiler_seeked"); + profiler->connect("enable_profiling", this, "_profiler_activate"); + profiler->connect("break_request", this, "_profiler_seeked"); } - { //monitors - HSplitContainer *hsp = memnew( HSplitContainer ); + HSplitContainer *hsp = memnew(HSplitContainer); perf_monitors = memnew(Tree); perf_monitors->set_columns(2); - perf_monitors->set_column_title(0,TTR("Monitor")); - perf_monitors->set_column_title(1,TTR("Value")); + perf_monitors->set_column_title(0, TTR("Monitor")); + perf_monitors->set_column_title(1, TTR("Value")); perf_monitors->set_column_titles_visible(true); hsp->add_child(perf_monitors); perf_monitors->set_select_mode(Tree::SELECT_MULTI); - perf_monitors->connect("multi_selected",this,"_performance_select"); - perf_draw = memnew( Control ); - perf_draw->connect("draw",this,"_performance_draw"); + perf_monitors->connect("multi_selected", this, "_performance_select"); + perf_draw = memnew(Control); + perf_draw->connect("draw", this, "_performance_draw"); hsp->add_child(perf_draw); hsp->set_name(TTR("Monitors")); hsp->set_split_offset(300); tabs->add_child(hsp); perf_max.resize(Performance::MONITOR_MAX); - Map<String,TreeItem*> bases; - TreeItem *root=perf_monitors->create_item(); + Map<String, TreeItem *> bases; + TreeItem *root = perf_monitors->create_item(); perf_monitors->set_hide_root(true); - for(int i=0;i<Performance::MONITOR_MAX;i++) { + for (int i = 0; i < Performance::MONITOR_MAX; i++) { String n = Performance::get_singleton()->get_monitor_name(Performance::Monitor(i)); - String base = n.get_slice("/",0); - String name = n.get_slice("/",1); + String base = n.get_slice("/", 0); + String name = n.get_slice("/", 1); if (!bases.has(base)) { TreeItem *b = perf_monitors->create_item(root); - b->set_text(0,base.capitalize()); - b->set_editable(0,false); - b->set_selectable(0,false); - bases[base]=b; + b->set_text(0, base.capitalize()); + b->set_editable(0, false); + b->set_selectable(0, false); + bases[base] = b; } TreeItem *it = perf_monitors->create_item(bases[base]); - it->set_editable(0,false); - it->set_selectable(0,true); - it->set_text(0,name.capitalize()); + it->set_editable(0, false); + it->set_selectable(0, true); + it->set_text(0, name.capitalize()); perf_items.push_back(it); - perf_max[i]=0; - + perf_max[i] = 0; } } { //vmem inspect - VBoxContainer *vmem_vb = memnew( VBoxContainer ); - HBoxContainer *vmem_hb = memnew( HBoxContainer ); - Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource:")+" ") ); + VBoxContainer *vmem_vb = memnew(VBoxContainer); + HBoxContainer *vmem_hb = memnew(HBoxContainer); + Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource:") + " ")); vmlb->set_h_size_flags(SIZE_EXPAND_FILL); - vmem_hb->add_child( vmlb ); - vmem_hb->add_child( memnew(Label(TTR("Total:")+" ")) ); - vmem_total = memnew( LineEdit ); + vmem_hb->add_child(vmlb); + vmem_hb->add_child(memnew(Label(TTR("Total:") + " "))); + vmem_total = memnew(LineEdit); vmem_total->set_editable(false); - vmem_total->set_custom_minimum_size(Size2(100,1)*EDSCALE); + vmem_total->set_custom_minimum_size(Size2(100, 1) * EDSCALE); vmem_hb->add_child(vmem_total); - vmem_refresh = memnew( Button ); + vmem_refresh = memnew(Button); vmem_hb->add_child(vmem_refresh); vmem_vb->add_child(vmem_hb); - vmem_refresh->connect("pressed",this,"_video_mem_request"); + vmem_refresh->connect("pressed", this, "_video_mem_request"); - MarginContainer *vmmc = memnew( MarginContainer ); - vmem_tree = memnew( Tree ); + MarginContainer *vmmc = memnew(MarginContainer); + vmem_tree = memnew(Tree); vmem_tree->set_v_size_flags(SIZE_EXPAND_FILL); vmem_tree->set_h_size_flags(SIZE_EXPAND_FILL); vmmc->add_child(vmem_tree); @@ -1920,69 +1779,64 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ vmem_vb->set_name(TTR("Video Mem")); vmem_tree->set_columns(4); vmem_tree->set_column_titles_visible(true); - vmem_tree->set_column_title(0,TTR("Resource Path")); - vmem_tree->set_column_expand(0,true); - vmem_tree->set_column_expand(1,false); - vmem_tree->set_column_title(1,TTR("Type")); - vmem_tree->set_column_min_width(1,100); - vmem_tree->set_column_expand(2,false); - vmem_tree->set_column_title(2,TTR("Format")); - vmem_tree->set_column_min_width(2,150); - vmem_tree->set_column_expand(3,false); - vmem_tree->set_column_title(3,TTR("Usage")); - vmem_tree->set_column_min_width(3,80); + vmem_tree->set_column_title(0, TTR("Resource Path")); + vmem_tree->set_column_expand(0, true); + vmem_tree->set_column_expand(1, false); + vmem_tree->set_column_title(1, TTR("Type")); + vmem_tree->set_column_min_width(1, 100); + vmem_tree->set_column_expand(2, false); + vmem_tree->set_column_title(2, TTR("Format")); + vmem_tree->set_column_min_width(2, 150); + vmem_tree->set_column_expand(3, false); + vmem_tree->set_column_title(3, TTR("Usage")); + vmem_tree->set_column_min_width(3, 80); vmem_tree->set_hide_root(true); tabs->add_child(vmem_vb); } { // misc - VBoxContainer *info_left = memnew( VBoxContainer ); + VBoxContainer *info_left = memnew(VBoxContainer); info_left->set_h_size_flags(SIZE_EXPAND_FILL); info_left->set_name(TTR("Misc")); tabs->add_child(info_left); - clicked_ctrl = memnew( LineEdit ); - info_left->add_margin_child(TTR("Clicked Control:"),clicked_ctrl); - clicked_ctrl_type = memnew( LineEdit ); - info_left->add_margin_child(TTR("Clicked Control Type:"),clicked_ctrl_type); + clicked_ctrl = memnew(LineEdit); + info_left->add_margin_child(TTR("Clicked Control:"), clicked_ctrl); + clicked_ctrl_type = memnew(LineEdit); + info_left->add_margin_child(TTR("Clicked Control Type:"), clicked_ctrl_type); - live_edit_root = memnew( LineEdit ); + live_edit_root = memnew(LineEdit); { - HBoxContainer *lehb = memnew( HBoxContainer ); - Label *l = memnew( Label(TTR("Live Edit Root:")) ); + HBoxContainer *lehb = memnew(HBoxContainer); + Label *l = memnew(Label(TTR("Live Edit Root:"))); lehb->add_child(l); l->set_h_size_flags(SIZE_EXPAND_FILL); - le_set = memnew( Button(TTR("Set From Tree")) ); + le_set = memnew(Button(TTR("Set From Tree"))); lehb->add_child(le_set); - le_clear = memnew( Button(TTR("Clear")) ); + le_clear = memnew(Button(TTR("Clear"))); lehb->add_child(le_clear); info_left->add_child(lehb); - MarginContainer *mc = memnew( MarginContainer ); + 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); } - } - - - msgdialog = memnew( AcceptDialog ); + msgdialog = memnew(AcceptDialog); add_child(msgdialog); - 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; - hide_on_stop=true; - last_error_count=0; - - EditorNode::get_singleton()->get_pause_button()->connect("pressed",this,"_paused"); - + 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; + hide_on_stop = true; + last_error_count = 0; + EditorNode::get_singleton()->get_pause_button()->connect("pressed", this, "_paused"); } ScriptEditorDebugger::~ScriptEditorDebugger() { @@ -1994,5 +1848,4 @@ ScriptEditorDebugger::~ScriptEditorDebugger() { server->stop(); memdelete(inspected_object); - } |