From 02058ddf5b04c3b54c9a4e1214cd476b72abd299 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Mon, 22 Jan 2024 19:15:07 +0100 Subject: [PATCH] [orx-shapes] Move select demos into packages --- orx-shapes/src/commonMain/kotlin/tunni/Tunni.kt | 3 --- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour01.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour02.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour05.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour06.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour07.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour09.kt | 2 +- .../src/jvmDemo/kotlin/adjust/DemoAdjustContourContinue01.kt | 2 +- orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniAdjuster01.kt | 1 + orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniPoint01.kt | 2 ++ 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/orx-shapes/src/commonMain/kotlin/tunni/Tunni.kt b/orx-shapes/src/commonMain/kotlin/tunni/Tunni.kt index 8fadb99d..a8999ce0 100644 --- a/orx-shapes/src/commonMain/kotlin/tunni/Tunni.kt +++ b/orx-shapes/src/commonMain/kotlin/tunni/Tunni.kt @@ -58,7 +58,6 @@ fun Segment.withTunniPoint(tunniPoint: Vector2): Segment { * @since orx 0.4.5 */ fun Segment.withTunniLine(pointOnLine: Vector2): Segment { - println("hoi! $pointOnLine") val ls = LineSegment(pointOnLine, pointOnLine + this.cubic.control[0] - this.cubic.control[1]) val ac0 = LineSegment(start, this.cubic.control[0]) val bc1 = LineSegment(end, this.cubic.control[1]) @@ -67,10 +66,8 @@ fun Segment.withTunniLine(pointOnLine: Vector2): Segment { val cp1 = intersection(ls, bc1, Double.POSITIVE_INFINITY) return if (cp0 != Vector2.INFINITY && cp1 != Vector2.INFINITY) { - println("$cp0 $cp1") copy(start, listOf(cp0, cp1), end) } else { - println("${cp0} ${cp1}") this } } \ No newline at end of file diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour01.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour01.kt index 1f934636..4979e045 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour01.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour01.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour02.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour02.kt index 51d1ec7c..89961af4 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour02.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour02.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt index b1b59994..89115f55 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour03.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt index 8fffabe1..53a34687 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour04.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour05.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour05.kt index 6f2522df..036646aa 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour05.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour05.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour06.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour06.kt index 40109799..35288f27 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour06.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour06.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour07.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour07.kt index 6ccf1157..f9ead44e 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour07.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour07.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour09.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour09.kt index 4cd24c26..8d12f5a6 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour09.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContour09.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContourContinue01.kt b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContourContinue01.kt index f49d765e..7e66def7 100644 --- a/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContourContinue01.kt +++ b/orx-shapes/src/jvmDemo/kotlin/adjust/DemoAdjustContourContinue01.kt @@ -1,4 +1,4 @@ -//package adjust +package adjust import kotlinx.coroutines.yield import org.openrndr.application diff --git a/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniAdjuster01.kt b/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniAdjuster01.kt index 6c622e52..8135eca6 100644 --- a/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniAdjuster01.kt +++ b/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniAdjuster01.kt @@ -1,3 +1,4 @@ +package tunni import org.openrndr.application import org.openrndr.color.ColorRGBa diff --git a/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniPoint01.kt b/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniPoint01.kt index 099de913..18f33c07 100644 --- a/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniPoint01.kt +++ b/orx-shapes/src/jvmDemo/kotlin/tunni/DemoTunniPoint01.kt @@ -1,3 +1,5 @@ +package tunni + import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.extra.shapes.tunni.tunniLine