[orx-shapes] Refactor package layout

orx-easing/src/jvmDemo/kotlin/DemoEasings01.kt

@@ -1,8 +1,8 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.loadFont
-import org.openrndr.extra.shapes.grid
 import org.openrndr.extra.easing.Easing
+import org.openrndr.extra.shapes.primitives.grid
 import org.openrndr.math.Vector2
 import org.openrndr.math.map
 

orx-image-fit/src/jvmDemo/kotlin/DemoImageFit01.kt

@@ -6,7 +6,7 @@ import org.openrndr.draw.loadFont
 import org.openrndr.draw.renderTarget
 import org.openrndr.extra.imageFit.FitMethod
 import org.openrndr.extra.imageFit.imageFit
-import org.openrndr.extra.shapes.grid
+import org.openrndr.extra.shapes.primitives.grid
 
 /**
  * Tests `drawer.imageFit()` with all FitMethods for portrait and landscape images.

orx-mesh-generators/src/jvmDemo/kotlin/DemoAll.kt

@@ -3,7 +3,7 @@ import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
 import org.openrndr.extra.meshgenerators.*
-import org.openrndr.extra.shapes.grid
+import org.openrndr.extra.shapes.primitives.grid
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.shape.Rectangle

orx-shapes/build.gradle.kts

@@ -16,15 +16,11 @@ kotlin {
                 implementation(libs.openrndr.filter)
                 implementation(libs.kotlin.reflect)
                 implementation(libs.kotlin.coroutines)
-            }
-        }
-
-        val jvmMain by getting {
-            dependencies {
                 implementation(project(":orx-triangulation"))
             }
         }
 
+
         val jvmTest by getting {
             dependencies {
                 implementation(libs.kotest.assertions)

orx-shapes/src/commonMain/kotlin/adjust/extensions/TangentAngle.kt

@@ -0,0 +1,19 @@
+package org.openrndr.extra.shapes.adjust.extensions
+
+import org.openrndr.extra.shapes.adjust.ContourAdjusterVertex
+import org.openrndr.extra.shapes.vertex.ContourVertex
+import kotlin.math.acos
+
+val ContourVertex.angleBetweenTangents: Double
+    get() {
+        return if (tangentIn != null && tangentOut != null) {
+            acos(tangentIn!!.normalized.dot(tangentOut!!.normalized))
+        } else {
+            0.0
+        }
+    }
+
+val ContourAdjusterVertex.angleBetweenTangents: Double
+    get() {
+        return ContourVertex(contourAdjuster.contour, segmentIndex()).angleBetweenTangents
+    }

orx-shapes/src/commonMain/kotlin/alphashape/AlphaShape.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.alphashape
 
 import org.openrndr.extra.triangulation.Delaunay
 import org.openrndr.math.Vector2

orx-shapes/src/commonMain/kotlin/arrangement/Arrangement.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.arrangement
 
 import org.openrndr.extra.kdtree.buildKDTree
 import org.openrndr.extra.kdtree.vector2Mapper

orx-shapes/src/commonMain/kotlin/bezierpatches/BezierPatch.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.bezierpatches
 
 import org.openrndr.color.AlgebraicColor
 import org.openrndr.color.ColorRGBa

orx-shapes/src/commonMain/kotlin/bezierpatches/BezierPatch3D.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.bezierpatches
 
 import org.openrndr.color.AlgebraicColor
 import org.openrndr.color.ColorRGBa

orx-shapes/src/commonMain/kotlin/bezierpatches/BezierPatchDrawer.kt

@@ -1,9 +1,7 @@
-package org.openrndr.extra.shapes.drawers
+package org.openrndr.extra.shapes.bezierpatches
 
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
-import org.openrndr.extra.shapes.BezierPatchBase
-import org.openrndr.extra.shapes.BezierPatch3DBase
 import org.openrndr.internal.Driver
 import org.openrndr.math.Vector2
 

orx-shapes/src/commonMain/kotlin/hobbycurve/HobbyCurve.kt

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.hobbycurve
 // Code adapted from http://weitz.de/hobby/
 
 import org.openrndr.math.Vector2

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.math.*
 import org.openrndr.shape.ShapeContour

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.math.Polar
 import org.openrndr.math.Vector2

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.math.LinearType
 import org.openrndr.math.Polar

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.math.LinearType
 import org.openrndr.math.Polar

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.shape.Rectangle
 import kotlin.math.round

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.math.Vector2
 import org.openrndr.math.asRadians

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.math.Vector2
 import org.openrndr.math.asRadians

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.draw.Drawer
 import org.openrndr.math.Vector2

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

@@ -1,4 +1,4 @@
-package org.openrndr.extra.shapes
+package org.openrndr.extra.shapes.primitives
 
 import org.openrndr.math.LinearType
 import org.openrndr.math.Polar

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.arrangement.Arrangement
-import org.openrndr.extra.shapes.hobbyCurve
+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.arrangement.Arrangement
-import org.openrndr.extra.shapes.BoundedFace
+import org.openrndr.extra.shapes.arrangement.BoundedFace
-import org.openrndr.extra.shapes.hobbyCurve
+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.bezierpatches.bezierPatch
-import org.openrndr.extra.shapes.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.bezierpatches.bezierPatch
-import org.openrndr.extra.shapes.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.bezierpatches.bezierPatch
-import org.openrndr.extra.shapes.bezierPatch
+import org.openrndr.extra.shapes.bezierpatches.distort
-import org.openrndr.extra.shapes.distort
+import org.openrndr.extra.shapes.primitives.regularStarRounded
-import org.openrndr.extra.shapes.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.bezierpatches.bezierPatch
-import org.openrndr.extra.shapes.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.extra.shapes.bezierpatches.bezierPatch
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.shapes.bezierPatch
-import org.openrndr.extra.shapes.drawers.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.bezierpatches.bezierPatch
-import org.openrndr.extra.shapes.bezierPatch
-import org.openrndr.extra.shapes.drawers.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.bezierpatches.bezierPatch
-import org.openrndr.extra.shapes.drawers.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.extra.shapes.bezierpatches.bezierPatch
-import org.openrndr.extensions.SingleScreenshot
+import org.openrndr.extra.shapes.bezierpatches.bezierPatches
-import org.openrndr.extra.shapes.bezierPatch
 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.alphashape.AlphaShape
-import org.openrndr.extra.shapes.hobbyCurve
+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.primitives.regularPolygon
-import org.openrndr.extra.shapes.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.primitives.regularStar
-import org.openrndr.extra.shapes.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.primitives.regularStar
-import org.openrndr.extra.shapes.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.primitives.RoundedRectangle
-import org.openrndr.extra.shapes.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

orx-shapes/src/jvmTest/kotlin/TestChamferCorners.kt

@@ -2,7 +2,7 @@ import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.equals.shouldBeEqual
 import org.openrndr.extra.shapes.operators.bevelCorners
 import org.openrndr.extra.shapes.operators.roundCorners
-import org.openrndr.extra.shapes.regularPolygon
+import org.openrndr.extra.shapes.primitives.regularPolygon
 import org.openrndr.shape.Circle
 import org.openrndr.shape.contour
 

orx-shapes/src/jvmTest/kotlin/TestRegularPolygon.kt

@@ -1,9 +1,9 @@
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.kotest.matchers.equals.shouldBeEqual
-import org.openrndr.extra.shapes.regularPolygon
+import org.openrndr.extra.shapes.primitives.regularPolygon
-import org.openrndr.extra.shapes.regularPolygonBeveled
+import org.openrndr.extra.shapes.primitives.regularPolygonBeveled
-import org.openrndr.extra.shapes.regularPolygonRounded
+import org.openrndr.extra.shapes.primitives.regularPolygonRounded
 import org.openrndr.shape.Winding
 
 class TestRegularPolygon : DescribeSpec({

orx-shapes/src/jvmTest/kotlin/TestRegularStar.kt

@@ -1,10 +1,9 @@
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.kotest.matchers.equals.shouldBeEqual
-import org.openrndr.extra.shapes.regularPolygonBeveled
+import org.openrndr.extra.shapes.primitives.regularPolygonBeveled
-import org.openrndr.extra.shapes.regularPolygonRounded
+import org.openrndr.extra.shapes.primitives.regularStar
-import org.openrndr.extra.shapes.regularStar
+import org.openrndr.extra.shapes.primitives.regularStarRounded
-import org.openrndr.extra.shapes.regularStarRounded
 import org.openrndr.shape.Winding
 
 class TestRegularStar : DescribeSpec({

orx-shapes/src/jvmTest/kotlin/TestRoundedRectangle.kt

@@ -1,7 +1,7 @@
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.booleans.shouldBeTrue
 import io.kotest.matchers.equals.shouldBeEqual
-import org.openrndr.extra.shapes.*
+import org.openrndr.extra.shapes.primitives.RoundedRectangle
 import org.openrndr.shape.Winding
 
 class TestRoundedRectangle : DescribeSpec({

orx-triangulation/src/jvmDemo/kotlin/DemoVoronoi02.kt

@@ -1,6 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.grid
+import org.openrndr.extra.shapes.primitives.grid
 import org.openrndr.extra.triangulation.delaunayTriangulation
 import org.openrndr.shape.Circle
 

orx-triangulation/src/jvmDemo/kotlin/DemoVoronoi03.kt

@@ -1,6 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.shapes.grid
+import org.openrndr.extra.shapes.primitives.grid
 import org.openrndr.extra.triangulation.delaunayTriangulation
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3