seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A Whole New World (clang-format edition)

Browse Source 
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde
2017-03-05 16:44:50 +01:00
parent 45438e9918
commit 5dbf1809c6
1318 changed files with 140051 additions and 166004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
editor/editor_path.cpp
View File

@ -28,25 +28,25 @@
/*************************************************************************/
#include "editor_path.h"
#include "editor_scale.h"
#include "editor_node.h"
#include "editor_scale.h"
void EditorPath::_add_children_to_popup(Object* p_obj,int p_depth) {
void EditorPath::_add_children_to_popup(Object *p_obj, int p_depth) {
if (p_depth>8)
if (p_depth > 8)
return;
List<PropertyInfo> pinfo;
p_obj->get_property_list(&pinfo);
for (List<PropertyInfo>::Element *E=pinfo.front();E;E=E->next()) {
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
if (!(E->get().usage&PROPERTY_USAGE_EDITOR))
if (!(E->get().usage & PROPERTY_USAGE_EDITOR))
continue;
if (E->get().hint!=PROPERTY_HINT_RESOURCE_TYPE)
if (E->get().hint != PROPERTY_HINT_RESOURCE_TYPE)
continue;
Variant value = p_obj->get(E->get().name);
if (value.get_type()!=Variant::OBJECT)
if (value.get_type() != Variant::OBJECT)
continue;
Object *obj = value;
if (!obj)
@ -54,69 +54,64 @@ void EditorPath::_add_children_to_popup(Object* p_obj,int p_depth) {
Ref<Texture> icon;
if (has_icon(obj->get_class(),"EditorIcons"))
icon=get_icon(obj->get_class(),"EditorIcons");
if (has_icon(obj->get_class(), "EditorIcons"))
icon = get_icon(obj->get_class(), "EditorIcons");
else
icon=get_icon("Object","EditorIcons");
icon = get_icon("Object", "EditorIcons");
int index = popup->get_item_count();
popup->add_icon_item(icon,E->get().name.capitalize(),objects.size());
popup->set_item_h_offset(index,p_depth*10*EDSCALE);
popup->add_icon_item(icon, E->get().name.capitalize(), objects.size());
popup->set_item_h_offset(index, p_depth * 10 * EDSCALE);
objects.push_back(obj->get_instance_ID());
_add_children_to_popup(obj,p_depth+1);
_add_children_to_popup(obj, p_depth + 1);
}
}
void EditorPath::_gui_input(const InputEvent& p_event) {
void EditorPath::_gui_input(const InputEvent &p_event) {
if (p_event.type==InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index==BUTTON_LEFT && p_event.mouse_button.pressed) {
if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index == BUTTON_LEFT && p_event.mouse_button.pressed) {
Object *obj = ObjectDB::get_instance(history->get_path_object( history->get_path_size()-1));
Object *obj = ObjectDB::get_instance(history->get_path_object(history->get_path_size() - 1));
if (!obj)
return;
objects.clear();
popup->clear();
_add_children_to_popup(obj);
popup->set_pos( get_global_pos() + Vector2(0,get_size().height));
popup->set_size( Size2(get_size().width,1));
popup->set_pos(get_global_pos() + Vector2(0, get_size().height));
popup->set_size(Size2(get_size().width, 1));
popup->popup();
}
}
void EditorPath::_notification(int p_what) {
switch(p_what) {
switch (p_what) {
case NOTIFICATION_MOUSE_ENTER: {
mouse_over=true;
mouse_over = true;
update();
} break;
case NOTIFICATION_MOUSE_EXIT: {
mouse_over=false;
mouse_over = false;
update();
} break;
case NOTIFICATION_DRAW: {
RID ci=get_canvas_item();
Ref<Font> label_font = get_font("font","Label");
RID ci = get_canvas_item();
Ref<Font> label_font = get_font("font", "Label");
Size2i size = get_size();
Ref<Texture> sn = get_icon("SmallNext","EditorIcons");
Ref<StyleBox> sb = get_stylebox("pressed","Button");
Ref<Texture> sn = get_icon("SmallNext", "EditorIcons");
Ref<StyleBox> sb = get_stylebox("pressed", "Button");
int ofs=sb->get_margin(MARGIN_LEFT);
int ofs = sb->get_margin(MARGIN_LEFT);
if (mouse_over) {
draw_style_box(sb,Rect2(Point2(),get_size()));
draw_style_box(sb, Rect2(Point2(), get_size()));
}
for(int i=0;i<history->get_path_size();i++) {
for (int i = 0; i < history->get_path_size(); i++) {
Object *obj = ObjectDB::get_instance(history->get_path_object(i));
if (!obj)
@ -126,53 +121,50 @@ void EditorPath::_notification(int p_what) {
Ref<Texture> icon;
if (has_icon(obj->get_class(),"EditorIcons"))
icon=get_icon(obj->get_class(),"EditorIcons");
if (has_icon(obj->get_class(), "EditorIcons"))
icon = get_icon(obj->get_class(), "EditorIcons");
else
icon=get_icon("Object","EditorIcons");
icon = get_icon("Object", "EditorIcons");
icon->draw(ci, Point2i(ofs, (size.height - icon->get_height()) / 2));
icon->draw(ci,Point2i(ofs,(size.height-icon->get_height())/2));
ofs += icon->get_width();
ofs+=icon->get_width();
if (i==history->get_path_size()-1) {
if (i == history->get_path_size() - 1) {
//add name
ofs+=4;
ofs += 4;
int left = size.width - ofs;
if (left<0)
if (left < 0)
continue;
String name;
if (obj->cast_to<Resource>()) {
Resource *r = obj->cast_to<Resource>();
if (r->get_path().is_resource_file())
name=r->get_path().get_file();
name = r->get_path().get_file();
else
name=r->get_name();
name = r->get_name();
if (name=="")
name=r->get_class();
if (name == "")
name = r->get_class();
} else if (obj->cast_to<Node>()) {
name=obj->cast_to<Node>()->get_name();
} else if (obj->cast_to<Resource>() && obj->cast_to<Resource>()->get_name()!="") {
name=obj->cast_to<Resource>()->get_name();
name = obj->cast_to<Node>()->get_name();
} else if (obj->cast_to<Resource>() && obj->cast_to<Resource>()->get_name() != "") {
name = obj->cast_to<Resource>()->get_name();
} else {
name=obj->get_class();
name = obj->get_class();
}
set_tooltip(obj->get_class());
label_font->draw(ci,Point2i(ofs,(size.height-label_font->get_height())/2+label_font->get_ascent()),name,Color(1,1,1),left);
label_font->draw(ci, Point2i(ofs, (size.height - label_font->get_height()) / 2 + label_font->get_ascent()), name, Color(1, 1, 1), left);
} else {
//add arrow
//sn->draw(ci,Point2i(ofs,(size.height-sn->get_height())/2));
//ofs+=sn->get_width();
ofs+=5; //just looks better! somehow
ofs += 5; //just looks better! somehow
}
}
@ -182,15 +174,14 @@ void EditorPath::_notification(int p_what) {
void EditorPath::update_path() {
update();
}
void EditorPath::_popup_select(int p_idx) {
ERR_FAIL_INDEX(p_idx,objects.size());
ERR_FAIL_INDEX(p_idx, objects.size());
Object* obj = ObjectDB::get_instance(objects[p_idx]);
Object *obj = ObjectDB::get_instance(objects[p_idx]);
if (!obj)
return;
@ -199,17 +190,15 @@ void EditorPath::_popup_select(int p_idx) {
void EditorPath::_bind_methods() {
ClassDB::bind_method("_gui_input",&EditorPath::_gui_input);
ClassDB::bind_method("_popup_select",&EditorPath::_popup_select);
ClassDB::bind_method("_gui_input", &EditorPath::_gui_input);
ClassDB::bind_method("_popup_select", &EditorPath::_popup_select);
}
EditorPath::EditorPath(EditorHistory *p_history) {
history=p_history;
mouse_over=false;
popup = memnew( PopupMenu );
popup->connect("id_pressed",this,"_popup_select");
history = p_history;
mouse_over = false;
popup = memnew(PopupMenu);
popup->connect("id_pressed", this, "_popup_select");
add_child(popup);
}