1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00

Bring that Whole New World to the Old Continent too

Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions

View File

@@ -29,90 +29,78 @@
#include "image_loader.h"
#include "print_string.h"
bool ImageFormatLoader::recognize(const String& p_extension) const {
bool ImageFormatLoader::recognize(const String &p_extension) const {
List<String> extensions;
get_recognized_extensions(&extensions);
for (List<String>::Element *E=extensions.front();E;E=E->next()) {
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
if (E->get().nocasecmp_to(p_extension.extension())==0)
if (E->get().nocasecmp_to(p_extension.extension()) == 0)
return true;
}
return false;
}
Error ImageLoader::load_image(String p_file,Image *p_image, FileAccess *p_custom) {
Error ImageLoader::load_image(String p_file, Image *p_image, FileAccess *p_custom) {
FileAccess *f=p_custom;
FileAccess *f = p_custom;
if (!f) {
Error err;
f=FileAccess::open(p_file,FileAccess::READ,&err);
f = FileAccess::open(p_file, FileAccess::READ, &err);
if (!f) {
ERR_PRINTS("Error opening file: "+p_file);
ERR_PRINTS("Error opening file: " + p_file);
return err;
}
}
String extension = p_file.extension();
for (int i=0;i<loader_count;i++) {
for (int i = 0; i < loader_count; i++) {
if (!loader[i]->recognize(extension))
continue;
Error err = loader[i]->load_image(p_image,f);
if (err!=ERR_FILE_UNRECOGNIZED) {
Error err = loader[i]->load_image(p_image, f);
if (err != ERR_FILE_UNRECOGNIZED) {
if (!p_custom)
memdelete(f);
return err;
}
}
if (!p_custom)
memdelete(f);
return ERR_FILE_UNRECOGNIZED;
}
void ImageLoader::get_recognized_extensions(List<String> *p_extensions) {
for (int i=0;i<loader_count;i++) {
for (int i = 0; i < loader_count; i++) {
loader[i]->get_recognized_extensions(p_extensions);
}
}
bool ImageLoader::recognize(const String& p_extension) {
bool ImageLoader::recognize(const String &p_extension) {
for (int i=0;i<loader_count;i++) {
for (int i = 0; i < loader_count; i++) {
if (loader[i]->recognize(p_extension))
return true;
}
return false;
}
ImageFormatLoader *ImageLoader::loader[MAX_LOADERS];
int ImageLoader::loader_count=0;
int ImageLoader::loader_count = 0;
void ImageLoader::add_image_format_loader(ImageFormatLoader *p_loader) {
ERR_FAIL_COND(loader_count >=MAX_LOADERS );
loader[loader_count++]=p_loader;
ERR_FAIL_COND(loader_count >= MAX_LOADERS);
loader[loader_count++] = p_loader;
}