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

106
drivers/png/resource_saver_png.cpp
View File

@ -35,20 +35,19 @@
#include <png.h>
static void _write_png_data(png_structp png_ptr,png_bytep data, png_size_t p_length) {
static void _write_png_data(png_structp png_ptr, png_bytep data, png_size_t p_length) {
FileAccess *f = (FileAccess*)png_get_io_ptr(png_ptr);
f->store_buffer( (const uint8_t*)data,p_length);
FileAccess *f = (FileAccess *)png_get_io_ptr(png_ptr);
f->store_buffer((const uint8_t *)data, p_length);
}
Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t p_flags) {
Error ResourceSaverPNG::save(const String &p_path, const RES &p_resource, uint32_t p_flags) {
Ref<ImageTexture> texture=p_resource;
Ref<ImageTexture> texture = p_resource;
ERR_FAIL_COND_V(!texture.is_valid(),ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(!texture.is_valid(), ERR_INVALID_PARAMETER);
ERR_EXPLAIN("Can't save empty texture as PNG");
ERR_FAIL_COND_V(!texture->get_width() || !texture->get_height(),ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(!texture->get_width() || !texture->get_height(), ERR_INVALID_PARAMETER);
Image img = texture->get_data();
@ -62,28 +61,28 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t
String text;
if (global_filter!=bool(texture->get_flags()&Texture::FLAG_FILTER)) {
text+=bool(texture->get_flags()&Texture::FLAG_FILTER)?"filter=true\n":"filter=false\n";
if (global_filter != bool(texture->get_flags() & Texture::FLAG_FILTER)) {
text += bool(texture->get_flags() & Texture::FLAG_FILTER) ? "filter=true\n" : "filter=false\n";
}
if (global_mipmaps!=bool(texture->get_flags()&Texture::FLAG_MIPMAPS)) {
text+=bool(texture->get_flags()&Texture::FLAG_MIPMAPS)?"gen_mipmaps=true\n":"gen_mipmaps=false\n";
if (global_mipmaps != bool(texture->get_flags() & Texture::FLAG_MIPMAPS)) {
text += bool(texture->get_flags() & Texture::FLAG_MIPMAPS) ? "gen_mipmaps=true\n" : "gen_mipmaps=false\n";
}
if (global_repeat!=bool(texture->get_flags()&Texture::FLAG_REPEAT)) {
text+=bool(texture->get_flags()&Texture::FLAG_REPEAT)?"repeat=true\n":"repeat=false\n";
if (global_repeat != bool(texture->get_flags() & Texture::FLAG_REPEAT)) {
text += bool(texture->get_flags() & Texture::FLAG_REPEAT) ? "repeat=true\n" : "repeat=false\n";
}
if (bool(texture->get_flags()&Texture::FLAG_ANISOTROPIC_FILTER)) {
text+="anisotropic=true\n";
if (bool(texture->get_flags() & Texture::FLAG_ANISOTROPIC_FILTER)) {
text += "anisotropic=true\n";
}
if (bool(texture->get_flags()&Texture::FLAG_CONVERT_TO_LINEAR)) {
text+="tolinear=true\n";
if (bool(texture->get_flags() & Texture::FLAG_CONVERT_TO_LINEAR)) {
text += "tolinear=true\n";
}
if (bool(texture->get_flags()&Texture::FLAG_MIRRORED_REPEAT)) {
text+="mirroredrepeat=true\n";
if (bool(texture->get_flags() & Texture::FLAG_MIRRORED_REPEAT)) {
text += "mirroredrepeat=true\n";
}
if (text!="" || FileAccess::exists(p_path+".flags")) {
if (text != "" || FileAccess::exists(p_path + ".flags")) {
FileAccess* f = FileAccess::open(p_path+".flags",FileAccess::WRITE);
FileAccess *f = FileAccess::open(p_path + ".flags", FileAccess::WRITE);
if (f) {
f->store_string(text);
@ -92,7 +91,6 @@ Error ResourceSaverPNG::save(const String &p_path,const RES& p_resource,uint32_t
}
}
return err;
};
@ -105,100 +103,95 @@ Error ResourceSaverPNG::save_image(const String &p_path, Image &p_img) {
png_structp png_ptr;
png_infop info_ptr;
png_bytep * row_pointers;
png_bytep *row_pointers;
/* initialize stuff */
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
ERR_FAIL_COND_V(!png_ptr,ERR_CANT_CREATE);
ERR_FAIL_COND_V(!png_ptr, ERR_CANT_CREATE);
info_ptr = png_create_info_struct(png_ptr);
ERR_FAIL_COND_V(!info_ptr,ERR_CANT_CREATE);
ERR_FAIL_COND_V(!info_ptr, ERR_CANT_CREATE);
if (setjmp(png_jmpbuf(png_ptr))) {
ERR_FAIL_V(ERR_CANT_OPEN);
}
//change this
Error err;
FileAccess* f = FileAccess::open(p_path,FileAccess::WRITE,&err);
FileAccess *f = FileAccess::open(p_path, FileAccess::WRITE, &err);
if (err) {
ERR_FAIL_V(err);
}
png_set_write_fn(png_ptr,f,_write_png_data,NULL);
png_set_write_fn(png_ptr, f, _write_png_data, NULL);
/* write header */
if (setjmp(png_jmpbuf(png_ptr))) {
ERR_FAIL_V(ERR_CANT_OPEN);
}
int pngf=0;
int cs=0;
int pngf = 0;
int cs = 0;
switch(p_img.get_format()) {
switch (p_img.get_format()) {
case Image::FORMAT_L8: {
pngf=PNG_COLOR_TYPE_GRAY;
cs=1;
pngf = PNG_COLOR_TYPE_GRAY;
cs = 1;
} break;
case Image::FORMAT_LA8: {
pngf=PNG_COLOR_TYPE_GRAY_ALPHA;
cs=2;
pngf = PNG_COLOR_TYPE_GRAY_ALPHA;
cs = 2;
} break;
case Image::FORMAT_RGB8: {
pngf=PNG_COLOR_TYPE_RGB;
cs=3;
pngf = PNG_COLOR_TYPE_RGB;
cs = 3;
} break;
case Image::FORMAT_RGBA8: {
pngf=PNG_COLOR_TYPE_RGB_ALPHA;
cs=4;
pngf = PNG_COLOR_TYPE_RGB_ALPHA;
cs = 4;
} break;
default: {
if (p_img.detect_alpha()) {
p_img.convert(Image::FORMAT_RGBA8);
pngf=PNG_COLOR_TYPE_RGB_ALPHA;
cs=4;
pngf = PNG_COLOR_TYPE_RGB_ALPHA;
cs = 4;
} else {
p_img.convert(Image::FORMAT_RGB8);
pngf=PNG_COLOR_TYPE_RGB;
cs=3;
pngf = PNG_COLOR_TYPE_RGB;
cs = 3;
}
}
}
int w = p_img.get_width();
int h = p_img.get_height();
png_set_IHDR(png_ptr, info_ptr, w,h,
8, pngf, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
png_set_IHDR(png_ptr, info_ptr, w, h,
8, pngf, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
png_write_info(png_ptr, info_ptr);
/* write bytes */
if (setjmp(png_jmpbuf(png_ptr))) {
memdelete(f);
ERR_FAIL_V(ERR_CANT_OPEN);
}
PoolVector<uint8_t>::Read r = p_img.get_data().read();
row_pointers = (png_bytep*)memalloc(sizeof(png_bytep)*h);
for(int i=0;i<h;i++) {
row_pointers = (png_bytep *)memalloc(sizeof(png_bytep) * h);
for (int i = 0; i < h; i++) {
row_pointers[i]=(png_bytep)&r[i*w*cs];
row_pointers[i] = (png_bytep)&r[i * w * cs];
}
png_write_image(png_ptr, row_pointers);
@ -220,16 +213,15 @@ Error ResourceSaverPNG::save_image(const String &p_path, Image &p_img) {
return OK;
}
bool ResourceSaverPNG::recognize(const RES& p_resource) const {
bool ResourceSaverPNG::recognize(const RES &p_resource) const {
return (p_resource.is_valid() && p_resource->is_class("ImageTexture"));
}
void ResourceSaverPNG::get_recognized_extensions(const RES& p_resource,List<String> *p_extensions) const{
void ResourceSaverPNG::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
if (p_resource->cast_to<Texture>()) {
p_extensions->push_back("png");
}
}
ResourceSaverPNG::ResourceSaverPNG() {