maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

blit and blend fix when dst<Vector2

Browse source
This commit is contained in:
Alexander Holland 2018-04-15 22:37:23 +02:00
parent 7b5703bc41
commit 7cfdffcdf8
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/image.cpp
View file

@ -1598,6 +1598,12 @@ void Image::blit_rect(const Ref<Image> &p_src, const Rect2 &p_src_rect, const Po
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;
@ -1646,6 +1652,12 @@ void Image::blit_rect_mask(const Ref<Image> &p_src, const Ref<Image> &p_mask, co
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;
@ -1697,6 +1709,12 @@ void Image::blend_rect(const Ref<Image> &p_src, const Rect2 &p_src_rect, const P
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;
@ -1745,6 +1763,12 @@ void Image::blend_rect_mask(const Ref<Image> &p_src, const Ref<Image> &p_mask, c
ERR_FAIL_COND(format != p_src->format);
Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
if (p_dest.x < 0)
clipped_src_rect.position.x = ABS(p_dest.x);
if (p_dest.y < 0)
clipped_src_rect.position.y = ABS(p_dest.y);
if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
return;