A Whole New World (clang-format edition)

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

1 files changed, 29 insertions, 34 deletions

diff --git a/editor/pvrtc_compress.cpp b/editor/pvrtc_compress.cpp
index b130f6c773..4b4e74cd62 100644
--- a/editor/pvrtc_compress.cpp
+++ b/editor/pvrtc_compress.cpp
@@ -29,21 +29,21 @@
 #include "pvrtc_compress.h"
 
 #include "editor_settings.h"
-#include "scene/resources/texture.h"
-#include "io/resource_saver.h"
 #include "io/resource_loader.h"
-#include "os/os.h"
+#include "io/resource_saver.h"
 #include "os/file_access.h"
+#include "os/os.h"
+#include "scene/resources/texture.h"
 
-static void (*_base_image_compress_pvrtc2_func)(Image *)=NULL;
-static void (*_base_image_compress_pvrtc4_func)(Image *)=NULL;
+static void (*_base_image_compress_pvrtc2_func)(Image *) = NULL;
+static void (*_base_image_compress_pvrtc4_func)(Image *) = NULL;
 
-static void _compress_image(Image::CompressMode p_mode,Image *p_image) {
+static void _compress_image(Image::CompressMode p_mode, Image *p_image) {
 
 	String ttpath = EditorSettings::get_singleton()->get("filesystem/import/pvrtc_texture_tool");
 
-	if (ttpath.strip_edges()=="" || !FileAccess::exists(ttpath)) {
-		switch(p_mode) {
+	if (ttpath.strip_edges() == "" || !FileAccess::exists(ttpath)) {
+		switch (p_mode) {
 
 			case Image::COMPRESS_PVRTC2:
 				if (_base_image_compress_pvrtc2_func)
@@ -51,37 +51,34 @@ static void _compress_image(Image::CompressMode p_mode,Image *p_image) {
 				else if (_base_image_compress_pvrtc4_func)
 					_base_image_compress_pvrtc4_func(p_image);
 
-			break;
+				break;
 			case Image::COMPRESS_PVRTC4:
 				if (_base_image_compress_pvrtc4_func)
 					_base_image_compress_pvrtc4_func(p_image);
 
-			break;
+				break;
 			default: ERR_FAIL();
-
 		}
 		return;
 	}
 	String spath = EditorSettings::get_singleton()->get_settings_path();
 
-
 	List<String> args;
 
-	String src_img = spath+"/"+"_tmp_src_img.png";
-	String dst_img = spath+"/"+"_tmp_dst_img.pvr";
+	String src_img = spath + "/" + "_tmp_src_img.png";
+	String dst_img = spath + "/" + "_tmp_dst_img.pvr";
 
 	args.push_back("-i");
 	args.push_back(src_img);
 	args.push_back("-o");
 	args.push_back(dst_img);
 	args.push_back("-f");
-	switch(p_mode) {
+	switch (p_mode) {
 
 		case Image::COMPRESS_PVRTC2: args.push_back("PVRTC2"); break;
 		case Image::COMPRESS_PVRTC4: args.push_back("PVRTC4"); break;
 		case Image::COMPRESS_ETC: args.push_back("ETC"); break;
 		default: ERR_FAIL();
-
 	}
 
 	if (EditorSettings::get_singleton()->get("filesystem/import/pvrtc_fast_conversion").operator bool()) {
@@ -90,45 +87,43 @@ static void _compress_image(Image::CompressMode p_mode,Image *p_image) {
 	if (p_image->has_mipmaps())
 		args.push_back("-m");
 
-	Ref<ImageTexture> t = memnew( ImageTexture );
-	t->create_from_image(*p_image,0);
-	ResourceSaver::save(src_img,t);
+	Ref<ImageTexture> t = memnew(ImageTexture);
+	t->create_from_image(*p_image, 0);
+	ResourceSaver::save(src_img, t);
 
-	Error err = OS::get_singleton()->execute(ttpath,args,true);
-	ERR_EXPLAIN(TTR("Could not execute PVRTC tool:")+" "+ttpath);
-	ERR_FAIL_COND(err!=OK);
+	Error err = OS::get_singleton()->execute(ttpath, args, true);
+	ERR_EXPLAIN(TTR("Could not execute PVRTC tool:") + " " + ttpath);
+	ERR_FAIL_COND(err != OK);
 
+	t = ResourceLoader::load(dst_img, "Texture");
 
-	t=ResourceLoader::load(dst_img,"Texture");
-
-	ERR_EXPLAIN(TTR("Can't load back converted image using PVRTC tool:")+" "+dst_img);
+	ERR_EXPLAIN(TTR("Can't load back converted image using PVRTC tool:") + " " + dst_img);
 	ERR_FAIL_COND(t.is_null());
 
-	*p_image=t->get_data();
+	*p_image = t->get_data();
 }
 
-
 static void _compress_pvrtc2(Image *p_image) {
 
-	_compress_image(Image::COMPRESS_PVRTC2,p_image);
+	_compress_image(Image::COMPRESS_PVRTC2, p_image);
 }
 
 static void _compress_pvrtc4(Image *p_image) {
 
-	_compress_image(Image::COMPRESS_PVRTC4,p_image);
+	_compress_image(Image::COMPRESS_PVRTC4, p_image);
 }
 
 static void _compress_etc(Image *p_image) {
 
-	_compress_image(Image::COMPRESS_ETC,p_image);
+	_compress_image(Image::COMPRESS_ETC, p_image);
 }
 
 void _pvrtc_register_compressors() {
 
-	_base_image_compress_pvrtc2_func=Image::_image_compress_pvrtc2_func;
-	_base_image_compress_pvrtc4_func=Image::_image_compress_pvrtc4_func;
+	_base_image_compress_pvrtc2_func = Image::_image_compress_pvrtc2_func;
+	_base_image_compress_pvrtc4_func = Image::_image_compress_pvrtc4_func;
 
-	Image::_image_compress_pvrtc2_func=_compress_pvrtc2;
-	Image::_image_compress_pvrtc4_func=_compress_pvrtc4;
+	Image::_image_compress_pvrtc2_func = _compress_pvrtc2;
+	Image::_image_compress_pvrtc4_func = _compress_pvrtc4;
 	//Image::_image_compress_etc_func=_compress_etc; //use the built in one for ETC
 }