Rect: Add contains() method

Resolves: #419

Author: adazem009

include/scratchcpp/rect.h

@@ -35,6 +35,7 @@ class LIBSCRATCHCPP_EXPORT Rect
         void snapToInt();
 
         bool intersects(const Rect &rect) const;
+        bool contains(double x, double y) const;
 
     private:
         spimpl::impl_ptr<RectPrivate> impl;

src/rect.cpp

@@ -106,3 +106,19 @@ bool Rect::intersects(const Rect &rect) const
     // Check if the rectangles intersect
     return !(x2 < rectX1 || rectX2 < x1 || y2 < rectY1 || rectY2 < y1);
 }
+
+/*! Returns true if the given point is inside or on the edge of the rectangle. */
+bool Rect::contains(double x, double y) const
+{
+    double bottom, top;
+
+    if (impl->top > impl->bottom) {
+        bottom = impl->bottom;
+        top = impl->top;
+    } else {
+        bottom = impl->top;
+        top = impl->bottom;
+    }
+
+    return (x >= impl->left && x <= impl->right && y >= bottom && y <= top);
+}

test/rect/rect_test.cpp

@@ -230,3 +230,41 @@ TEST(RectTest, Intersects)
         ASSERT_FALSE(rect2_ydown.intersects(rect1_ydown));
     }
 }
+
+TEST(RectTest, Contains)
+{
+    Rect rect(-50, 25, 150, -75);
+    Rect rect_ydown(-50, -75, 150, 25);
+
+    ASSERT_FALSE(rect.contains(-75, 30));
+    ASSERT_FALSE(rect.contains(-75, 10));
+    ASSERT_FALSE(rect.contains(-45, 30));
+    ASSERT_FALSE(rect.contains(151, -76));
+    ASSERT_FALSE(rect.contains(149, -76));
+    ASSERT_FALSE(rect.contains(151, -74));
+
+    ASSERT_FALSE(rect_ydown.contains(-75, 30));
+    ASSERT_FALSE(rect_ydown.contains(-75, 10));
+    ASSERT_FALSE(rect_ydown.contains(-45, 30));
+    ASSERT_FALSE(rect_ydown.contains(151, -76));
+    ASSERT_FALSE(rect_ydown.contains(149, -76));
+    ASSERT_FALSE(rect_ydown.contains(151, -74));
+
+    ASSERT_TRUE(rect.contains(-50, -75));
+    ASSERT_TRUE(rect.contains(150, -75));
+    ASSERT_TRUE(rect.contains(150, 25));
+    ASSERT_TRUE(rect.contains(-50, 25));
+    ASSERT_TRUE(rect.contains(-40, -70));
+    ASSERT_TRUE(rect.contains(100, 0));
+    ASSERT_TRUE(rect.contains(0, -40));
+    ASSERT_TRUE(rect.contains(5, 24));
+
+    ASSERT_TRUE(rect_ydown.contains(-50, -75));
+    ASSERT_TRUE(rect_ydown.contains(150, -75));
+    ASSERT_TRUE(rect_ydown.contains(150, 25));
+    ASSERT_TRUE(rect_ydown.contains(-50, 25));
+    ASSERT_TRUE(rect_ydown.contains(-40, -70));
+    ASSERT_TRUE(rect_ydown.contains(100, 0));
+    ASSERT_TRUE(rect_ydown.contains(0, -40));
+    ASSERT_TRUE(rect_ydown.contains(5, 24));
+}