godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
editor/pvrtc_compress.cpp
View File

@@ -28,20 +28,20 @@
/*************************************************************************/
#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"
static void (*_base_image_compress_pvrtc2_func)(Image *)=NULL;
static void (*_base_image_compress_pvrtc4_func)(Image *)=NULL;
#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 _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("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)
@@ -49,84 +49,79 @@ 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("PVRTC/fast_conversion").operator bool()) {
args.push_back("-pvrtcfast");
}
if (p_image->get_mipmaps()>0)
if (p_image->get_mipmaps() > 0)
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
}