Przeglądaj źródła

Merge pull request #32478 from AlexHolly/fix-rect2-encloses

Make Rect2.encloses return true on same size
Rémi Verschelde 6 lat temu
rodzic
commit
106e21fd5f
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      core/math/rect2.h

+ 2 - 2
core/math/rect2.h

@@ -99,8 +99,8 @@ struct Rect2 {
 	inline bool encloses(const Rect2 &p_rect) const {
 	inline bool encloses(const Rect2 &p_rect) const {
 
 
 		return (p_rect.position.x >= position.x) && (p_rect.position.y >= position.y) &&
 		return (p_rect.position.x >= position.x) && (p_rect.position.y >= position.y) &&
-			   ((p_rect.position.x + p_rect.size.x) < (position.x + size.x)) &&
-			   ((p_rect.position.y + p_rect.size.y) < (position.y + size.y));
+			   ((p_rect.position.x + p_rect.size.x) <= (position.x + size.x)) &&
+			   ((p_rect.position.y + p_rect.size.y) <= (position.y + size.y));
 	}
 	}
 
 
 	_FORCE_INLINE_ bool has_no_area() const {
 	_FORCE_INLINE_ bool has_no_area() const {