asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add interpolation parameter to resize_to_po2()

Browse source 
Image::resize_to_po2() now takes an optional p_interpolation parameter
that it passes directly to resize() with default value INTERPOLATE_BILINEAR.

GLES2: call resize_to_po2() with interpolate argument

Call resize_to_po2() in GLES2 rasterizer storage with either
INTERPOLATE_BILINEAR or INTERPOLATE_NEAREST depending on TEXTURE_FLAG_FILTER.

This avoids filtering issues with non power of two pixel art textures.
See #44379
This commit is contained in:
Theogen Ratkin 2020-12-17 11:46:34 -04:00
parent 3f47cdc5c6
commit 8f6a6ac8d0
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/image.cpp
View file

@ -867,7 +867,7 @@ bool Image::is_size_po2() const {
return uint32_t(width) == next_power_of_2(width) && uint32_t(height) == next_power_of_2(height); return uint32_t(width) == next_power_of_2(width) && uint32_t(height) == next_power_of_2(height);
} }
void Image::resize_to_po2(bool p_square) { void Image::resize_to_po2(bool p_square, Interpolation p_interpolation) {
ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot resize in compressed or custom image formats."); ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot resize in compressed or custom image formats.");
@ -883,7 +883,7 @@ void Image::resize_to_po2(bool p_square) {
return; //nothing to do return; //nothing to do
} }
resize(w, h); resize(w, h, p_interpolation);
} }
void Image::resize(int p_width, int p_height, Interpolation p_interpolation) { void Image::resize(int p_width, int p_height, Interpolation p_interpolation) {
@ -2725,7 +2725,7 @@ void Image::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_mipmap_offset", "mipmap"), &Image::get_mipmap_offset); ClassDB::bind_method(D_METHOD("get_mipmap_offset", "mipmap"), &Image::get_mipmap_offset);
ClassDB::bind_method(D_METHOD("resize_to_po2", "square"), &Image::resize_to_po2, DEFVAL(false)); ClassDB::bind_method(D_METHOD("resize_to_po2", "square", "interpolation"), &Image::resize_to_po2, DEFVAL(false), DEFVAL(INTERPOLATE_BILINEAR));
ClassDB::bind_method(D_METHOD("resize", "width", "height", "interpolation"), &Image::resize, DEFVAL(INTERPOLATE_BILINEAR)); ClassDB::bind_method(D_METHOD("resize", "width", "height", "interpolation"), &Image::resize, DEFVAL(INTERPOLATE_BILINEAR));
ClassDB::bind_method(D_METHOD("shrink_x2"), &Image::shrink_x2); ClassDB::bind_method(D_METHOD("shrink_x2"), &Image::shrink_x2);
ClassDB::bind_method(D_METHOD("expand_x2_hq2x"), &Image::expand_x2_hq2x); ClassDB::bind_method(D_METHOD("expand_x2_hq2x"), &Image::expand_x2_hq2x);

2
core/image.h
View file

@ -225,7 +225,7 @@ public:
/** /**
* Resize the image, using the preferred interpolation method. * Resize the image, using the preferred interpolation method.
*/ */
void resize_to_po2(bool p_square = false); void resize_to_po2(bool p_square = false, Interpolation p_interpolation = INTERPOLATE_BILINEAR);
void resize(int p_width, int p_height, Interpolation p_interpolation = INTERPOLATE_BILINEAR); void resize(int p_width, int p_height, Interpolation p_interpolation = INTERPOLATE_BILINEAR);
void shrink_x2(); void shrink_x2();
void expand_x2_hq2x(); void expand_x2_hq2x();

6
doc/classes/Image.xml
View file

@ -414,7 +414,7 @@
<argument index="2" name="interpolation" type="int" enum="Image.Interpolation" default="1"> <argument index="2" name="interpolation" type="int" enum="Image.Interpolation" default="1">
</argument> </argument>
<description> <description>
Resizes the image to the given [code]width[/code] and [code]height[/code]. New pixels are calculated using [code]interpolation[/code]. See [code]interpolation[/code] constants. Resizes the image to the given [code]width[/code] and [code]height[/code]. New pixels are calculated using the [code]interpolation[/code] mode defined via [enum Interpolation] constants.
</description> </description>
</method> </method>
<method name="resize_to_po2"> <method name="resize_to_po2">
@ -422,8 +422,10 @@
</return> </return>
<argument index="0" name="square" type="bool" default="false"> <argument index="0" name="square" type="bool" default="false">
</argument> </argument>
<argument index="1" name="interpolation" type="int" enum="Image.Interpolation" default="1">
</argument>
<description> <description>
Resizes the image to the nearest power of 2 for the width and height. If [code]square[/code] is [code]true[/code] then set width and height to be the same. Resizes the image to the nearest power of 2 for the width and height. If [code]square[/code] is [code]true[/code] then set width and height to be the same. New pixels are calculated using the [code]interpolation[/code] mode defined via [enum Interpolation] constants.
</description> </description>
</method> </method>
<method name="rgbe_to_srgb"> <method name="rgbe_to_srgb">

2
drivers/gles2/rasterizer_storage_gles2.cpp
View file

@ -682,7 +682,7 @@ void RasterizerStorageGLES2::texture_set_data(RID p_texture, const Ref<Image> &p
if (img == p_image) { if (img == p_image) {
img = img->duplicate(); img = img->duplicate();
} }
img->resize_to_po2(false); img->resize_to_po2(false, texture->flags & VS::TEXTURE_FLAG_FILTER ? Image::INTERPOLATE_BILINEAR : Image::INTERPOLATE_NEAREST);
} }
if (config.shrink_textures_x2 && (p_image->has_mipmaps() || !p_image->is_compressed()) && !(texture->flags & VS::TEXTURE_FLAG_USED_FOR_STREAMING)) { if (config.shrink_textures_x2 && (p_image->has_mipmaps() || !p_image->is_compressed()) && !(texture->flags & VS::TEXTURE_FLAG_USED_FOR_STREAMING)) {