godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Use cluster fit at higher quality levels

Browse Source
This commit is contained in:
elasota
2018-08-22 12:05:25 -04:00
parent 334acc017f
commit 4cd866685e
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/image.cpp
View File

@@ -1685,7 +1685,7 @@ Error Image::compress(CompressMode p_mode, CompressSource p_source, float p_loss
case COMPRESS_S3TC: { case COMPRESS_S3TC: {
ERR_FAIL_COND_V(!_image_compress_bc_func, ERR_UNAVAILABLE); ERR_FAIL_COND_V(!_image_compress_bc_func, ERR_UNAVAILABLE);
_image_compress_bc_func(this, p_source); _image_compress_bc_func(this, p_lossy_quality, p_source);
} break; } break;
case COMPRESS_PVRTC2: { case COMPRESS_PVRTC2: {
@@ -2048,7 +2048,7 @@ ImageMemLoadFunc Image::_png_mem_loader_func = NULL;
ImageMemLoadFunc Image::_jpg_mem_loader_func = NULL; ImageMemLoadFunc Image::_jpg_mem_loader_func = NULL;
ImageMemLoadFunc Image::_webp_mem_loader_func = NULL; ImageMemLoadFunc Image::_webp_mem_loader_func = NULL;
void (*Image::_image_compress_bc_func)(Image *, Image::CompressSource) = NULL; void (*Image::_image_compress_bc_func)(Image *, float, Image::CompressSource) = NULL;
void (*Image::_image_compress_bptc_func)(Image *, float, Image::CompressSource) = NULL; void (*Image::_image_compress_bptc_func)(Image *, float, Image::CompressSource) = NULL;
void (*Image::_image_compress_pvrtc2_func)(Image *) = NULL; void (*Image::_image_compress_pvrtc2_func)(Image *) = NULL;
void (*Image::_image_compress_pvrtc4_func)(Image *) = NULL; void (*Image::_image_compress_pvrtc4_func)(Image *) = NULL;
@@ -2569,7 +2569,7 @@ void Image::_bind_methods() {
BIND_ENUM_CONSTANT(COMPRESS_SOURCE_NORMAL); BIND_ENUM_CONSTANT(COMPRESS_SOURCE_NORMAL);
} }
void Image::set_compress_bc_func(void (*p_compress_func)(Image *, CompressSource)) { void Image::set_compress_bc_func(void (*p_compress_func)(Image *, float, CompressSource)) {
_image_compress_bc_func = p_compress_func; _image_compress_bc_func = p_compress_func;
} }

4
core/image.h
View File

@@ -126,7 +126,7 @@ public:
static ImageMemLoadFunc _jpg_mem_loader_func; static ImageMemLoadFunc _jpg_mem_loader_func;
static ImageMemLoadFunc _webp_mem_loader_func; static ImageMemLoadFunc _webp_mem_loader_func;
static void (*_image_compress_bc_func)(Image *, CompressSource p_source); static void (*_image_compress_bc_func)(Image *, float, CompressSource p_source);
static void (*_image_compress_bptc_func)(Image *, float p_lossy_quality, CompressSource p_source); static void (*_image_compress_bptc_func)(Image *, float p_lossy_quality, CompressSource p_source);
static void (*_image_compress_pvrtc2_func)(Image *); static void (*_image_compress_pvrtc2_func)(Image *);
static void (*_image_compress_pvrtc4_func)(Image *); static void (*_image_compress_pvrtc4_func)(Image *);
@@ -316,7 +316,7 @@ public:
Rect2 get_used_rect() const; Rect2 get_used_rect() const;
Ref<Image> get_rect(const Rect2 &p_area) const; Ref<Image> get_rect(const Rect2 &p_area) const;
static void set_compress_bc_func(void (*p_compress_func)(Image *, CompressSource)); static void set_compress_bc_func(void (*p_compress_func)(Image *, float, CompressSource));
static void set_compress_bptc_func(void (*p_compress_func)(Image *, float, CompressSource)); static void set_compress_bptc_func(void (*p_compress_func)(Image *, float, CompressSource));
static String get_format_name(Format p_format); static String get_format_name(Format p_format);

8
modules/squish/image_compress_squish.cpp
View File

@@ -75,7 +75,7 @@ void image_decompress_squish(Image *p_image) {
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);
} }
void image_compress_squish(Image *p_image, Image::CompressSource p_source) { void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source) {
if (p_image->get_format() >= Image::FORMAT_DXT1) if (p_image->get_format() >= Image::FORMAT_DXT1)
return; //do not compress, already compressed return; //do not compress, already compressed
@@ -86,6 +86,12 @@ void image_compress_squish(Image *p_image, Image::CompressSource p_source) {
if (p_image->get_format() <= Image::FORMAT_RGBA8) { if (p_image->get_format() <= Image::FORMAT_RGBA8) {
int squish_comp = squish::kColourRangeFit; int squish_comp = squish::kColourRangeFit;
if (p_lossy_quality > 0.85)
squish_comp = squish::kColourIterativeClusterFit;
else if (p_lossy_quality > 0.75)
squish_comp = squish::kColourClusterFit;
Image::Format target_format = Image::FORMAT_RGBA8; Image::Format target_format = Image::FORMAT_RGBA8;
Image::DetectChannels dc = p_image->get_detected_channels(); Image::DetectChannels dc = p_image->get_detected_channels();

2
modules/squish/image_compress_squish.h
View File

@@ -33,7 +33,7 @@
#include "image.h" #include "image.h"
void image_compress_squish(Image *p_image, Image::CompressSource p_source); void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
void image_decompress_squish(Image *p_image); void image_decompress_squish(Image *p_image);
#endif // IMAGE_COMPRESS_SQUISH_H #endif // IMAGE_COMPRESS_SQUISH_H