Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-20 22:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #9167 from dumitru-stama/blitalpha

Browse Source 
Added new "blend_rect" method as an alpha-aware blit_rect
This commit is contained in:
Rémi Verschelde 2017-06-17 12:54:15 +02:00 committed by GitHub
commit e17966ca01
4 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/image.cpp
View File

@ -2217,6 +2217,52 @@ void Image::blit_rect(const Image &p_src, const Rect2 &p_src_rect, const Point2
}
}
void Image::blend_rect(const Image &p_src, const Rect2 &p_src_rect, const Point2 &p_dest) {
int dsize = data.size();
int srcdsize = p_src.data.size();
int dst_data_size = data.size();
ERR_FAIL_COND(dsize == 0);
ERR_FAIL_COND(srcdsize == 0);
ERR_FAIL_COND(dst_data_size == 0);
Rect2 rrect = Rect2(0, 0, p_src.width, p_src.height).clip(p_src_rect);
DVector<uint8_t>::Write wp = data.write();
unsigned char *dst_data_ptr = wp.ptr();
DVector<uint8_t>::Read rp = p_src.data.read();
const unsigned char *src_data_ptr = rp.ptr();
if (format == FORMAT_INDEXED || format == FORMAT_INDEXED || p_src.format == FORMAT_INDEXED || p_src.format == FORMAT_INDEXED_ALPHA) {
return;
} else {
for (int i = 0; i < rrect.size.y; i++) {
if (i + p_dest.y < 0 || i + p_dest.y >= height)
continue;
for (int j = 0; j < rrect.size.x; j++) {
if (j + p_dest.x < 0 || j + p_dest.x >= width)
continue;
BColor src = p_src._get_pixel(rrect.pos.x + j, rrect.pos.y + i, src_data_ptr, srcdsize);
BColor dst = _get_pixel(p_dest.x + j, p_dest.y + i, dst_data_ptr, dst_data_size);
float ba = (float) dst.a / 255.0;
float fa = (float) src.a / 255.0;
dst.r = (uint8_t) (fa*src.r + ba*(1.0 - fa) * dst.r);
dst.g = (uint8_t) (fa*src.g + ba*(1.0 - fa) * dst.g);
dst.b = (uint8_t) (fa*src.b + ba*(1.0 - fa) * dst.b);
dst.a = (uint8_t) (255.0 * (fa + ba * (1.0 - fa)));
_put_pixel(p_dest.x + j, p_dest.y + i, dst, dst_data_ptr);
}
}
}
}
Image (*Image::_png_mem_loader_func)(const uint8_t *, int) = NULL;
Image (*Image::_jpg_mem_loader_func)(const uint8_t *, int) = NULL;

1
core/image.h
View File

@ -351,6 +351,7 @@ public:
void normalmap_to_xy();
void blit_rect(const Image &p_src, const Rect2 &p_src_rect, const Point2 &p_dest);
void blend_rect(const Image &p_src, const Rect2 &p_src_rect, const Point2 &p_dest);
void brush_transfer(const Image &p_src, const Image &p_brush, const Point2 &p_dest);
Image brushed(const Image &p_src, const Image &p_brush, const Point2 &p_dest) const;

2
core/variant_call.cpp
View File

@ -621,6 +621,7 @@ struct _VariantCall {
VCALL_PTR3R(Image, resized);
VCALL_PTR0R(Image, get_data);
VCALL_PTR3(Image, blit_rect);
VCALL_PTR3(Image, blend_rect);
VCALL_PTR1R(Image, converted);
VCALL_PTR0(Image, fix_alpha_edges);
@ -1471,6 +1472,7 @@ void register_variant_methods() {
ADDFUNC3(IMAGE, IMAGE, Image, resized, INT, "x", INT, "y", INT, "interpolation", varray(((int)Image::INTERPOLATE_BILINEAR)));
ADDFUNC0(IMAGE, RAW_ARRAY, Image, get_data, varray());
ADDFUNC3(IMAGE, NIL, Image, blit_rect, IMAGE, "src", RECT2, "src_rect", VECTOR2, "dest", varray(0));
ADDFUNC3(IMAGE, NIL, Image, blend_rect, IMAGE, "src", RECT2, "src_rect", VECTOR2, "dest", varray(0));
ADDFUNC1(IMAGE, IMAGE, Image, converted, INT, "format", varray(0));
ADDFUNC0(IMAGE, NIL, Image, fix_alpha_edges, varray());

11
doc/base/classes.xml
View File

@ -15855,6 +15855,17 @@
Create an empty image of a specific size and format.
</description>
</method>
<method name="blend_rect">
<argument index="0" name="src" type="Image">
</argument>
<argument index="1" name="src_rect" type="Rect2">
</argument>
<argument index="2" name="dest" type="Vector2" default="0">
</argument>
<description>
Alpha-blends a "src_rect" [Rect2] from "src" [Image] to this [Image] on coordinates "dest".
</description>
</method>
<method name="blit_rect">
<argument index="0" name="src" type="Image">
</argument>