hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

53
modules/squish/image_compress_squish.cpp
View file

@ -34,58 +34,61 @@
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->has_mipmaps() ) {
ERR_FAIL_COND( !w || w % 4 != 0);
ERR_FAIL_COND( !h || h % 4 != 0);
if (!p_image->has_mipmaps()) {
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_DXT1)
if (p_image->get_format() >= Image::FORMAT_DXT1)
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_LA8) {
if (p_image->get_format() == Image::FORMAT_LA8) {
//compressed normalmap
target_format = Image::FORMAT_DXT5; squish_comp|=squish::kDxt5;
} else if (p_image->detect_alpha()!=Image::ALPHA_NONE) {
target_format = Image::FORMAT_DXT5;
squish_comp |= squish::kDxt5;
} else if (p_image->detect_alpha() != Image::ALPHA_NONE) {
target_format = Image::FORMAT_DXT3; squish_comp|=squish::kDxt3;
target_format = Image::FORMAT_DXT3;
squish_comp |= squish::kDxt3;
} else {
target_format = Image::FORMAT_DXT1; shift=1; squish_comp|=squish::kDxt1;
target_format = Image::FORMAT_DXT1;
shift = 1;
squish_comp |= squish::kDxt1;
}
p_image->convert(Image::FORMAT_RGBA8); //always expects rgba
PoolVector<uint8_t> data;
int target_size = Image::get_image_data_size(w,h,target_format,p_image->has_mipmaps()?-1:0);
int mm_count = p_image->has_mipmaps() ? Image::get_image_required_mipmaps(w,h,target_format) : 0;
int target_size = Image::get_image_data_size(w, h, target_format, p_image->has_mipmaps() ? -1 : 0);
int mm_count = p_image->has_mipmaps() ? Image::get_image_required_mipmaps(w, h, target_format) : 0;
data.resize(target_size);
PoolVector<uint8_t>::Read rb = p_image->get_data().read();
PoolVector<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 = PoolVector<uint8_t>::Read();
wb = PoolVector<uint8_t>::Write();
p_image->create(p_image->get_width(),p_image->get_height(),p_image->has_mipmaps(),target_format,data);
p_image->create(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data);
}