62ecb44035
Fixes the following GCC 5 warnings: ``` core/io/zip_io.h:128:26: warning: 'zlib_filefunc_def zipio_create_io_from_file(FileAccess**)' defined but not used [-Wunused-function] core/script_debugger_remote.cpp:110:17: warning: 'ObjectID safe_get_instance_id(const Variant&)' defined but not used [-Wunused-function] drivers/unix/socket_helpers.h:103:12: warning: 'int _socket_create(IP::Type&, int, int)' defined but not used [-Wunused-function] drivers/unix/socket_helpers.h:45:15: warning: 'size_t _set_sockaddr(sockaddr_storage*, const IP_Address&, int, IP::Type)' defined but not used [-Wunused-function] drivers/unix/socket_helpers.h:76:15: warning: 'size_t _set_listen_sockaddr(sockaddr_storage*, int, IP::Type, IP_Address)' defined but not used [-Wunused-function] editor/editor_fonts.cpp:40:24: warning: 'Ref<BitmapFont> make_font(int, int, int, int, const int*, const Ref<Texture>&)' defined but not used [-Wunused-function] editor/editor_themes.cpp:85:26: warning: 'Ref<StyleBoxFlat> change_border_color(Ref<StyleBoxFlat>, Color)' defined but not used [-Wunused-function] editor/import/editor_import_collada.cpp:493:13: warning: 'void _generate_normals(const PoolVector<int>&, const PoolVector<Vector3>&, PoolVector<Vector3>&)' defined but not used [-Wunused-function] editor/import/editor_import_collada.cpp:524:13: warning: 'void _generate_tangents_and_binormals(const PoolVector<int>&, const PoolVector<Vector3>&, const PoolVector<Vector3>&, const PoolVector<Vector3>&, PoolVector<float>&)' defined but not used [-Wunused-function] editor/pvrtc_compress.cpp:118:13: warning: 'void _compress_etc(Image*)' defined but not used [-Wunused-function] modules/etc/image_etc.cpp:89:13: warning: 'void _decompress_etc1(Image*)' defined but not used [-Wunused-function] modules/etc/image_etc.cpp:93:13: warning: 'void _decompress_etc2(Image*)' defined but not used [-Wunused-function] modules/gdscript/editor/gdscript_highlighter.cpp:46:13: warning: 'bool _is_whitespace(CharType)' defined but not used [-Wunused-function] scene/2d/cpu_particles_2d.cpp:510:14: warning: 'float rand_from_seed_m1_p1(uint32_t&)' defined but not used [-Wunused-function] scene/3d/cpu_particles.cpp:474:14: warning: 'float rand_from_seed_m1_p1(uint32_t&)' defined but not used [-Wunused-function] scene/resources/default_theme/default_theme.cpp:123:20: warning: 'Ref<Shader> make_shader(const char*, const char*, const char*)' defined but not used [-Wunused-function] scene/resources/default_theme/default_theme.cpp:130:24: warning: 'Ref<BitmapFont> make_font(int, int, int, int, const int*, const Ref<Texture>&)' defined but not used [-Wunused-function] ``` Had to split `core/io/zip_io.h` into header and .cpp file without 'static' keyword. Not fixed yet (static definition in header used in some files but not all): ``` modules/websocket/lws_helper.h:111:13: warning: 'void _lws_make_protocols(void*, int (*)(lws*, lws_callback_reasons, void*, void*, size_t), PoolVector<String>, _LWSRef**)' defined but not used [-Wunused-function] ``` Also fixed a couple other warnings missed in previous commits.
125 lines
4.9 KiB
C++
125 lines
4.9 KiB
C++
/*************************************************************************/
|
|
/* pvrtc_compress.cpp */
|
|
/*************************************************************************/
|
|
/* This file is part of: */
|
|
/* GODOT ENGINE */
|
|
/* https://godotengine.org */
|
|
/*************************************************************************/
|
|
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
|
|
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
|
|
/* */
|
|
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
/* a copy of this software and associated documentation files (the */
|
|
/* "Software"), to deal in the Software without restriction, including */
|
|
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
/* the following conditions: */
|
|
/* */
|
|
/* The above copyright notice and this permission notice shall be */
|
|
/* included in all copies or substantial portions of the Software. */
|
|
/* */
|
|
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
/*************************************************************************/
|
|
|
|
#include "pvrtc_compress.h"
|
|
|
|
#include "core/io/resource_loader.h"
|
|
#include "core/io/resource_saver.h"
|
|
#include "core/os/file_access.h"
|
|
#include "core/os/os.h"
|
|
#include "editor_settings.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) {
|
|
|
|
String ttpath = EditorSettings::get_singleton()->get("filesystem/import/pvrtc_texture_tool");
|
|
|
|
if (ttpath.strip_edges() == "" || !FileAccess::exists(ttpath)) {
|
|
switch (p_mode) {
|
|
|
|
case Image::COMPRESS_PVRTC2:
|
|
if (_base_image_compress_pvrtc2_func)
|
|
_base_image_compress_pvrtc2_func(p_image);
|
|
else if (_base_image_compress_pvrtc4_func)
|
|
_base_image_compress_pvrtc4_func(p_image);
|
|
|
|
break;
|
|
case Image::COMPRESS_PVRTC4:
|
|
if (_base_image_compress_pvrtc4_func)
|
|
_base_image_compress_pvrtc4_func(p_image);
|
|
|
|
break;
|
|
default: ERR_FAIL();
|
|
}
|
|
return;
|
|
}
|
|
String tmppath = EditorSettings::get_singleton()->get_cache_dir();
|
|
|
|
List<String> args;
|
|
|
|
String src_img = tmppath.plus_file("_tmp_src_img.png");
|
|
String dst_img = tmppath.plus_file("_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) {
|
|
|
|
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()) {
|
|
args.push_back("-pvrtcfast");
|
|
}
|
|
if (p_image->has_mipmaps())
|
|
args.push_back("-m");
|
|
|
|
Ref<ImageTexture> t = memnew(ImageTexture);
|
|
t->create_from_image(Ref<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);
|
|
|
|
t = ResourceLoader::load(dst_img, "Texture");
|
|
|
|
ERR_EXPLAIN(TTR("Can't load back converted image using PVRTC tool:") + " " + dst_img);
|
|
ERR_FAIL_COND(t.is_null());
|
|
|
|
p_image->copy_internals_from(t->get_data());
|
|
}
|
|
|
|
static void _compress_pvrtc2(Image *p_image) {
|
|
|
|
_compress_image(Image::COMPRESS_PVRTC2, p_image);
|
|
}
|
|
|
|
static void _compress_pvrtc4(Image *p_image) {
|
|
|
|
_compress_image(Image::COMPRESS_PVRTC4, 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;
|
|
|
|
Image::_image_compress_pvrtc2_func = _compress_pvrtc2;
|
|
Image::_image_compress_pvrtc4_func = _compress_pvrtc4;
|
|
}
|