[orx-shapes] Add radii to RoundedRectangle

Author: hamoid

orx-shapes/src/commonMain/kotlin/primitives/RoundedRectangle.kt

@@ -3,26 +3,37 @@ package org.openrndr.extra.shapes.primitives
 import org.openrndr.draw.Drawer
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Rectangle
-import org.openrndr.shape.contour
 import org.openrndr.shape.ShapeContour
+import org.openrndr.shape.contour
 import kotlin.jvm.JvmRecord
 import kotlin.math.min
 
+/**
+ * Rounded rectangle. When `radii` are given (instead of `radius`), they are specified clockwise
+ * starting at the top-left. Fewer than 4 values are accepted and repeated cyclically.
+ * (e.g., providing 2 values alternates them, providing 1 value applies it to all corners).
+ */
 @JvmRecord
-data class RoundedRectangle(val corner: Vector2, val width: Double, val height: Double, val radius: Double) {
-    constructor(x: Double, y: Double, width: Double, height: Double, radius: Double) : this(
-        Vector2(x, y),
-        width,
-        height,
-        radius
-    )
-
-    constructor(rectangle: Rectangle, radius: Double) : this(
-        rectangle.corner,
-        rectangle.width,
-        rectangle.height,
-        radius
-    )
+data class RoundedRectangle(val corner: Vector2, val width: Double, val height: Double, val radii: List<Double>) {
+
+    init {
+        require(radii.isNotEmpty()) { "RoundedRectangle can't be constructed with zero radii" }
+    }
+
+    constructor(x: Double, y: Double, width: Double, height: Double, radii: List<Double>) :
+            this(Vector2(x, y), width, height, radii)
+
+    constructor(rectangle: Rectangle, radii: List<Double>) :
+            this(rectangle.corner, rectangle.width, rectangle.height, radii)
+
+    constructor(corner: Vector2, width: Double, height: Double, radius: Double) :
+            this(corner, width, height, listOf(radius))
+
+    constructor(x: Double, y: Double, width: Double, height: Double, radius: Double) :
+            this(Vector2(x, y), width, height, listOf(radius))
+
+    constructor(rectangle: Rectangle, radius: Double) :
+            this(rectangle.corner, rectangle.width, rectangle.height, listOf(radius))
 
     /** the center of the rounded rectangle */
     val center: Vector2
@@ -35,35 +46,46 @@ data class RoundedRectangle(val corner: Vector2, val width: Double, val height:
     val contour
         get() = contour {
             // A higher radius than half the width/height makes it go weird
-            val r = min(min(radius, width / 2), height / 2)
+            val r = List(4) {
+                min(min(radii[it % radii.size], width / 2), height / 2)
+            }
 
-            moveTo(x + r, y)
-            lineTo(x + width - r, y)
+            moveTo(x + r[0], y)
+            lineTo(x + width - r[1], y)
 
-            arcTo(r, r, 90.0, false, true, Vector2(x + width, y + r))
-            lineTo(x + width, y + height - r)
+            arcTo(r[1], r[1], 90.0, false, true, Vector2(x + width, y + r[1]))
+            lineTo(x + width, y + height - r[2])
 
-            arcTo(r, r, 90.0, false, true, Vector2(x + width - r, y + height))
-            lineTo(x + r, y + height)
+            arcTo(r[2], r[2], 90.0, false, true, Vector2(x + width - r[2], y + height))
+            lineTo(x + r[3], y + height)
 
-            arcTo(r, r, 90.0, false, true, Vector2(x, y + height - r))
-            lineTo(x, y + r)
+            arcTo(r[3], r[3], 90.0, false, true, Vector2(x, y + height - r[3]))
+            lineTo(x, y + r[0])
 
-            arcTo(r, r, 90.0, false, true, Vector2(x + r, y))
-            close()
-        }
+            arcTo(r[0], r[0], 90.0, false, true, Vector2(x + r[0], y))
+            close()        }
 
     val shape
         get() = contour.shape
 }
 
+fun Drawer.roundedRectangle(roundedRectangle: RoundedRectangle) =
+    contour(roundedRectangle.contour)
+
+// radii
+fun Drawer.roundedRectangle(x: Double, y: Double, width: Double, height: Double, radii: List<Double>) =
+    contour(RoundedRectangle(x, y, width, height, radii).contour)
+
+fun Drawer.roundedRectangle(position: Vector2, width: Double, height: Double, radii: List<Double>) =
+    contour(RoundedRectangle(position, width, height, radii).contour)
+
+fun Rectangle.toRounded(radii: List<Double>) = RoundedRectangle(this, radii)
+
+// radius
 fun Drawer.roundedRectangle(x: Double, y: Double, width: Double, height: Double, radius: Double) =
-    contour(RoundedRectangle(x, y, width, height, radius).contour)
+    contour(RoundedRectangle(x, y, width, height, listOf(radius)).contour)
 
 fun Drawer.roundedRectangle(position: Vector2, width: Double, height: Double, radius: Double) =
-    contour(RoundedRectangle(position, width, height, radius).contour)
-
-fun Drawer.roundedRectangle(roundedRectangle: RoundedRectangle) =
-    contour(roundedRectangle.contour)
+    contour(RoundedRectangle(position, width, height, listOf(radius)).contour)
 
-fun Rectangle.toRounded(radius: Double) = RoundedRectangle(this, radius)
+fun Rectangle.toRounded(radius: Double) = RoundedRectangle(this, listOf(radius))

…otlin/primitives/DemoRoundedRectangle.kt …lin/primitives/DemoRoundedRectangle01.ktorx-shapes/src/jvmDemo/kotlin/primitives/DemoRoundedRectangle.kt renamed to orx-shapes/src/jvmDemo/kotlin/primitives/DemoRoundedRectangle01.kt orx-shapes/src/jvmDemo/kotlin/primitives/DemoRoundedRectangle.kt renamed to orx-shapes/src/jvmDemo/kotlin/primitives/DemoRoundedRectangle01.kt

@@ -0,0 +1,27 @@
+package primitives
+
+import org.openrndr.application
+import org.openrndr.color.ColorRGBa
+import org.openrndr.extra.shapes.primitives.RoundedRectangle
+import kotlin.math.cos
+
+/**
+ * Demonstrates the use of `RoundedRectangle()` to create a rectangle in which the corners
+ * are rounded by four changing `radii`
+ *
+ * The radii are animated between 0.0 and 100.0 using the cosine of the current time in seconds
+ * and the corner index, demonstrating that corners can have differing radii.
+ */
+fun main() = application {
+    program {
+        extend {
+            drawer.fill = ColorRGBa.WHITE
+            drawer.stroke = ColorRGBa.PINK
+            val radii = List(4) {
+                cos(seconds + it) * 100.0 + 100.0
+            }
+            val rectangle = RoundedRectangle(50.0, 50.0, width - 100.0, height - 100.0, radii)
+            drawer.contour(rectangle.contour)
+        }
+    }
+}