More APIs

Author: kunitoki

modules/yup_graphics/graphics/yup_Color.h

@@ -550,10 +550,10 @@ class YUP_API Color
         }
 
         return {
+            static_cast<uint8> (a * 255),
             static_cast<uint8> (r * 255),
             static_cast<uint8> (g * 255),
-            static_cast<uint8> (b * 255),
-            static_cast<uint8> (a * 255)
+            static_cast<uint8> (b * 255)
         };
     }
 
@@ -653,10 +653,10 @@ class YUP_API Color
         }
 
         return {
+            static_cast<uint8> (a * 255),
             static_cast<uint8> (r * 255),
             static_cast<uint8> (g * 255),
             static_cast<uint8> (b * 255),
-            static_cast<uint8> (a * 255)
         };
     }
 

modules/yup_graphics/primitives/yup_Line.h

@@ -534,17 +534,17 @@ class YUP_API Line
     */
     constexpr Line& transform (const AffineTransform& t) noexcept
     {
-        auto x1 = static_cast<float> (p1.x);
-        auto y1 = static_cast<float> (p1.y);
-        auto x2 = static_cast<float> (p2.x);
-        auto y2 = static_cast<float> (p2.y);
+        auto x1 = static_cast<float> (p1.getX());
+        auto y1 = static_cast<float> (p1.getY());
+        auto x2 = static_cast<float> (p2.getX());
+        auto y2 = static_cast<float> (p2.getY());
 
         t.transformPoints (x1, y1, x2, y2);
 
-        p1.x = static_cast<ValueType> (x1);
-        p1.y = static_cast<ValueType> (y1);
-        p2.x = static_cast<ValueType> (x2);
-        p2.y = static_cast<ValueType> (y2);
+        p1.setX (static_cast<ValueType> (x1));
+        p1.setY (static_cast<ValueType> (y1));
+        p2.setX (static_cast<ValueType> (x2));
+        p2.setY (static_cast<ValueType> (y2));
 
         return *this;
     }

modules/yup_graphics/primitives/yup_Rectangle.h

@@ -757,9 +757,12 @@ class YUP_API Rectangle
 
         @return A reference to this rectangle to allow method chaining.
     */
-    constexpr Rectangle& setSize (const Size<ValueType>& newSize) noexcept
+    template <class T = ValueType>
+    constexpr Rectangle& setSize (const Size<T>& newSize) noexcept
     {
-        size = newSize;
+        static_assert (std::numeric_limits<ValueType>::max() >= std::numeric_limits<T>::max(), "Invalid narrow cast");
+
+        size = newSize.template to<ValueType>();
 
         return *this;
     }
@@ -770,7 +773,7 @@ class YUP_API Rectangle
 
         @return A reference to this rectangle to allow method chaining.
     */
-    template <class T>
+    template <class T = ValueType>
     constexpr Rectangle& setSize (T width, T height) noexcept
     {
         static_assert (std::numeric_limits<ValueType>::max() >= std::numeric_limits<T>::max(), "Invalid narrow cast");
@@ -790,7 +793,7 @@ class YUP_API Rectangle
 
         @return A new rectangle with the updated size.
     */
-    template <class T>
+    template <class T = ValueType>
     [[nodiscard]] constexpr Rectangle withSize (const Size<T>& newSize) const noexcept
     {
         static_assert (std::numeric_limits<ValueType>::max() >= std::numeric_limits<T>::max(), "Invalid narrow cast");
@@ -809,7 +812,7 @@ class YUP_API Rectangle
 
         @return A new rectangle with the updated size.
     */
-    template <class T>
+    template <class T = ValueType>
     [[nodiscard]] constexpr Rectangle withSize (T width, T height) const noexcept
     {
         static_assert (std::numeric_limits<ValueType>::max() >= std::numeric_limits<T>::max(), "Invalid narrow cast");
@@ -827,7 +830,7 @@ class YUP_API Rectangle
 
         @return A new rectangle with the size scaled.
     */
-    template <class T>
+    template <class T = ValueType>
     [[nodiscard]] constexpr auto withScaledSize (T scaleFactor) const noexcept
         -> std::enable_if_t<std::is_floating_point_v<T>, Rectangle>
     {

modules/yup_graphics/primitives/yup_RectangleList.h

@@ -161,7 +161,7 @@ class YUP_API RectangleList
     */
     [[nodiscard]] bool contains (ValueType x, ValueType y, ValueType width, ValueType height) const
     {
-        return rectangles.contains (x, y, width, height);
+        return contains (RectangleType{ x, y, width, height });
     }
 
     [[nodiscard]] bool contains (const RectangleType& rect) const
@@ -177,21 +177,21 @@ class YUP_API RectangleList
         @return true if the point is contained within any rectangle in the list, false otherwise.
     */
     [[nodiscard]] bool contains (ValueType x, ValueType y) const
+    {
+        return contains (Point<ValueType>{ x, y });
+    }
+
+    [[nodiscard]] bool contains (const Point<ValueType>& point) const
     {
         for (const auto& rect : rectangles)
         {
-            if (rect.contains (x, y))
+            if (rect.contains (point))
                 return true;
         }
 
         return false;
     }
 
-    [[nodiscard]] bool contains (const Point<ValueType>& point) const
-    {
-        return contains (point.getX(), point.getY());
-    }
-
     //==============================================================================
     /** Checks if the list intersects a specified rectangle.
 
@@ -200,21 +200,21 @@ class YUP_API RectangleList
         @return True if the rectangle intersects the list, otherwise false.
     */
     [[nodiscard]] bool intersects (ValueType x, ValueType y, ValueType width, ValueType height) const
+    {
+        return intersects (RectangleType{ x, y, width, height });
+    }
+
+    [[nodiscard]] bool intersects (const RectangleType& rect) const
     {
         for (const auto& rect : rectangles)
         {
-            if (rect.intersects (x, y, width, height))
+            if (rect.intersects (rect))
                 return true;
         }
 
         return false;
     }
 
-    [[nodiscard]] bool intersects (const RectangleType& rect) const
-    {
-        return intersects (rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight());
-    }
-
     //==============================================================================
     /** Returns the number of rectangles in the list.