[orx-shapes] Refactor package layout

This commit is contained in:
Edwin Jakobs
2024-01-23 09:38:43 +01:00
parent 78ba51ca85
commit 8fbb106823
54 changed files with 138 additions and 91 deletions

View File

@@ -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

View File

@@ -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.

View File

@@ -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

View File

@@ -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)

View File

@@ -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
}

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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
/**

View File

@@ -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

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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

View File

@@ -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 {

View File

@@ -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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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 {

View File

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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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

View File

@@ -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.regularPolygonBeveled
import org.openrndr.extra.shapes.regularPolygonRounded
import org.openrndr.extra.shapes.primitives.regularPolygon
import org.openrndr.extra.shapes.primitives.regularPolygonBeveled
import org.openrndr.extra.shapes.primitives.regularPolygonRounded
import org.openrndr.shape.Winding
class TestRegularPolygon : DescribeSpec({

View File

@@ -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.regularPolygonRounded
import org.openrndr.extra.shapes.regularStar
import org.openrndr.extra.shapes.regularStarRounded
import org.openrndr.extra.shapes.primitives.regularPolygonBeveled
import org.openrndr.extra.shapes.primitives.regularStar
import org.openrndr.extra.shapes.primitives.regularStarRounded
import org.openrndr.shape.Winding
class TestRegularStar : DescribeSpec({

View File

@@ -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({

View File

@@ -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

View File

@@ -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