Add united() method to Rect

Author: adazem009

include/scratchcpp/rect.h

@@ -39,6 +39,7 @@ class LIBSCRATCHCPP_EXPORT Rect
         bool contains(double x, double y) const;
 
         static void intersection(const Rect &a, const Rect &b, Rect &dst);
+        static void united(const Rect &a, const Rect &b, Rect &dst);
 
     private:
         spimpl::impl_ptr<RectPrivate> impl;

src/rect.cpp

@@ -146,3 +146,12 @@ void Rect::intersection(const Rect &a, const Rect &b, Rect &dst)
     dst.impl->top = std::min(a.impl->top, b.impl->top);
     dst.impl->bottom = std::max(a.impl->bottom, b.impl->bottom);
 }
+
+/*! Saves the union of the given rectangles (in Scratch space) to dst. */
+void Rect::united(const Rect &a, const Rect &b, Rect &dst)
+{
+    dst.impl->left = std::min(a.impl->left, b.impl->left);
+    dst.impl->right = std::max(a.impl->right, b.impl->right);
+    dst.impl->top = std::max(a.impl->top, b.impl->top);
+    dst.impl->bottom = std::min(a.impl->bottom, b.impl->bottom);
+}

test/rect/rect_test.cpp

@@ -422,3 +422,91 @@ TEST(RectTest, Intersection)
         ASSERT_EQ(dst.bottom(), -75);
     }
 }
+
+TEST(RectTest, United)
+{
+    Rect rect1(-50, 25, 150, -75);
+    Rect dst;
+
+    Rect::united(rect1, rect1, dst);
+    ASSERT_EQ(dst.left(), rect1.left());
+    ASSERT_EQ(dst.top(), rect1.top());
+    ASSERT_EQ(dst.right(), rect1.right());
+    ASSERT_EQ(dst.bottom(), rect1.bottom());
+
+    // left
+    {
+        Rect rect2(-75, 0, 125, -50);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -75);
+        ASSERT_EQ(dst.top(), 25);
+        ASSERT_EQ(dst.right(), 150);
+        ASSERT_EQ(dst.bottom(), -75);
+    }
+
+    {
+        Rect rect2(-100, 10, -50, -90);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -100);
+        ASSERT_EQ(dst.top(), 25);
+        ASSERT_EQ(dst.right(), 150);
+        ASSERT_EQ(dst.bottom(), -90);
+    }
+
+    // top
+    {
+        Rect rect2(-25, 50, 125, 10);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -50);
+        ASSERT_EQ(dst.top(), 50);
+        ASSERT_EQ(dst.right(), 150);
+        ASSERT_EQ(dst.bottom(), -75);
+    }
+
+    {
+        Rect rect2(-100, 50, 200, 25);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -100);
+        ASSERT_EQ(dst.top(), 50);
+        ASSERT_EQ(dst.right(), 200);
+        ASSERT_EQ(dst.bottom(), -75);
+    }
+
+    // right
+    {
+        Rect rect2(125, 0, 200, -50);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -50);
+        ASSERT_EQ(dst.top(), 25);
+        ASSERT_EQ(dst.right(), 200);
+        ASSERT_EQ(dst.bottom(), -75);
+    }
+
+    {
+        Rect rect2(150, 10, 200, -90);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -50);
+        ASSERT_EQ(dst.top(), 25);
+        ASSERT_EQ(dst.right(), 200);
+        ASSERT_EQ(dst.bottom(), -90);
+    }
+
+    // bottom
+    {
+        Rect rect2(-25, -50, 125, -100);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -50);
+        ASSERT_EQ(dst.top(), 25);
+        ASSERT_EQ(dst.right(), 150);
+        ASSERT_EQ(dst.bottom(), -100);
+    }
+
+    {
+        Rect rect2(-100, -75, 200, -100);
+        Rect::united(rect1, rect2, dst);
+        ASSERT_EQ(dst.left(), -100);
+        ASSERT_EQ(dst.top(), 25);
+        ASSERT_EQ(dst.right(), 200);
+        ASSERT_EQ(dst.bottom(), -100);
+    }
+}