[orx-shapes] Refactor package layout

orx-shapes/src/jvmDemo/kotlin/alphashape/DemoAlphaShape.kt

@@ -1,6 +1,8 @@
+package alphashape
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.AlphaShape
+import org.openrndr.extra.shapes.alphashape.AlphaShape
 import org.openrndr.math.Vector2
 import kotlin.random.Random
 

orx-shapes/src/jvmDemo/kotlin/arrangement/DemoArrangement01.kt

@@ -1,8 +1,10 @@
+package arrangement
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.color.spaces.ColorOKHSVa
-import org.openrndr.extra.shapes.Arrangement
-import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.arrangement.Arrangement
+import org.openrndr.extra.shapes.hobbycurve.hobbyCurve
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Circle
 import org.openrndr.shape.LineSegment

orx-shapes/src/jvmDemo/kotlin/arrangement/DemoArrangement02.kt

@@ -1,11 +1,13 @@
+package arrangement
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.isolated
 import org.openrndr.extra.color.spaces.ColorOKHSVa
 import org.openrndr.extra.noise.poissonDiskSampling
-import org.openrndr.extra.shapes.Arrangement
-import org.openrndr.extra.shapes.BoundedFace
-import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.arrangement.Arrangement
+import org.openrndr.extra.shapes.arrangement.BoundedFace
+import org.openrndr.extra.shapes.hobbycurve.hobbyCurve
 import kotlin.random.Random
 
 fun main() = application {

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch01.kt

@@ -1,7 +1,8 @@
+package bezierpatch
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
 import org.openrndr.shape.LineSegment
 import org.openrndr.shape.ShapeContour
 

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch02.kt

@@ -1,7 +1,8 @@
+package bezierpatch
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
 import org.openrndr.shape.Circle
 import org.openrndr.shape.ShapeContour
 

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch03.kt

@@ -1,9 +1,10 @@
+package bezierpatch
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
-import org.openrndr.extra.shapes.distort
-import org.openrndr.extra.shapes.regularStarRounded
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.distort
+import org.openrndr.extra.shapes.primitives.regularStarRounded
 import org.openrndr.math.transforms.transform
 import org.openrndr.shape.Circle
 import org.openrndr.shape.ShapeContour

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch04.kt

@@ -1,7 +1,8 @@
+package bezierpatch
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
 import org.openrndr.shape.Circle
 
 /**

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatch05.kt

@@ -1,10 +1,9 @@
+package bezierpatch
+
 import org.openrndr.WindowMultisample
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.BufferMultisample
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
-import org.openrndr.extra.shapes.drawers.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
 import org.openrndr.extra.camera.Orbital
 import org.openrndr.math.Vector3
 import org.openrndr.shape.Segment3D

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer01.kt

@@ -1,8 +1,8 @@
+package bezierpatch
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
-import org.openrndr.extra.shapes.drawers.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
 import org.openrndr.shape.Circle
 
 fun main() {

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer02.kt

@@ -1,10 +1,10 @@
+package bezierpatch
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.loadFont
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.color.spaces.toOKLABa
-import org.openrndr.extra.shapes.bezierPatch
-import org.openrndr.extra.shapes.drawers.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
 import org.openrndr.shape.Circle
 
 fun main() {

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatchDrawer03.kt

@@ -1,12 +1,11 @@
+package bezierpatch
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.isolated
-import org.openrndr.draw.loadFont
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
-import org.openrndr.extra.shapes.drawers.bezierPatch
-import org.openrndr.extra.shapes.grid
 import org.openrndr.extra.color.spaces.toOKLABa
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
+import org.openrndr.extra.shapes.primitives.grid
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.math.min

orx-shapes/src/jvmDemo/kotlin/bezierpatch/DemoBezierPatches01.kt

@@ -1,11 +1,10 @@
+package bezierpatch
+
 import org.openrndr.application
-import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.bezierPatches
 import org.openrndr.shape.Circle
 import org.openrndr.shape.ShapeContour
-import org.openrndr.extra.shapes.drawers.bezierPatch
-import org.openrndr.extra.shapes.drawers.bezierPatches
 
 /**
  * Shows how to create a [bezierPatch] out of a

orx-shapes/src/jvmDemo/kotlin/hobbycurve/DemoHobbyCurve01.kt

@@ -1,6 +1,8 @@
+package hobbycurve
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.hobbycurve.hobbyCurve
 import org.openrndr.math.Vector2
 
 fun main() = application {

orx-shapes/src/jvmDemo/kotlin/hobbycurve/DemoHobbyCurve02.kt

@@ -1,7 +1,9 @@
+package hobbycurve
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.AlphaShape
-import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.alphashape.AlphaShape
+import org.openrndr.extra.shapes.hobbycurve.hobbyCurve
 import org.openrndr.math.Vector2
 import kotlin.random.Random
 

orx-shapes/src/jvmDemo/kotlin/primitives/DemoArc01.kt

@@ -1,6 +1,8 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.Arc
+import org.openrndr.extra.shapes.primitives.Arc
 
 fun main() {
     application {

orx-shapes/src/jvmDemo/kotlin/primitives/DemoNet01.kt

@@ -1,6 +1,8 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.Net
+import org.openrndr.extra.shapes.primitives.Net
 import org.openrndr.shape.Circle
 import kotlin.math.sin
 

orx-shapes/src/jvmDemo/kotlin/primitives/DemoPulley01.kt

@@ -1,6 +1,8 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.Pulley
+import org.openrndr.extra.shapes.primitives.Pulley
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Circle
 

orx-shapes/src/jvmDemo/kotlin/primitives/DemoRectangleGrid01.kt

@@ -1,6 +1,8 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.grid
+import org.openrndr.extra.shapes.primitives.grid
 
 fun main() {
     application {

orx-shapes/src/jvmDemo/kotlin/primitives/DemoRectangleGrid02.kt

@@ -1,7 +1,9 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.noise.Random
-import org.openrndr.extra.shapes.grid
+import org.openrndr.extra.shapes.primitives.grid
 
 fun main() {
     application {

orx-shapes/src/jvmDemo/kotlin/primitives/DemoRegularPolygon.kt

@@ -1,8 +1,9 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.isolated
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.regularPolygon
+import org.openrndr.extra.shapes.primitives.regularPolygon
 import org.openrndr.math.map
 import kotlin.math.cos
 

orx-shapes/src/jvmDemo/kotlin/primitives/DemoRegularStar01.kt

@@ -1,7 +1,8 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.regularStar
+import org.openrndr.extra.shapes.primitives.regularStar
 import kotlin.math.cos
 import kotlin.math.sin
 

orx-shapes/src/jvmDemo/kotlin/primitives/DemoRegularStar02.kt

@@ -1,7 +1,8 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.regularStar
+import org.openrndr.extra.shapes.primitives.regularStar
 import org.openrndr.math.Vector2
 import org.openrndr.shape.contains
 import kotlin.math.cos

orx-shapes/src/jvmDemo/kotlin/primitives/DemoRoundedRectangle.kt

@@ -1,7 +1,8 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.RoundedRectangle
+import org.openrndr.extra.shapes.primitives.RoundedRectangle
 import kotlin.math.cos
 
 fun main() = application {

orx-shapes/src/jvmDemo/kotlin/primitives/DemoSplit01.kt

@@ -1,3 +1,5 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.color.presets.MEDIUM_PURPLE

orx-shapes/src/jvmDemo/kotlin/primitives/DemoTear01.kt

@@ -1,7 +1,9 @@
+package primitives
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.noise.scatter
-import org.openrndr.extra.shapes.Tear
+import org.openrndr.extra.shapes.primitives.Tear
 import org.openrndr.math.Vector2
 import org.openrndr.shape.Circle
 import kotlin.random.Random

orx-shapes/src/jvmDemo/kotlin/rectify/DemoRectifiedContour01.kt

@@ -1,7 +1,9 @@
+package rectify
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.noise.scatter
-import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.hobbycurve.hobbyCurve
 import org.openrndr.extra.shapes.rectify.rectified
 import kotlin.random.Random
 

orx-shapes/src/jvmDemo/kotlin/rectify/DemoRectifiedContour02.kt

@@ -1,7 +1,9 @@
+package rectify
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.extra.noise.scatter
-import org.openrndr.extra.shapes.hobbyCurve
+import org.openrndr.extra.shapes.hobbycurve.hobbyCurve
 import org.openrndr.extra.shapes.rectify.rectified
 import kotlin.random.Random
 

orx-shapes/src/jvmDemo/kotlin/text/DemoText01.kt

@@ -1,3 +1,5 @@
+package text
+
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.font.loadFace