Browse Source

Merge pull request #18219 from AlexHolly/fix-image-blit-blend

blit and blend fix when dst<Vector2
Juan Linietsky 7 years ago
parent
commit
e6b938ef16
1 changed files with 24 additions and 0 deletions
  1. 24 0
      core/image.cpp

+ 24 - 0
core/image.cpp

@@ -1628,6 +1628,12 @@ void Image::blit_rect(const Ref<Image> &p_src, const Rect2 &p_src_rect, const Po
 	ERR_FAIL_COND(format != p_src->format);
 	ERR_FAIL_COND(format != p_src->format);
 
 
 	Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
 	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)
 	if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
 		return;
 		return;
 
 
@@ -1676,6 +1682,12 @@ void Image::blit_rect_mask(const Ref<Image> &p_src, const Ref<Image> &p_mask, co
 	ERR_FAIL_COND(format != p_src->format);
 	ERR_FAIL_COND(format != p_src->format);
 
 
 	Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
 	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)
 	if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
 		return;
 		return;
 
 
@@ -1727,6 +1739,12 @@ void Image::blend_rect(const Ref<Image> &p_src, const Rect2 &p_src_rect, const P
 	ERR_FAIL_COND(format != p_src->format);
 	ERR_FAIL_COND(format != p_src->format);
 
 
 	Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
 	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)
 	if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
 		return;
 		return;
 
 
@@ -1775,6 +1793,12 @@ void Image::blend_rect_mask(const Ref<Image> &p_src, const Ref<Image> &p_mask, c
 	ERR_FAIL_COND(format != p_src->format);
 	ERR_FAIL_COND(format != p_src->format);
 
 
 	Rect2i clipped_src_rect = Rect2i(0, 0, p_src->width, p_src->height).clip(p_src_rect);
 	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)
 	if (clipped_src_rect.size.x <= 0 || clipped_src_rect.size.y <= 0)
 		return;
 		return;