Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Style: Enforce braces around if blocks and loops

Browse source 
Using clang-tidy's `readability-braces-around-statements`.
https://clang.llvm.org/extra/clang-tidy/checks/readability-braces-around-statements.html
This commit is contained in:
Rémi Verschelde 2020-05-14 16:41:43 +02:00
parent 07bc4e2f96
commit 0ee0fa42e6
683 changed files with 22803 additions and 12225 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/etc/image_etc.cpp
View file

@ -127,8 +127,9 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
Ref<Image> img = p_img->duplicate();
if (img->get_format() != Image::FORMAT_RGBA8)
if (img->get_format() != Image::FORMAT_RGBA8) {
img->convert(Image::FORMAT_RGBA8); //still uses RGBA to convert
}
if (img->has_mipmaps()) {
if (next_power_of_2(imgw) != imgw || next_power_of_2(imgh) != imgh) {
@ -165,12 +166,13 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f
int encoding_time = 0;
float effort = 0.0; //default, reasonable time
if (p_lossy_quality > 0.75)
if (p_lossy_quality > 0.75) {
effort = 0.4;
else if (p_lossy_quality > 0.85)
} else if (p_lossy_quality > 0.85) {
effort = 0.6;
else if (p_lossy_quality > 0.95)
} else if (p_lossy_quality > 0.95) {
effort = 0.8;
}
Etc::ErrorMetric error_metric = Etc::ErrorMetric::RGBX; // NOTE: we can experiment with other error metrics
Etc::Image::Format etc2comp_etc_format = _image_format_to_etc2comp_format(etc_format);

15
modules/etc/texture_loader_pkm.cpp
View file

@ -43,17 +43,20 @@ struct ETC1Header {
};
RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) {
if (r_error)
if (r_error) {
*r_error = ERR_CANT_OPEN;
}
Error err;
FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err);
if (!f)
if (!f) {
return RES();
}
FileAccessRef fref(f);
if (r_error)
if (r_error) {
*r_error = ERR_FILE_CORRUPT;
}
ERR_FAIL_COND_V_MSG(err != OK, RES(), "Unable to open PKM texture file '" + p_path + "'.");
@ -86,8 +89,9 @@ RES ResourceFormatPKM::load(const String &p_path, const String &p_original_path,
Ref<ImageTexture> texture = memnew(ImageTexture);
texture->create_from_image(img);
if (r_error)
if (r_error) {
*r_error = OK;
}
f->close();
memdelete(f);
@ -103,7 +107,8 @@ bool ResourceFormatPKM::handles_type(const String &p_type) const {
}
String ResourceFormatPKM::get_resource_type(const String &p_path) const {
if (p_path.get_extension().to_lower() == "pkm")
if (p_path.get_extension().to_lower() == "pkm") {
return "ImageTexture";
}
return "";
}