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

177
editor/import_dock.cpp
View File

@ -29,38 +29,36 @@
#include "import_dock.h"
class ImportDockParameters : public Object {
GDCLASS(ImportDockParameters,Object)
GDCLASS(ImportDockParameters, Object)
public:
Map<StringName,Variant> values;
Map<StringName, Variant> values;
List<PropertyInfo> properties;
Ref<ResourceImporter> importer;
Vector<String> paths;
bool _set(const StringName& p_name, const Variant& p_value) {
bool _set(const StringName &p_name, const Variant &p_value) {
if (values.has(p_name)) {
values[p_name]=p_value;
values[p_name] = p_value;
return true;
}
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)) {
r_ret=values[p_name];
r_ret = values[p_name];
return true;
}
return false;
}
void _get_property_list( List<PropertyInfo> *p_list) const {
void _get_property_list(List<PropertyInfo> *p_list) const {
for (const List<PropertyInfo>::Element *E=properties.front();E;E=E->next()) {
if (!importer->get_option_visibility(E->get().name,values))
for (const List<PropertyInfo>::Element *E = properties.front(); E; E = E->next()) {
if (!importer->get_option_visibility(E->get().name, values))
continue;
p_list->push_back(E->get());
}
@ -71,18 +69,17 @@ public:
}
};
void ImportDock::set_edit_path(const String& p_path) {
void ImportDock::set_edit_path(const String &p_path) {
Ref<ConfigFile> config;
config.instance();
Error err = config->load(p_path+".import");
if (err!=OK) {
Error err = config->load(p_path + ".import");
if (err != OK) {
clear();
return;
}
params->importer = ResourceFormatImporter::get_singleton()->get_importer_by_name(config->get_value("remap","importer"));
params->importer = ResourceFormatImporter::get_singleton()->get_importer_by_name(config->get_value("remap", "importer"));
if (params->importer.is_null()) {
clear();
return;
@ -94,44 +91,44 @@ void ImportDock::set_edit_path(const String& p_path) {
params->properties.clear();
params->values.clear();
for (List<ResourceImporter::ImportOption>::Element *E=options.front();E;E=E->next()) {
for (List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) {
params->properties.push_back(E->get().option);
if (config->has_section_key("params",E->get().option.name)) {
params->values[E->get().option.name]=config->get_value("params",E->get().option.name);
if (config->has_section_key("params", E->get().option.name)) {
params->values[E->get().option.name] = config->get_value("params", E->get().option.name);
} else {
params->values[E->get().option.name]=E->get().default_value;
params->values[E->get().option.name] = E->get().default_value;
}
}
params->update();
List<Ref<ResourceImporter> > importers;
ResourceFormatImporter::get_singleton()->get_importers_for_extension(p_path.get_extension(),&importers);
List<Pair<String,String> > importer_names;
ResourceFormatImporter::get_singleton()->get_importers_for_extension(p_path.get_extension(), &importers);
List<Pair<String, String> > importer_names;
for (List<Ref<ResourceImporter> > ::Element *E=importers.front();E;E=E->next()) {
importer_names.push_back(Pair<String,String>(E->get()->get_visible_name(),E->get()->get_importer_name()));
for (List<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) {
importer_names.push_back(Pair<String, String>(E->get()->get_visible_name(), E->get()->get_importer_name()));
}
importer_names.sort_custom<PairSort<String,String> >();
importer_names.sort_custom<PairSort<String, String> >();
import_as->clear();
for (List<Pair<String,String> >::Element *E=importer_names.front();E;E=E->next()) {
for (List<Pair<String, String> >::Element *E = importer_names.front(); E; E = E->next()) {
import_as->add_item(E->get().first);
import_as->set_item_metadata(import_as->get_item_count()-1,E->get().second);
if (E->get().second==params->importer->get_importer_name()) {
import_as->select(import_as->get_item_count()-1);
import_as->set_item_metadata(import_as->get_item_count() - 1, E->get().second);
if (E->get().second == params->importer->get_importer_name()) {
import_as->select(import_as->get_item_count() - 1);
}
}
preset->get_popup()->clear();
if (params->importer->get_preset_count()==0) {
if (params->importer->get_preset_count() == 0) {
preset->get_popup()->add_item(TTR("Default"));
} else {
for (int i=0;i<params->importer->get_preset_count();i++) {
for (int i = 0; i < params->importer->get_preset_count(); i++) {
preset->get_popup()->add_item(params->importer->get_preset_name(i));
}
}
@ -144,22 +141,22 @@ void ImportDock::set_edit_path(const String& p_path) {
imported->set_text(p_path.get_file());
}
void ImportDock::set_edit_multiple_paths(const Vector<String>& p_paths) {
void ImportDock::set_edit_multiple_paths(const Vector<String> &p_paths) {
clear();
//use the value that is repeated the mot
Map<String,Dictionary> value_frequency;
Map<String, Dictionary> value_frequency;
for(int i=0;i<p_paths.size();i++) {
for (int i = 0; i < p_paths.size(); i++) {
Ref<ConfigFile> config;
config.instance();
Error err = config->load(p_paths[i]+".import");
ERR_CONTINUE(err!=OK);
Error err = config->load(p_paths[i] + ".import");
ERR_CONTINUE(err != OK);
if (i==0) {
params->importer = ResourceFormatImporter::get_singleton()->get_importer_by_name(config->get_value("remap","importer"));
if (i == 0) {
params->importer = ResourceFormatImporter::get_singleton()->get_importer_by_name(config->get_value("remap", "importer"));
if (params->importer.is_null()) {
clear();
return;
@ -167,24 +164,22 @@ void ImportDock::set_edit_multiple_paths(const Vector<String>& p_paths) {
}
List<String> keys;
config->get_section_keys("params",&keys);
config->get_section_keys("params", &keys);
for (List<String>::Element *E=keys.front();E;E=E->next()) {
for (List<String>::Element *E = keys.front(); E; E = E->next()) {
if (!value_frequency.has(E->get())) {
value_frequency[E->get()]=Dictionary();
value_frequency[E->get()] = Dictionary();
}
Variant value = config->get_value("params",E->get());
Variant value = config->get_value("params", E->get());
if (value_frequency[E->get()].has(value)) {
value_frequency[E->get()][value]=int(value_frequency[E->get()][value])+1;
value_frequency[E->get()][value] = int(value_frequency[E->get()][value]) + 1;
} else {
value_frequency[E->get()][value]=1;
value_frequency[E->get()][value] = 1;
}
}
}
ERR_FAIL_COND(params->importer.is_null());
@ -195,86 +190,84 @@ void ImportDock::set_edit_multiple_paths(const Vector<String>& p_paths) {
params->properties.clear();
params->values.clear();
for (List<ResourceImporter::ImportOption>::Element *E=options.front();E;E=E->next()) {
for (List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) {
params->properties.push_back(E->get().option);
if (value_frequency.has(E->get().option.name)) {
Dictionary d = value_frequency[E->get().option.name];
int freq=0;
int freq = 0;
List<Variant> v;
d.get_key_list(&v);
Variant value;
for (List<Variant>::Element *F=v.front();F;F=F->next()) {
for (List<Variant>::Element *F = v.front(); F; F = F->next()) {
int f = d[F->get()];
if (f>freq) {
value=F->get();
if (f > freq) {
value = F->get();
}
}
params->values[E->get().option.name]=value;
params->values[E->get().option.name] = value;
} else {
params->values[E->get().option.name]=E->get().default_value;
params->values[E->get().option.name] = E->get().default_value;
}
}
params->update();
List<Ref<ResourceImporter> > importers;
ResourceFormatImporter::get_singleton()->get_importers_for_extension(p_paths[0].get_extension(),&importers);
List<Pair<String,String> > importer_names;
ResourceFormatImporter::get_singleton()->get_importers_for_extension(p_paths[0].get_extension(), &importers);
List<Pair<String, String> > importer_names;
for (List<Ref<ResourceImporter> > ::Element *E=importers.front();E;E=E->next()) {
importer_names.push_back(Pair<String,String>(E->get()->get_visible_name(),E->get()->get_importer_name()));
for (List<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) {
importer_names.push_back(Pair<String, String>(E->get()->get_visible_name(), E->get()->get_importer_name()));
}
importer_names.sort_custom<PairSort<String,String> >();
importer_names.sort_custom<PairSort<String, String> >();
import_as->clear();
for (List<Pair<String,String> >::Element *E=importer_names.front();E;E=E->next()) {
for (List<Pair<String, String> >::Element *E = importer_names.front(); E; E = E->next()) {
import_as->add_item(E->get().first);
import_as->set_item_metadata(import_as->get_item_count()-1,E->get().second);
if (E->get().second==params->importer->get_importer_name()) {
import_as->select(import_as->get_item_count()-1);
import_as->set_item_metadata(import_as->get_item_count() - 1, E->get().second);
if (E->get().second == params->importer->get_importer_name()) {
import_as->select(import_as->get_item_count() - 1);
}
}
preset->get_popup()->clear();
if (params->importer->get_preset_count()==0) {
if (params->importer->get_preset_count() == 0) {
preset->get_popup()->add_item(TTR("Default"));
} else {
for (int i=0;i<params->importer->get_preset_count();i++) {
for (int i = 0; i < params->importer->get_preset_count(); i++) {
preset->get_popup()->add_item(params->importer->get_preset_name(i));
}
}
params->paths=p_paths;
params->paths = p_paths;
import->set_disabled(false);
import_as->set_disabled(false);
imported->set_text(itos(p_paths.size())+TTR(" Files"));
imported->set_text(itos(p_paths.size()) + TTR(" Files"));
}
void ImportDock::_preset_selected(int p_idx) {
print_line("preset selected? "+p_idx);
print_line("preset selected? " + p_idx);
List<ResourceImporter::ImportOption> options;
params->importer->get_import_options(&options,p_idx);
params->importer->get_import_options(&options, p_idx);
for (List<ResourceImporter::ImportOption>::Element *E=options.front();E;E=E->next()) {
for (List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) {
params->values[E->get().option.name]=E->get().default_value;
params->values[E->get().option.name] = E->get().default_value;
}
params->update();
}
void ImportDock::clear() {
imported->set_text("");
@ -285,72 +278,68 @@ void ImportDock::clear() {
params->properties.clear();
params->update();
preset->get_popup()->clear();
}
void ImportDock::_reimport() {
for(int i=0;i<params->paths.size();i++) {
for (int i = 0; i < params->paths.size(); i++) {
Ref<ConfigFile> config;
config.instance();
Error err = config->load(params->paths[i]+".import");
ERR_CONTINUE(err!=OK);
Error err = config->load(params->paths[i] + ".import");
ERR_CONTINUE(err != OK);
config->erase_section("params");
for (List<PropertyInfo>::Element *E=params->properties.front();E;E=E->next()) {
config->set_value("params",E->get().name,params->values[E->get().name]);
for (List<PropertyInfo>::Element *E = params->properties.front(); E; E = E->next()) {
config->set_value("params", E->get().name, params->values[E->get().name]);
}
config->save(params->paths[i]+".import");
config->save(params->paths[i] + ".import");
}
EditorFileSystem::get_singleton()->reimport_files(params->paths);
EditorFileSystem::get_singleton()->emit_signal("filesystem_changed"); //it changed, so force emitting the signal
}
void ImportDock::_bind_methods() {
ClassDB::bind_method(D_METHOD("_reimport"),&ImportDock::_reimport);
ClassDB::bind_method(D_METHOD("_preset_selected"),&ImportDock::_preset_selected);
ClassDB::bind_method(D_METHOD("_reimport"), &ImportDock::_reimport);
ClassDB::bind_method(D_METHOD("_preset_selected"), &ImportDock::_preset_selected);
}
ImportDock::ImportDock() {
imported = memnew( LineEdit );
imported = memnew(LineEdit);
imported->set_editable(false);
add_child(imported);
HBoxContainer *hb = memnew(HBoxContainer);
add_margin_child(TTR("Import As:"),hb);
import_as = memnew( OptionButton );
add_margin_child(TTR("Import As:"), hb);
import_as = memnew(OptionButton);
hb->add_child(import_as);
import_as->set_h_size_flags(SIZE_EXPAND_FILL);
preset = memnew( MenuButton );
preset = memnew(MenuButton);
preset->set_text(TTR("Preset.."));
preset->get_popup()->connect("index_pressed",this,"_preset_selected");
preset->get_popup()->connect("index_pressed", this, "_preset_selected");
hb->add_child(preset);
import_opts = memnew( PropertyEditor );
import_opts = memnew(PropertyEditor);
add_child(import_opts);
import_opts->set_v_size_flags(SIZE_EXPAND_FILL);
import_opts->hide_top_label();
import_opts->set_hide_script(true);
hb = memnew( HBoxContainer );
hb = memnew(HBoxContainer);
add_child(hb);
import = memnew( Button );
import = memnew(Button);
import->set_text(TTR("Reimport"));
import->connect("pressed",this,"_reimport");
import->connect("pressed", this, "_reimport");
hb->add_spacer();
hb->add_child(import);
hb->add_spacer();
params = memnew( ImportDockParameters );
params = memnew(ImportDockParameters);
import_opts->edit(params);
}
ImportDock::~ImportDock() {