diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f83d5ed5..c4f4a421 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -60,7 +60,6 @@ openrndr-event = { group = "org.openrndr", name = "openrndr-event", version.ref openrndr-filter = { group = "org.openrndr", name = "openrndr-filter", version.ref = "openrndr" } openrndr-dialogs = { group = "org.openrndr", name = "openrndr-dialogs", version.ref = "openrndr" } openrndr-ffmpeg = { group = "org.openrndr", name = "openrndr-ffmpeg", version.ref = "openrndr" } -openrndr-svg = { group = "org.openrndr", name = "openrndr-svg", version.ref = "openrndr" } openrndr-gl3-core = { group = "org.openrndr", name = "openrndr-gl3", version.ref = "openrndr" } openrndr-gl3-natives-macos-arm64 = { group = "org.openrndr", name = "openrndr-gl3-natives-macos-arm64", version.ref = "openrndr" } diff --git a/orx-jumpflood/build.gradle.kts b/orx-jumpflood/build.gradle.kts index f9be9770..6839dc31 100644 --- a/orx-jumpflood/build.gradle.kts +++ b/orx-jumpflood/build.gradle.kts @@ -34,7 +34,8 @@ kotlin { implementation(project(":orx-jumpflood")) implementation(project(":orx-compositor")) implementation(project(":orx-jvm:orx-gui")) - implementation(libs.openrndr.svg) + implementation(project(":orx-composition")) + implementation(project(":orx-svg")) } } } diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt index e63ce0fb..2c7080af 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF01.kt @@ -4,7 +4,7 @@ import org.openrndr.draw.ColorFormat import org.openrndr.draw.ColorType import org.openrndr.draw.colorBuffer import org.openrndr.extra.jumpfill.ShapeSDF -import org.openrndr.svg.loadSVG +import org.openrndr.extra.svg.loadSVG fun main() { application { diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF02.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF02.kt index 5ef70910..0d6af615 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF02.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF02.kt @@ -7,9 +7,10 @@ import org.openrndr.extra.jumpfill.ShapeSDF import org.openrndr.extra.jumpfill.draw.SDFStrokeFill import org.openrndr.extra.jumpfill.ops.SDFOnion import org.openrndr.extra.jumpfill.ops.SDFSmoothIntersection +import org.openrndr.extra.svg.loadSVG import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform -import org.openrndr.svg.loadSVG + import kotlin.math.min fun main() { diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF03.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF03.kt index a8722156..b511bfc8 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF03.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF03.kt @@ -7,7 +7,8 @@ import org.openrndr.extra.fx.distort.FluidDistort import org.openrndr.extra.jumpfill.ShapeSDF import org.openrndr.extra.jumpfill.draw.SDFStrokeFill import org.openrndr.extra.jumpfill.ops.SDFSmoothDifference -import org.openrndr.svg.loadSVG +import org.openrndr.extra.svg.loadSVG + fun main() { application { diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF04.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF04.kt index ef1fd044..bec8706b 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF04.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF04.kt @@ -8,8 +8,9 @@ import org.openrndr.extra.gui.GUI import org.openrndr.extra.jumpfill.ShapeSDF import org.openrndr.extra.jumpfill.draw.SDFStrokeFill import org.openrndr.extra.jumpfill.ops.SDFSmoothDifference +import org.openrndr.extra.svg.loadSVG import org.openrndr.shape.Circle -import org.openrndr.svg.loadSVG + fun main() { application { diff --git a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF05.kt b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF05.kt index a5e0c1ab..ddb30d47 100644 --- a/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF05.kt +++ b/orx-jumpflood/src/jvmDemo/kotlin/DemoShapeSDF05.kt @@ -8,9 +8,10 @@ import org.openrndr.extra.gui.GUI import org.openrndr.extra.jumpfill.ShapeSDF import org.openrndr.extra.jumpfill.draw.SDFStrokeFill import org.openrndr.extra.jumpfill.ops.SDFSmoothDifference +import org.openrndr.extra.svg.loadSVG import org.openrndr.math.Vector2 import org.openrndr.shape.Circle -import org.openrndr.svg.loadSVG + import kotlin.math.cos import kotlin.math.sin