diff options
| author | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
| commit | f8db8a3faa30b71dca33ced38be16d3f93f43e8a (patch) | |
| tree | 3b798318132cca7eccfbca5818ab55656a2896d7 /modules/squish/image_compress_squish.cpp | |
| parent | 1d418afe863c9e553b69174ce63aef203c46d2f0 (diff) | |
| download | godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.gz godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.zst godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.zip | |
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
5dbf1809c6e3e905b94b8764e99491e608122261.
Diffstat (limited to 'modules/squish/image_compress_squish.cpp')
| -rw-r--r-- | modules/squish/image_compress_squish.cpp | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp index 27f13f8e8..9d7eeee23 100644 --- a/modules/squish/image_compress_squish.cpp +++ b/modules/squish/image_compress_squish.cpp @@ -34,32 +34,36 @@ void image_compress_squish(Image *p_image) { - int w=p_image->get_width(); - int h=p_image->get_height(); + int w = p_image->get_width(); + int h = p_image->get_height(); if (p_image->get_mipmaps() == 0) { - ERR_FAIL_COND( !w || w % 4 != 0); - ERR_FAIL_COND( !h || h % 4 != 0); + ERR_FAIL_COND(!w || w % 4 != 0); + ERR_FAIL_COND(!h || h % 4 != 0); } else { - ERR_FAIL_COND( !w || w !=nearest_power_of_2(w) ); - ERR_FAIL_COND( !h || h !=nearest_power_of_2(h) ); + ERR_FAIL_COND(!w || w != nearest_power_of_2(w)); + ERR_FAIL_COND(!h || h != nearest_power_of_2(h)); }; - if (p_image->get_format()>=Image::FORMAT_BC1) + if (p_image->get_format() >= Image::FORMAT_BC1) return; //do not compress, already compressed - int shift=0; - int squish_comp=squish::kColourRangeFit; + int shift = 0; + int squish_comp = squish::kColourRangeFit; Image::Format target_format; - if (p_image->get_format()==Image::FORMAT_GRAYSCALE_ALPHA) { + if (p_image->get_format() == Image::FORMAT_GRAYSCALE_ALPHA) { //compressed normalmap - target_format = Image::FORMAT_BC3; squish_comp|=squish::kDxt5; - } else if (p_image->detect_alpha()!=Image::ALPHA_NONE) { + target_format = Image::FORMAT_BC3; + squish_comp |= squish::kDxt5; + } else if (p_image->detect_alpha() != Image::ALPHA_NONE) { - target_format = Image::FORMAT_BC2; squish_comp|=squish::kDxt3; + target_format = Image::FORMAT_BC2; + squish_comp |= squish::kDxt3; } else { - target_format = Image::FORMAT_BC1; shift=1; squish_comp|=squish::kDxt1; + target_format = Image::FORMAT_BC1; + shift = 1; + squish_comp |= squish::kDxt1; } p_image->convert(Image::FORMAT_RGBA); //always expects rgba @@ -67,26 +71,25 @@ void image_compress_squish(Image *p_image) { int mm_count = p_image->get_mipmaps(); DVector<uint8_t> data; - int target_size = Image::get_image_data_size(w,h,target_format,mm_count); + int target_size = Image::get_image_data_size(w, h, target_format, mm_count); data.resize(target_size); DVector<uint8_t>::Read rb = p_image->get_data().read(); DVector<uint8_t>::Write wb = data.write(); - int dst_ofs=0; + int dst_ofs = 0; - for(int i=0;i<=mm_count;i++) { + for (int i = 0; i <= mm_count; i++) { int src_ofs = p_image->get_mipmap_offset(i); - squish::CompressImage( &rb[src_ofs],w,h,&wb[dst_ofs],squish_comp); - dst_ofs+=(MAX(4,w)*MAX(4,h))>>shift; - w>>=1; - h>>=1; + squish::CompressImage(&rb[src_ofs], w, h, &wb[dst_ofs], squish_comp); + dst_ofs += (MAX(4, w) * MAX(4, h)) >> shift; + w >>= 1; + h >>= 1; } rb = DVector<uint8_t>::Read(); wb = DVector<uint8_t>::Write(); - p_image->create(p_image->get_width(),p_image->get_height(),p_image->get_mipmaps(),target_format,data); - + p_image->create(p_image->get_width(), p_image->get_height(), p_image->get_mipmaps(), target_format, data); } |
