[orx-shapes] Refactor package layout

openrndr · Jan 23, 2024 · 8fbb106 · 8fbb106
1 parent 78ba51c
commit 8fbb106
Show file tree

Hide file tree

Showing 54 changed files with 138 additions and 91 deletions.
diff --git a/orx-easing/src/jvmDemo/kotlin/DemoEasings01.kt b/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
 

diff --git a/orx-image-fit/src/jvmDemo/kotlin/DemoImageFit01.kt b/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.

diff --git a/orx-mesh-generators/src/jvmDemo/kotlin/DemoAll.kt b/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

diff --git a/orx-shapes/build.gradle.kts b/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)

diff --git a/orx-shapes/src/commonMain/kotlin/adjust/extensions/TangentAngle.kt b/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
+    }
diff --git a/orx-shapes/src/jvmMain/kotlin/AlphaShape.kt → ...ommonMain/kotlin/alphashape/AlphaShape.kt b/orx-shapes/src/jvmMain/kotlin/AlphaShape.kt → ...ommonMain/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

diff --git a/...apes/src/commonMain/kotlin/Arrangement.kt → ...monMain/kotlin/arrangement/Arrangement.kt b/...apes/src/commonMain/kotlin/Arrangement.kt → ...monMain/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

diff --git a/...apes/src/commonMain/kotlin/BezierPatch.kt → ...nMain/kotlin/bezierpatches/BezierPatch.kt b/...apes/src/commonMain/kotlin/BezierPatch.kt → ...nMain/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

diff --git a/...es/src/commonMain/kotlin/BezierPatch3D.kt → ...ain/kotlin/bezierpatches/BezierPatch3D.kt b/...es/src/commonMain/kotlin/BezierPatch3D.kt → ...ain/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

diff --git a/...nMain/kotlin/drawers/BezierPatchDrawer.kt → ...kotlin/bezierpatches/BezierPatchDrawer.kt b/...nMain/kotlin/drawers/BezierPatchDrawer.kt → ...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
 

diff --git a/...hapes/src/commonMain/kotlin/HobbyCurve.kt → ...ommonMain/kotlin/hobbycurve/HobbyCurve.kt b/...hapes/src/commonMain/kotlin/HobbyCurve.kt → ...ommonMain/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

diff --git a/orx-shapes/src/commonMain/kotlin/Arc.kt → ...s/src/commonMain/kotlin/primitives/Arc.kt b/orx-shapes/src/commonMain/kotlin/Arc.kt → ...s/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

diff --git a/orx-shapes/src/commonMain/kotlin/Circle.kt → ...rc/commonMain/kotlin/primitives/Circle.kt b/orx-shapes/src/commonMain/kotlin/Circle.kt → ...rc/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

diff --git a/orx-shapes/src/commonMain/kotlin/Net.kt → ...s/src/commonMain/kotlin/primitives/Net.kt b/orx-shapes/src/commonMain/kotlin/Net.kt → ...s/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

diff --git a/orx-shapes/src/commonMain/kotlin/Pulley.kt → ...rc/commonMain/kotlin/primitives/Pulley.kt b/orx-shapes/src/commonMain/kotlin/Pulley.kt → ...rc/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

diff --git a/...es/src/commonMain/kotlin/RectangleGrid.kt → ...onMain/kotlin/primitives/RectangleGrid.kt b/...es/src/commonMain/kotlin/RectangleGrid.kt → ...onMain/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

diff --git a/...s/src/commonMain/kotlin/RegularPolygon.kt → ...nMain/kotlin/primitives/RegularPolygon.kt b/...s/src/commonMain/kotlin/RegularPolygon.kt → ...nMain/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

diff --git a/...apes/src/commonMain/kotlin/RegularStar.kt → ...mmonMain/kotlin/primitives/RegularStar.kt b/...apes/src/commonMain/kotlin/RegularStar.kt → ...mmonMain/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

diff --git a/...src/commonMain/kotlin/RoundedRectangle.kt → ...ain/kotlin/primitives/RoundedRectangle.kt b/...src/commonMain/kotlin/RoundedRectangle.kt → ...ain/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

diff --git a/orx-shapes/src/commonMain/kotlin/Tear.kt → .../src/commonMain/kotlin/primitives/Tear.kt b/orx-shapes/src/commonMain/kotlin/Tear.kt → .../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

diff --git a/...apes/src/jvmDemo/kotlin/DemoAlphaShape.kt → ...mDemo/kotlin/alphashape/DemoAlphaShape.kt b/...apes/src/jvmDemo/kotlin/DemoAlphaShape.kt → ...mDemo/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
 

diff --git a/...s/src/jvmDemo/kotlin/DemoArrangement01.kt → ...o/kotlin/arrangement/DemoArrangement01.kt b/...s/src/jvmDemo/kotlin/DemoArrangement01.kt → ...o/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

diff --git a/...s/src/jvmDemo/kotlin/DemoArrangement02.kt → ...o/kotlin/arrangement/DemoArrangement02.kt b/...s/src/jvmDemo/kotlin/DemoArrangement02.kt → ...o/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 {

diff --git a/...s/src/jvmDemo/kotlin/DemoBezierPatch01.kt → ...o/kotlin/bezierpatch/DemoBezierPatch01.kt b/...s/src/jvmDemo/kotlin/DemoBezierPatch01.kt → ...o/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
 

diff --git a/...s/src/jvmDemo/kotlin/DemoBezierPatch02.kt → ...o/kotlin/bezierpatch/DemoBezierPatch02.kt b/...s/src/jvmDemo/kotlin/DemoBezierPatch02.kt → ...o/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
 

diff --git a/...s/src/jvmDemo/kotlin/DemoBezierPatch03.kt → ...o/kotlin/bezierpatch/DemoBezierPatch03.kt b/...s/src/jvmDemo/kotlin/DemoBezierPatch03.kt → ...o/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

diff --git a/...s/src/jvmDemo/kotlin/DemoBezierPatch04.kt → ...o/kotlin/bezierpatch/DemoBezierPatch04.kt b/...s/src/jvmDemo/kotlin/DemoBezierPatch04.kt → ...o/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
 
 /**

diff --git a/...s/src/jvmDemo/kotlin/DemoBezierPatch05.kt → ...o/kotlin/bezierpatch/DemoBezierPatch05.kt b/...s/src/jvmDemo/kotlin/DemoBezierPatch05.kt → ...o/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

diff --git a/...jvmDemo/kotlin/DemoBezierPatchDrawer01.kt → ...in/bezierpatch/DemoBezierPatchDrawer01.kt b/...jvmDemo/kotlin/DemoBezierPatchDrawer01.kt → ...in/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() {

diff --git a/...jvmDemo/kotlin/DemoBezierPatchDrawer02.kt → ...in/bezierpatch/DemoBezierPatchDrawer02.kt b/...jvmDemo/kotlin/DemoBezierPatchDrawer02.kt → ...in/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() {

diff --git a/...jvmDemo/kotlin/DemoBezierPatchDrawer03.kt → ...in/bezierpatch/DemoBezierPatchDrawer03.kt b/...jvmDemo/kotlin/DemoBezierPatchDrawer03.kt → ...in/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

diff --git a/...src/jvmDemo/kotlin/DemoBezierPatches01.kt → ...kotlin/bezierpatch/DemoBezierPatches01.kt b/...src/jvmDemo/kotlin/DemoBezierPatches01.kt → ...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

diff --git a/...es/src/jvmDemo/kotlin/DemoHobbyCurve01.kt → ...emo/kotlin/hobbycurve/DemoHobbyCurve01.kt b/...es/src/jvmDemo/kotlin/DemoHobbyCurve01.kt → ...emo/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 {

diff --git a/...es/src/jvmDemo/kotlin/DemoHobbyCurve02.kt → ...emo/kotlin/hobbycurve/DemoHobbyCurve02.kt b/...es/src/jvmDemo/kotlin/DemoHobbyCurve02.kt → ...emo/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
 

diff --git a/orx-shapes/src/jvmDemo/kotlin/DemoArc01.kt → ...rc/jvmDemo/kotlin/primitives/DemoArc01.kt b/orx-shapes/src/jvmDemo/kotlin/DemoArc01.kt → ...rc/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 {

diff --git a/orx-shapes/src/jvmDemo/kotlin/DemoNet01.kt → ...rc/jvmDemo/kotlin/primitives/DemoNet01.kt b/orx-shapes/src/jvmDemo/kotlin/DemoNet01.kt → ...rc/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
 

diff --git a/...shapes/src/jvmDemo/kotlin/DemoPulley01.kt → ...jvmDemo/kotlin/primitives/DemoPulley01.kt b/...shapes/src/jvmDemo/kotlin/DemoPulley01.kt → ...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
 

diff --git a/...src/jvmDemo/kotlin/DemoRectangleGrid01.kt → .../kotlin/primitives/DemoRectangleGrid01.kt b/...src/jvmDemo/kotlin/DemoRectangleGrid01.kt → .../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 {

diff --git a/...src/jvmDemo/kotlin/DemoRectangleGrid02.kt → .../kotlin/primitives/DemoRectangleGrid02.kt b/...src/jvmDemo/kotlin/DemoRectangleGrid02.kt → .../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 {