Update examples

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-kotlin = "1.9.21"
-openrndr = "0.4.3"
-orx = "0.4.3"
+kotlin = "1.9.22"
+openrndr = "0.4.4"
+orx = "0.4.4"
 orml = "0.4.1"
 
-slf4j = "2.0.9"
-log4j = "2.22.0"
-jackson = "2.16.0"
+slf4j = "2.0.11"
+log4j = "2.22.1"
+jackson = "2.16.1"
 
 [libraries]
 kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
@@ -20,7 +20,7 @@ jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-datab
 jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" }
 
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" }
-kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }
+kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.2" }
 junit = { group = "junit", name = "junit", version = "4.13.2" }
 jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" }
 gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" }
@@ -32,3 +32,4 @@ shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
 runtime = { id = "org.beryx.runtime", version = "1.13.0" }
 gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" }
 versions = { id = "com.github.ben-manes.versions", version = "0.50.0" }
+

src/main/kotlin/examples/04_Drawing/C100_CirclesRectanglesLines000.kt → src/main/kotlin/examples/30_Drawing/C100_CirclesRectanglesLines000.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C100_CirclesRectanglesLines001.kt → src/main/kotlin/examples/30_Drawing/C100_CirclesRectanglesLines001.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C100_CirclesRectanglesLines002.kt → src/main/kotlin/examples/30_Drawing/C100_CirclesRectanglesLines002.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C100_CirclesRectanglesLines003.kt → src/main/kotlin/examples/30_Drawing/C100_CirclesRectanglesLines003.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C110_Images000.kt → src/main/kotlin/examples/30_Drawing/C110_Images000.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C110_Images001.kt → src/main/kotlin/examples/30_Drawing/C110_Images001.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C110_Images002.kt → src/main/kotlin/examples/30_Drawing/C110_Images002.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C110_Images003.kt → src/main/kotlin/examples/30_Drawing/C110_Images003.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C110_Images004.kt → src/main/kotlin/examples/30_Drawing/C110_Images004.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C110_Images005.kt → src/main/kotlin/examples/30_Drawing/C110_Images005.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C110_Images006.kt → src/main/kotlin/examples/30_Drawing/C110_Images006.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa

src/main/kotlin/examples/04_Drawing/C130_Color000.kt → src/main/kotlin/examples/30_Drawing/C130_Color000.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.*

src/main/kotlin/examples/04_Drawing/C130_Color001.kt → src/main/kotlin/examples/30_Drawing/C130_Color001.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.*

src/main/kotlin/examples/04_Drawing/C130_Color002.kt → src/main/kotlin/examples/30_Drawing/C130_Color002.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.*

src/main/kotlin/examples/04_Drawing/C130_Color003.kt → src/main/kotlin/examples/30_Drawing/C130_Color003.kt

@@ -1,5 +1,5 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes000.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes000.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes001.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes001.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes002.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes002.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes003.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes003.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes004.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes004.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes005.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes005.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes006.kt

@@ -0,0 +1,44 @@
+
+package examples.`30_Drawing`
+
+import org.openrndr.application
+import org.openrndr.color.ColorRGBa
+import org.openrndr.draw.LineJoin
+import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
+import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
+import org.openrndr.math.Vector2
+import org.openrndr.math.transforms.transform
+import org.openrndr.shape.*
+import kotlin.math.cos
+import kotlin.math.sin
+
+fun main() {
+    application {
+        program {
+            val c = Pulley(Circle(Vector2.ZERO, 30.0), Circle(Vector2.ONE * 120.0, 60.0)).contour
+            val cr = c.rectified()
+
+            extend {
+                drawer.clear(ColorRGBa.WHITE)
+                drawer.fill = null
+
+                // Go from 0.0 to 1.0 in two seconds
+                // slowing down at both ends
+                val t = cos(kotlin.math.PI * (seconds % 2.0) / 2.0) * 0.5 + 0.5
+
+                drawer.translate(150.0, 100.0)
+                drawer.contour(c)
+                // Note how segment length affects the speed
+                drawer.circle(c.position(t), 5.0)
+
+                drawer.translate(270.0, 0.0)
+                drawer.contour(c)
+                // The rectified contour provides a smooth animation
+                drawer.circle(cr.position(t), 5.0)
+            }
+        }
+    }
+}
+

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes006.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes007.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes007.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes008.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes008.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes009.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes009.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes010.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes010.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes011.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes011.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes012.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C150_CurvesAndShapes012.kt → src/main/kotlin/examples/30_Drawing/C150_CurvesAndShapes013.kt

@@ -1,11 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.LineJoin
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.Pulley
 import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.rectify.rectified
 import org.openrndr.math.Vector2
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.*

src/main/kotlin/examples/04_Drawing/C120_Text000.kt → src/main/kotlin/examples/30_Drawing/C155_Text000.kt

@@ -1,9 +1,13 @@
 
-package examples.`04_Drawing`
+package examples.`30_Drawing`
 
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
+import org.openrndr.color.rgb
+import org.openrndr.draw.font.loadFace
 import org.openrndr.draw.loadFont
+import org.openrndr.extra.shapes.rectify.rectified
+import org.openrndr.shape.LineSegment
 
 import org.openrndr.shape.Rectangle
 import org.openrndr.writer