From bad90709cc14325383ef7cad98297249af98784b Mon Sep 17 00:00:00 2001 From: Vechro <6316604+Vechro@users.noreply.github.com> Date: Thu, 28 Jul 2022 20:23:26 +0300 Subject: [PATCH] Rename org.openrndr.extras -> org.openrndr.extra (#250) Co-authored-by: Edwin Jakobs --- .../src/demo/kotlin/DemoBillboardCircles01.kt | 2 +- .../src/demo/kotlin/DemoColorBufferCopy01.kt | 4 ++-- openrndr-demos/src/demo/kotlin/DemoCubemap01.kt | 4 ++-- openrndr-demos/src/demo/kotlin/DemoCubemap02.kt | 4 ++-- openrndr-demos/src/demo/kotlin/DemoCubemap03.kt | 4 ++-- .../src/demo/kotlin/DemoGeometryShader01.kt | 4 ++-- .../src/demo/kotlin/DemoImageLoadStore01.kt | 2 +- .../src/demo/kotlin/DemoImageLoadStore02.kt | 2 +- .../src/demo/kotlin/DemoScreenCapture01.kt | 2 +- openrndr-demos/src/demo/kotlin/DemoTessShader04.kt | 6 +++--- orx-camera/README.md | 12 ++++++------ orx-camera/src/commonMain/kotlin/AxisHelper.kt | 2 +- orx-camera/src/commonMain/kotlin/GridHelper.kt | 2 +- orx-camera/src/commonMain/kotlin/Orbital.kt | 2 +- orx-camera/src/commonMain/kotlin/OrbitalCamera.kt | 2 +- orx-camera/src/commonMain/kotlin/OrbitalControls.kt | 2 +- orx-color/src/commonMain/kotlin/palettes/Palettes.kt | 2 +- orx-color/src/commonMain/kotlin/phrases/Phrases.kt | 2 +- orx-color/src/commonMain/kotlin/presets/Colors.kt | 2 +- .../src/commonMain/kotlin/statistics/Histogram.kt | 2 +- orx-color/src/demo/kotlin/DemoColorPlane01.kt | 4 ++-- orx-color/src/demo/kotlin/DemoColorPlane02.kt | 4 ++-- orx-color/src/demo/kotlin/DemoColorRange01.kt | 2 +- orx-color/src/demo/kotlin/DemoColorRange02.kt | 6 +++--- orx-color/src/demo/kotlin/DemoColorRange03.kt | 2 +- orx-color/src/demo/kotlin/DemoColorRange04.kt | 6 +++--- orx-color/src/demo/kotlin/DemoHistogram01.kt | 2 +- orx-color/src/demo/kotlin/DemoHistogram02.kt | 2 +- orx-color/src/demo/kotlin/DemoHistogram03.kt | 2 +- .../src/jvmMain/kotlin/src/statistics/Histogram.kt | 2 +- orx-color/src/jvmTest/kotlin/TestMix.kt | 2 +- .../src/commonMain/kotlin/FitImageNode.kt | 2 +- orx-easing/src/commonMain/kotlin/Easing.kt | 2 +- orx-easing/src/demo/kotlin/DemoEasings01.kt | 2 +- orx-fx/src/commonMain/kotlin/color/Colorspaces.kt | 2 +- orx-fx/src/commonMain/kotlin/color/Duotone.kt | 8 ++++---- .../src/commonMain/kotlin/color/DuotoneGradient.kt | 6 +++--- orx-fx/src/commonMain/kotlin/color/Posterize.kt | 8 ++++---- orx-image-fit/src/commonMain/kotlin/ImageFit.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt | 6 +++--- orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL02.kt | 4 ++-- orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt | 4 ++-- orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene02.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt | 4 ++-- .../src/demo/kotlin/DemoSegmentContours01.kt | 2 +- orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt | 2 +- .../src/demo/kotlin/DemoVoxelConeTracing01.kt | 4 ++-- orx-jvm/orx-dnk3/src/main/kotlin/tools/Skybox.kt | 2 +- .../orx-file-watcher/src/main/kotlin/FileWatcher.kt | 2 +- orx-jvm/orx-keyframer/src/main/kotlin/Key.kt | 4 ++-- .../orx-keyframer/src/main/kotlin/KeyQuaternion.kt | 4 ++-- orx-jvm/orx-keyframer/src/main/kotlin/KeyVector3.kt | 4 ++-- orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt | 4 ++-- .../src/test/kotlin/TestKeyframerChannel.kt | 2 +- orx-jvm/orx-olive/src/main/kotlin/Olive.kt | 6 +++--- .../src/main/kotlin/RabbitControlServer.kt | 4 ++-- orx-mesh-generators/src/demo/kotlin/DemoBox.kt | 4 ++-- orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt | 10 +++++----- orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt | 4 ++-- orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt | 4 ++-- orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt | 4 ++-- orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt | 4 ++-- orx-mesh-generators/src/main/kotlin/Box.kt | 2 +- orx-mesh-generators/src/main/kotlin/Cap.kt | 2 +- orx-mesh-generators/src/main/kotlin/Cylinder.kt | 2 +- orx-mesh-generators/src/main/kotlin/Dodecahedron.kt | 2 +- .../src/main/kotlin/GeneratorBuffer.kt | 2 +- .../src/main/kotlin/MeshGenerators.kt | 2 +- orx-mesh-generators/src/main/kotlin/Plane.kt | 2 +- orx-mesh-generators/src/main/kotlin/Sphere.kt | 2 +- .../src/commonMain/kotlin/LinearGradient.kt | 2 +- .../src/commonMain/kotlin/NPointLinearGradient.kt | 2 +- .../src/commonMain/kotlin/RadialGradient.kt | 2 +- .../commonMain/kotlin/drawers/BezierPatchDrawer.kt | 2 +- orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt | 2 +- 81 files changed, 129 insertions(+), 129 deletions(-) diff --git a/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt b/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt index a45cca6d..07ace9be 100644 --- a/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoBillboardCircles01.kt @@ -5,7 +5,7 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.* import org.openrndr.extra.noise.uniformRing -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector2 import org.openrndr.math.Vector3 diff --git a/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt b/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt index fcce5462..995bf765 100644 --- a/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoColorBufferCopy01.kt @@ -1,7 +1,7 @@ import org.openrndr.application import org.openrndr.draw.* -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.boxMesh fun main() = application { program { diff --git a/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt b/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt index b741ca94..cf72e7f0 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCubemap01.kt @@ -3,8 +3,8 @@ import org.openrndr.draw.Cubemap import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.Session import org.openrndr.draw.shadeStyle -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.boxMesh fun main() = application { program { diff --git a/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt b/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt index b1387526..d9139400 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCubemap02.kt @@ -1,7 +1,7 @@ import org.openrndr.application import org.openrndr.draw.* -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.boxMesh fun main() = application { program { diff --git a/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt b/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt index 95b37f60..369d4897 100644 --- a/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt +++ b/openrndr-demos/src/demo/kotlin/DemoCubemap03.kt @@ -1,7 +1,7 @@ import org.openrndr.application import org.openrndr.draw.* -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.boxMesh fun main() = application { program { diff --git a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt index ce47bd36..c58d979a 100644 --- a/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoGeometryShader01.kt @@ -2,8 +2,8 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.Shader -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.boxMesh import org.openrndr.resourceText import org.openrndr.resourceUrl diff --git a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt index 1d94fd53..506882b7 100644 --- a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore01.kt @@ -1,7 +1,7 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.* -import org.openrndr.extras.meshgenerators.planeMesh +import org.openrndr.extra.meshgenerators.planeMesh import org.openrndr.internal.Driver import org.openrndr.math.Vector3 diff --git a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt index 8c9c3e09..e221ec92 100644 --- a/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt +++ b/openrndr-demos/src/demo/kotlin/DemoImageLoadStore02.kt @@ -1,7 +1,7 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.* -import org.openrndr.extras.meshgenerators.planeMesh +import org.openrndr.extra.meshgenerators.planeMesh import org.openrndr.internal.Driver import org.openrndr.math.Vector3 diff --git a/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt b/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt index f0cb671e..3cae667b 100644 --- a/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt +++ b/openrndr-demos/src/demo/kotlin/DemoScreenCapture01.kt @@ -4,7 +4,7 @@ import org.openrndr.draw.DepthTestPass import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.isolated import org.openrndr.draw.shadeStyle -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.meshgenerators.boxMesh import org.openrndr.ffmpeg.VideoPlayerFFMPEG import org.openrndr.math.Vector3 diff --git a/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt b/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt index 817945fa..b3e54530 100644 --- a/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt +++ b/openrndr-demos/src/demo/kotlin/DemoTessShader04.kt @@ -3,9 +3,9 @@ import org.openrndr.color.ColorRGBa import org.openrndr.draw.* import org.openrndr.extra.noise.uniform import org.openrndr.extra.noise.uniformRing -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.camera.OrbitalCamera -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.camera.OrbitalCamera +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.math.Vector3 import org.openrndr.resourceUrl import org.openrndr.shape.Ellipse diff --git a/orx-camera/README.md b/orx-camera/README.md index e17336d5..aeb30c43 100644 --- a/orx-camera/README.md +++ b/orx-camera/README.md @@ -8,12 +8,12 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.DrawPrimitive -import org.openrndr.extras.camera.AxisHelper -import org.openrndr.extras.camera.GridHelper -import org.openrndr.extras.camera.OrbitalCamera -import org.openrndr.extras.camera.OrbitalControls -import org.openrndr.extras.meshgenerators.boxMesh -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.camera.AxisHelper +import org.openrndr.extra.camera.GridHelper +import org.openrndr.extra.camera.OrbitalCamera +import org.openrndr.extra.camera.OrbitalControls +import org.openrndr.extra.meshgenerators.boxMesh +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.math.Vector3 fun main() = application { diff --git a/orx-camera/src/commonMain/kotlin/AxisHelper.kt b/orx-camera/src/commonMain/kotlin/AxisHelper.kt index a0294638..982ab992 100644 --- a/orx-camera/src/commonMain/kotlin/AxisHelper.kt +++ b/orx-camera/src/commonMain/kotlin/AxisHelper.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.camera +package org.openrndr.extra.camera import org.openrndr.Extension import org.openrndr.Program diff --git a/orx-camera/src/commonMain/kotlin/GridHelper.kt b/orx-camera/src/commonMain/kotlin/GridHelper.kt index 74cd0fae..754aacd5 100644 --- a/orx-camera/src/commonMain/kotlin/GridHelper.kt +++ b/orx-camera/src/commonMain/kotlin/GridHelper.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.camera +package org.openrndr.extra.camera import org.openrndr.Extension import org.openrndr.Program diff --git a/orx-camera/src/commonMain/kotlin/Orbital.kt b/orx-camera/src/commonMain/kotlin/Orbital.kt index 7aae1f64..fb891bf3 100644 --- a/orx-camera/src/commonMain/kotlin/Orbital.kt +++ b/orx-camera/src/commonMain/kotlin/Orbital.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.camera +package org.openrndr.extra.camera import org.openrndr.Extension import org.openrndr.Program diff --git a/orx-camera/src/commonMain/kotlin/OrbitalCamera.kt b/orx-camera/src/commonMain/kotlin/OrbitalCamera.kt index cf8c3279..626180a6 100644 --- a/orx-camera/src/commonMain/kotlin/OrbitalCamera.kt +++ b/orx-camera/src/commonMain/kotlin/OrbitalCamera.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.camera +package org.openrndr.extra.camera import org.openrndr.Extension import org.openrndr.Program diff --git a/orx-camera/src/commonMain/kotlin/OrbitalControls.kt b/orx-camera/src/commonMain/kotlin/OrbitalControls.kt index 684f6468..3a2a3d8c 100644 --- a/orx-camera/src/commonMain/kotlin/OrbitalControls.kt +++ b/orx-camera/src/commonMain/kotlin/OrbitalControls.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.camera +package org.openrndr.extra.camera import org.openrndr.* import org.openrndr.math.Vector2 diff --git a/orx-color/src/commonMain/kotlin/palettes/Palettes.kt b/orx-color/src/commonMain/kotlin/palettes/Palettes.kt index e105e9e4..80041580 100644 --- a/orx-color/src/commonMain/kotlin/palettes/Palettes.kt +++ b/orx-color/src/commonMain/kotlin/palettes/Palettes.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.color.palettes +package org.openrndr.extra.color.palettes import org.openrndr.color.* import org.openrndr.extra.color.spaces.* diff --git a/orx-color/src/commonMain/kotlin/phrases/Phrases.kt b/orx-color/src/commonMain/kotlin/phrases/Phrases.kt index ecb036c4..0a0d3354 100644 --- a/orx-color/src/commonMain/kotlin/phrases/Phrases.kt +++ b/orx-color/src/commonMain/kotlin/phrases/Phrases.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.color.phrases +package org.openrndr.extra.color.phrases import org.openrndr.extra.shaderphrases.ShaderPhrase import org.openrndr.extra.shaderphrases.ShaderPhraseBook diff --git a/orx-color/src/commonMain/kotlin/presets/Colors.kt b/orx-color/src/commonMain/kotlin/presets/Colors.kt index fbd25385..fa1df8b6 100644 --- a/orx-color/src/commonMain/kotlin/presets/Colors.kt +++ b/orx-color/src/commonMain/kotlin/presets/Colors.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package org.openrndr.extras.color.presets +package org.openrndr.extra.color.presets import org.openrndr.color.ColorRGBa import org.openrndr.color.rgb diff --git a/orx-color/src/commonMain/kotlin/statistics/Histogram.kt b/orx-color/src/commonMain/kotlin/statistics/Histogram.kt index a15bebde..93832174 100644 --- a/orx-color/src/commonMain/kotlin/statistics/Histogram.kt +++ b/orx-color/src/commonMain/kotlin/statistics/Histogram.kt @@ -1,5 +1,5 @@ @file:JvmName("HistogramJvm") -package org.openrndr.extras.color.statistics +package org.openrndr.extra.color.statistics import org.openrndr.color.ColorRGBa import org.openrndr.draw.ColorBuffer diff --git a/orx-color/src/demo/kotlin/DemoColorPlane01.kt b/orx-color/src/demo/kotlin/DemoColorPlane01.kt index f0842656..d9218f0f 100644 --- a/orx-color/src/demo/kotlin/DemoColorPlane01.kt +++ b/orx-color/src/demo/kotlin/DemoColorPlane01.kt @@ -2,9 +2,9 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.* import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.extra.color.spaces.ColorOKLCHa -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.math.Vector3 import kotlin.math.cos diff --git a/orx-color/src/demo/kotlin/DemoColorPlane02.kt b/orx-color/src/demo/kotlin/DemoColorPlane02.kt index a22c5bcb..f8a75015 100644 --- a/orx-color/src/demo/kotlin/DemoColorPlane02.kt +++ b/orx-color/src/demo/kotlin/DemoColorPlane02.kt @@ -2,9 +2,9 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.* import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.extra.color.spaces.ColorOKLCHa -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.math.Vector3 import kotlin.math.cos diff --git a/orx-color/src/demo/kotlin/DemoColorRange01.kt b/orx-color/src/demo/kotlin/DemoColorRange01.kt index 8950f61c..44c2f048 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange01.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange01.kt @@ -4,7 +4,7 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.color.palettes.rangeTo +import org.openrndr.extra.color.palettes.rangeTo import org.openrndr.extra.color.spaces.toHSLUVa import org.openrndr.math.Vector2 import org.openrndr.math.map diff --git a/orx-color/src/demo/kotlin/DemoColorRange02.kt b/orx-color/src/demo/kotlin/DemoColorRange02.kt index 86a0d233..c1261b24 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange02.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange02.kt @@ -4,9 +4,9 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.isolated import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.color.palettes.colorSequence -import org.openrndr.extras.color.palettes.rangeTo -import org.openrndr.extras.color.presets.CORAL +import org.openrndr.extra.color.palettes.colorSequence +import org.openrndr.extra.color.palettes.rangeTo +import org.openrndr.extra.color.presets.CORAL import org.openrndr.extra.color.spaces.toHSLUVa fun main() = application { diff --git a/orx-color/src/demo/kotlin/DemoColorRange03.kt b/orx-color/src/demo/kotlin/DemoColorRange03.kt index 2529ed28..0b7c0fd7 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange03.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange03.kt @@ -3,7 +3,7 @@ import org.openrndr.color.ColorRGBa import org.openrndr.draw.loadFont import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.color.spaces.* -import org.openrndr.extras.color.palettes.rangeTo +import org.openrndr.extra.color.palettes.rangeTo fun main() { application { diff --git a/orx-color/src/demo/kotlin/DemoColorRange04.kt b/orx-color/src/demo/kotlin/DemoColorRange04.kt index bb4c315b..b5010c12 100644 --- a/orx-color/src/demo/kotlin/DemoColorRange04.kt +++ b/orx-color/src/demo/kotlin/DemoColorRange04.kt @@ -4,13 +4,13 @@ import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.isolated import org.openrndr.draw.loadFont import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.color.palettes.rangeTo +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.color.palettes.rangeTo import org.openrndr.extra.color.spaces.toHSLUVa import org.openrndr.extra.color.spaces.toOKLABa import org.openrndr.extra.color.spaces.toOKLCHa import org.openrndr.extra.color.spaces.toXSLUVa -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.math.Vector3 fun main() { diff --git a/orx-color/src/demo/kotlin/DemoHistogram01.kt b/orx-color/src/demo/kotlin/DemoHistogram01.kt index 40c215dc..249d4a3b 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram01.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram01.kt @@ -3,7 +3,7 @@ import org.openrndr.application import org.openrndr.draw.loadImage import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.color.statistics.calculateHistogramRGB +import org.openrndr.extra.color.statistics.calculateHistogramRGB fun main() = application { program { diff --git a/orx-color/src/demo/kotlin/DemoHistogram02.kt b/orx-color/src/demo/kotlin/DemoHistogram02.kt index 014e89b6..97221b5c 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram02.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram02.kt @@ -3,7 +3,7 @@ import org.openrndr.application import org.openrndr.draw.loadImage import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.color.statistics.calculateHistogramRGB +import org.openrndr.extra.color.statistics.calculateHistogramRGB import kotlin.math.pow fun main() = application { diff --git a/orx-color/src/demo/kotlin/DemoHistogram03.kt b/orx-color/src/demo/kotlin/DemoHistogram03.kt index c98519e1..fad11a84 100644 --- a/orx-color/src/demo/kotlin/DemoHistogram03.kt +++ b/orx-color/src/demo/kotlin/DemoHistogram03.kt @@ -3,7 +3,7 @@ import org.openrndr.application import org.openrndr.draw.loadImage import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.color.statistics.calculateHistogramRGB +import org.openrndr.extra.color.statistics.calculateHistogramRGB fun main() = application { program { diff --git a/orx-color/src/jvmMain/kotlin/src/statistics/Histogram.kt b/orx-color/src/jvmMain/kotlin/src/statistics/Histogram.kt index 8bab3cea..014552bd 100644 --- a/orx-color/src/jvmMain/kotlin/src/statistics/Histogram.kt +++ b/orx-color/src/jvmMain/kotlin/src/statistics/Histogram.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.color.statistics +package org.openrndr.extra.color.statistics import org.openrndr.color.ColorRGBa import org.openrndr.draw.ColorBuffer diff --git a/orx-color/src/jvmTest/kotlin/TestMix.kt b/orx-color/src/jvmTest/kotlin/TestMix.kt index 2c807573..41d96747 100644 --- a/orx-color/src/jvmTest/kotlin/TestMix.kt +++ b/orx-color/src/jvmTest/kotlin/TestMix.kt @@ -1,7 +1,7 @@ import org.amshove.kluent.`should be equal to` import org.openrndr.color.ColorRGBa import org.openrndr.color.Linearity -import org.openrndr.extras.color.palettes.rangeTo +import org.openrndr.extra.color.palettes.rangeTo import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe diff --git a/orx-compute-graph-nodes/src/commonMain/kotlin/FitImageNode.kt b/orx-compute-graph-nodes/src/commonMain/kotlin/FitImageNode.kt index 75ee74cf..129204fe 100644 --- a/orx-compute-graph-nodes/src/commonMain/kotlin/FitImageNode.kt +++ b/orx-compute-graph-nodes/src/commonMain/kotlin/FitImageNode.kt @@ -7,7 +7,7 @@ import org.openrndr.draw.renderTarget import org.openrndr.extra.computegraph.ComputeGraph import org.openrndr.extra.computegraph.ComputeNode import org.openrndr.extra.computegraph.withKey -import org.openrndr.extras.imageFit.imageFit +import org.openrndr.extra.imageFit.imageFit fun ComputeGraph.fitImageNode(program: Program, input: ComputeNode) : ComputeNode { return node { diff --git a/orx-easing/src/commonMain/kotlin/Easing.kt b/orx-easing/src/commonMain/kotlin/Easing.kt index 3895f846..d9be89f8 100644 --- a/orx-easing/src/commonMain/kotlin/Easing.kt +++ b/orx-easing/src/commonMain/kotlin/Easing.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.easing +package org.openrndr.extra.easing import kotlin.math.* diff --git a/orx-easing/src/demo/kotlin/DemoEasings01.kt b/orx-easing/src/demo/kotlin/DemoEasings01.kt index e4ee8b77..23b8656e 100644 --- a/orx-easing/src/demo/kotlin/DemoEasings01.kt +++ b/orx-easing/src/demo/kotlin/DemoEasings01.kt @@ -2,7 +2,7 @@ import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.draw.loadFont import org.openrndr.extra.shapes.grid -import org.openrndr.extras.easing.Easing +import org.openrndr.extra.easing.Easing import org.openrndr.math.Vector2 import org.openrndr.math.map diff --git a/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt b/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt index 7ed18b24..863a9672 100644 --- a/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt +++ b/orx-fx/src/commonMain/kotlin/color/Colorspaces.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.fx.fx_rgb_to_oklab import org.openrndr.extra.fx.fx_rgb_to_ycbcr import org.openrndr.extra.fx.fx_ycbcr_to_rgb import org.openrndr.extra.shaderphrases.preprocess -import org.openrndr.extras.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.phrases.ColorPhraseBook class RgbToYCbcr : Filter(mppFilterShader(fx_rgb_to_ycbcr, "rgb-to-ycbcr")) class YcbcrToRgb : Filter(mppFilterShader(fx_ycbcr_to_rgb, "ycbcr_to_rgb")) diff --git a/orx-fx/src/commonMain/kotlin/color/Duotone.kt b/orx-fx/src/commonMain/kotlin/color/Duotone.kt index 2464eaa8..891fbf3b 100644 --- a/orx-fx/src/commonMain/kotlin/color/Duotone.kt +++ b/orx-fx/src/commonMain/kotlin/color/Duotone.kt @@ -9,10 +9,10 @@ import org.openrndr.extra.parameters.BooleanParameter import org.openrndr.extra.parameters.ColorParameter import org.openrndr.extra.parameters.Description import org.openrndr.extra.shaderphrases.preprocess -import org.openrndr.extras.color.phrases.ColorPhraseBook -import org.openrndr.extras.color.presets.CORAL -import org.openrndr.extras.color.presets.DARK_GRAY -import org.openrndr.extras.color.presets.NAVY +import org.openrndr.extra.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.presets.CORAL +import org.openrndr.extra.color.presets.DARK_GRAY +import org.openrndr.extra.color.presets.NAVY @Description("Duotone") class Duotone : Filter(filterShaderFromCode(run { diff --git a/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt b/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt index a67a64b6..37fd4f81 100644 --- a/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt +++ b/orx-fx/src/commonMain/kotlin/color/DuotoneGradient.kt @@ -10,9 +10,9 @@ import org.openrndr.extra.parameters.ColorParameter import org.openrndr.extra.parameters.Description import org.openrndr.extra.parameters.DoubleParameter import org.openrndr.extra.shaderphrases.preprocess -import org.openrndr.extras.color.phrases.ColorPhraseBook -import org.openrndr.extras.color.presets.CORAL -import org.openrndr.extras.color.presets.NAVY +import org.openrndr.extra.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.presets.CORAL +import org.openrndr.extra.color.presets.NAVY @Description("Duotone Gradient") class DuotoneGradient : Filter(filterShaderFromCode(run { diff --git a/orx-fx/src/commonMain/kotlin/color/Posterize.kt b/orx-fx/src/commonMain/kotlin/color/Posterize.kt index 6e0241f2..9e4cef88 100644 --- a/orx-fx/src/commonMain/kotlin/color/Posterize.kt +++ b/orx-fx/src/commonMain/kotlin/color/Posterize.kt @@ -11,10 +11,10 @@ import org.openrndr.extra.parameters.ColorParameter import org.openrndr.extra.parameters.Description import org.openrndr.extra.parameters.IntParameter import org.openrndr.extra.shaderphrases.preprocess -import org.openrndr.extras.color.phrases.ColorPhraseBook -import org.openrndr.extras.color.presets.CORAL -import org.openrndr.extras.color.presets.DARK_GRAY -import org.openrndr.extras.color.presets.NAVY +import org.openrndr.extra.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.presets.CORAL +import org.openrndr.extra.color.presets.DARK_GRAY +import org.openrndr.extra.color.presets.NAVY @Description("Posterize") class Posterize : Filter(filterShaderFromCode(fx_posterize, "posterize")) { diff --git a/orx-image-fit/src/commonMain/kotlin/ImageFit.kt b/orx-image-fit/src/commonMain/kotlin/ImageFit.kt index 414cfbf3..4ce287b5 100644 --- a/orx-image-fit/src/commonMain/kotlin/ImageFit.kt +++ b/orx-image-fit/src/commonMain/kotlin/ImageFit.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.imageFit +package org.openrndr.extra.imageFit import org.openrndr.draw.ColorBuffer import org.openrndr.draw.Drawer diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt index a5094f2c..cb878d7a 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector3 import org.openrndr.math.mod_ import org.openrndr.math.transforms.transform diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt index 7830034d..65038b2a 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt @@ -4,9 +4,9 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.dnk3.dsl.* import org.openrndr.extra.dnk3.renderers.dryRenderer import org.openrndr.extra.dnk3.tools.addSkybox -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.boxMesh -import org.openrndr.extras.meshgenerators.groundPlaneMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.boxMesh +import org.openrndr.extra.meshgenerators.groundPlaneMesh import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL02.kt index 82fc9e55..3b1cedd7 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL02.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL02.kt @@ -5,8 +5,8 @@ import org.openrndr.extra.dnk3.dsl.* import org.openrndr.extra.dnk3.renderers.dryRenderer import org.openrndr.extra.dnk3.tools.addSkybox import org.openrndr.extra.noise.simplex -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.groundPlaneMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.groundPlaneMesh import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform import org.openrndr.shape.path3D diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt index 497df321..20ef33ea 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt @@ -15,8 +15,8 @@ import org.openrndr.extra.dnk3.post.ScreenspaceReflections import org.openrndr.extra.dnk3.post.VolumetricIrradiance import org.openrndr.extra.dnk3.renderers.postRenderer import org.openrndr.extra.shaderphrases.annotations.ShaderPhrases -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.ffmpeg.ScreenRecorder import org.openrndr.filter.color.Delinearize import org.openrndr.math.Matrix44 diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt index 420b7ebe..96462791 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.* import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt index c2e82d9f..696668d7 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.* import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt index b274a94e..b2e20476 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.* import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt index a757e4fe..69d20213 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt @@ -3,7 +3,7 @@ import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.shadeStyle import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.dnk3.gltf.loadGltfFromFile -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector3 import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt index e5ccaac1..0cd92792 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene02.kt index dc290ece..128f67ca 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene02.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene02.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt index b3fffdd1..bc1e0f63 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt @@ -5,8 +5,8 @@ import org.openrndr.extensions.SingleScreenshot import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt index 00dcbc65..6a7c4441 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.segmentContourRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector3 import org.openrndr.math.mod_ import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt index 79c35163..5c77f14e 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt @@ -5,7 +5,7 @@ import org.openrndr.extra.dnk3.* import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.dryRenderer -import org.openrndr.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector3 import org.openrndr.math.mod_ import java.io.File diff --git a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt index 96f82092..170c0bc0 100644 --- a/orx-jvm/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt +++ b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt @@ -8,8 +8,8 @@ import org.openrndr.extra.dnk3.features.addVoxelConeTracing import org.openrndr.extra.dnk3.gltf.buildSceneNodes import org.openrndr.extra.dnk3.gltf.loadGltfFromFile import org.openrndr.extra.dnk3.renderers.postRenderer -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.sphereMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.sphereMesh import org.openrndr.filter.color.Delinearize import org.openrndr.math.Spherical import org.openrndr.math.Vector3 diff --git a/orx-jvm/orx-dnk3/src/main/kotlin/tools/Skybox.kt b/orx-jvm/orx-dnk3/src/main/kotlin/tools/Skybox.kt index ef587563..43bb2abd 100644 --- a/orx-jvm/orx-dnk3/src/main/kotlin/tools/Skybox.kt +++ b/orx-jvm/orx-dnk3/src/main/kotlin/tools/Skybox.kt @@ -2,7 +2,7 @@ package org.openrndr.extra.dnk3.tools import org.openrndr.draw.* import org.openrndr.extra.dnk3.* -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.meshgenerators.boxMesh data class SkyboxMaterial(val cubemap: Cubemap, val intensity: Double = 0.0) : Material { diff --git a/orx-jvm/orx-file-watcher/src/main/kotlin/FileWatcher.kt b/orx-jvm/orx-file-watcher/src/main/kotlin/FileWatcher.kt index 3876195f..8e99e8b4 100644 --- a/orx-jvm/orx-file-watcher/src/main/kotlin/FileWatcher.kt +++ b/orx-jvm/orx-file-watcher/src/main/kotlin/FileWatcher.kt @@ -1,4 +1,4 @@ -package org.operndr.extras.filewatcher +package org.openrndr.extra.filewatcher import com.sun.nio.file.SensitivityWatchEventModifier import kotlinx.coroutines.* diff --git a/orx-jvm/orx-keyframer/src/main/kotlin/Key.kt b/orx-jvm/orx-keyframer/src/main/kotlin/Key.kt index 08c19285..268b0938 100644 --- a/orx-jvm/orx-keyframer/src/main/kotlin/Key.kt +++ b/orx-jvm/orx-keyframer/src/main/kotlin/Key.kt @@ -1,7 +1,7 @@ package org.openrndr.extra.keyframer -import org.openrndr.extras.easing.Easing -import org.openrndr.extras.easing.EasingFunction +import org.openrndr.extra.easing.Easing +import org.openrndr.extra.easing.EasingFunction import org.openrndr.math.map internal val defaultEnvelope = doubleArrayOf(0.0, 1.0) diff --git a/orx-jvm/orx-keyframer/src/main/kotlin/KeyQuaternion.kt b/orx-jvm/orx-keyframer/src/main/kotlin/KeyQuaternion.kt index 24abc0c2..532994af 100644 --- a/orx-jvm/orx-keyframer/src/main/kotlin/KeyQuaternion.kt +++ b/orx-jvm/orx-keyframer/src/main/kotlin/KeyQuaternion.kt @@ -1,7 +1,7 @@ package org.openrndr.extra.keyframer -import org.openrndr.extras.easing.Easing -import org.openrndr.extras.easing.EasingFunction +import org.openrndr.extra.easing.Easing +import org.openrndr.extra.easing.EasingFunction import org.openrndr.math.Quaternion import org.openrndr.math.slerp diff --git a/orx-jvm/orx-keyframer/src/main/kotlin/KeyVector3.kt b/orx-jvm/orx-keyframer/src/main/kotlin/KeyVector3.kt index f4d192e1..64d53dc3 100644 --- a/orx-jvm/orx-keyframer/src/main/kotlin/KeyVector3.kt +++ b/orx-jvm/orx-keyframer/src/main/kotlin/KeyVector3.kt @@ -1,7 +1,7 @@ package org.openrndr.extra.keyframer -import org.openrndr.extras.easing.Easing -import org.openrndr.extras.easing.EasingFunction +import org.openrndr.extra.easing.Easing +import org.openrndr.extra.easing.EasingFunction import org.openrndr.math.Vector3 class KeyVector3(val time: Double, val value: Vector3, val easing: EasingFunction) diff --git a/orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt b/orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt index 110af689..1a71d5da 100644 --- a/orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt +++ b/orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt @@ -4,8 +4,8 @@ import com.google.gson.Gson import com.google.gson.JsonSyntaxException import com.google.gson.reflect.TypeToken import org.openrndr.color.ColorRGBa -import org.openrndr.extras.easing.Easing -import org.openrndr.extras.easing.EasingFunction +import org.openrndr.extra.easing.Easing +import org.openrndr.extra.easing.EasingFunction import org.openrndr.math.Vector2 import org.openrndr.math.Vector3 import org.openrndr.math.Vector4 diff --git a/orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt b/orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt index 9f505c18..29680a48 100644 --- a/orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt +++ b/orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt @@ -1,7 +1,7 @@ import org.amshove.kluent.`should be` import org.amshove.kluent.shouldBeNear import org.openrndr.extra.keyframer.KeyframerChannel -import org.openrndr.extras.easing.Easing +import org.openrndr.extra.easing.Easing import kotlin.test.Test diff --git a/orx-jvm/orx-olive/src/main/kotlin/Olive.kt b/orx-jvm/orx-olive/src/main/kotlin/Olive.kt index b67bc23a..32c1a7f6 100644 --- a/orx-jvm/orx-olive/src/main/kotlin/Olive.kt +++ b/orx-jvm/orx-olive/src/main/kotlin/Olive.kt @@ -11,9 +11,9 @@ import org.openrndr.events.Event import org.openrndr.exceptions.stackRootClassName import org.openrndr.extra.kotlinparser.extractProgram import org.openrndr.launch -import org.operndr.extras.filewatcher.stop -import org.operndr.extras.filewatcher.triggerChange -import org.operndr.extras.filewatcher.watchFile +import org.openrndr.extra.filewatcher.stop +import org.openrndr.extra.filewatcher.triggerChange +import org.openrndr.extra.filewatcher.watchFile import java.io.File private val logger = KotlinLogging.logger {} diff --git a/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt b/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt index 7752cfe6..f6a40d2b 100644 --- a/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt +++ b/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt @@ -14,8 +14,8 @@ import org.openrndr.extra.fx.blend.Darken import org.openrndr.extra.parameters.Parameter import org.openrndr.extra.parameters.ParameterType import org.openrndr.extra.parameters.listParameters -import org.openrndr.extras.imageFit.FitMethod -import org.openrndr.extras.imageFit.imageFit +import org.openrndr.extra.imageFit.FitMethod +import org.openrndr.extra.imageFit.imageFit import org.openrndr.math.Vector2 import org.openrndr.math.Vector3 import org.openrndr.math.Vector4 diff --git a/orx-mesh-generators/src/demo/kotlin/DemoBox.kt b/orx-mesh-generators/src/demo/kotlin/DemoBox.kt index 5e14934b..f21fcdf1 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoBox.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoBox.kt @@ -4,8 +4,8 @@ import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.colorBuffer import org.openrndr.draw.shadeStyle import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.boxMesh +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.boxMesh import org.openrndr.math.Vector3 fun main() { diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt index 522dd2ac..c07dc52b 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex01.kt @@ -2,11 +2,11 @@ import org.openrndr.application import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.shadeStyle import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.box -import org.openrndr.extras.meshgenerators.group -import org.openrndr.extras.meshgenerators.meshGenerator -import org.openrndr.extras.meshgenerators.sphere +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.box +import org.openrndr.extra.meshgenerators.group +import org.openrndr.extra.meshgenerators.meshGenerator +import org.openrndr.extra.meshgenerators.sphere import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt index 286a3aed..c0045300 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex02.kt @@ -2,8 +2,8 @@ import org.openrndr.application import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.shadeStyle import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.* +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.* import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt index 3cb5190a..8a880206 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex03.kt @@ -2,8 +2,8 @@ import org.openrndr.application import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.shadeStyle import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.* +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.* import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt index 1fd58968..7f7ff205 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex04.kt @@ -2,8 +2,8 @@ import org.openrndr.application import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.shadeStyle import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.* +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.* import org.openrndr.math.Vector2 import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform diff --git a/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt b/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt index 12ac9336..c5cf386e 100644 --- a/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt +++ b/orx-mesh-generators/src/demo/kotlin/DemoComplex05.kt @@ -2,8 +2,8 @@ import org.openrndr.application import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.shadeStyle import org.openrndr.extensions.SingleScreenshot -import org.openrndr.extras.camera.Orbital -import org.openrndr.extras.meshgenerators.* +import org.openrndr.extra.camera.Orbital +import org.openrndr.extra.meshgenerators.* import org.openrndr.math.Vector2 import org.openrndr.math.Vector3 import org.openrndr.math.transforms.transform diff --git a/orx-mesh-generators/src/main/kotlin/Box.kt b/orx-mesh-generators/src/main/kotlin/Box.kt index 7be33aef..a159f455 100644 --- a/orx-mesh-generators/src/main/kotlin/Box.kt +++ b/orx-mesh-generators/src/main/kotlin/Box.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.draw.VertexBuffer import org.openrndr.math.Vector3 diff --git a/orx-mesh-generators/src/main/kotlin/Cap.kt b/orx-mesh-generators/src/main/kotlin/Cap.kt index 7e9a37de..dee48f2f 100644 --- a/orx-mesh-generators/src/main/kotlin/Cap.kt +++ b/orx-mesh-generators/src/main/kotlin/Cap.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.math.Matrix44 import org.openrndr.math.Vector2 diff --git a/orx-mesh-generators/src/main/kotlin/Cylinder.kt b/orx-mesh-generators/src/main/kotlin/Cylinder.kt index cdc3d081..b6078f97 100644 --- a/orx-mesh-generators/src/main/kotlin/Cylinder.kt +++ b/orx-mesh-generators/src/main/kotlin/Cylinder.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.draw.VertexBuffer import org.openrndr.math.Matrix44 diff --git a/orx-mesh-generators/src/main/kotlin/Dodecahedron.kt b/orx-mesh-generators/src/main/kotlin/Dodecahedron.kt index c86f3768..f7b64201 100644 --- a/orx-mesh-generators/src/main/kotlin/Dodecahedron.kt +++ b/orx-mesh-generators/src/main/kotlin/Dodecahedron.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.draw.VertexBuffer import org.openrndr.math.Vector2 diff --git a/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt b/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt index aa8b98ce..b213e8d8 100644 --- a/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt +++ b/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.draw.VertexBuffer import org.openrndr.math.Matrix44 diff --git a/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt b/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt index 192f548f..fb7478a9 100644 --- a/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt +++ b/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.draw.BufferWriter import org.openrndr.draw.VertexBuffer diff --git a/orx-mesh-generators/src/main/kotlin/Plane.kt b/orx-mesh-generators/src/main/kotlin/Plane.kt index 8ad555c6..36992009 100644 --- a/orx-mesh-generators/src/main/kotlin/Plane.kt +++ b/orx-mesh-generators/src/main/kotlin/Plane.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.draw.VertexBuffer import org.openrndr.math.Vector2 diff --git a/orx-mesh-generators/src/main/kotlin/Sphere.kt b/orx-mesh-generators/src/main/kotlin/Sphere.kt index de74a4da..b8799450 100644 --- a/orx-mesh-generators/src/main/kotlin/Sphere.kt +++ b/orx-mesh-generators/src/main/kotlin/Sphere.kt @@ -1,4 +1,4 @@ -package org.openrndr.extras.meshgenerators +package org.openrndr.extra.meshgenerators import org.openrndr.draw.VertexBuffer import org.openrndr.math.Spherical diff --git a/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt b/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt index 575741c1..ea176022 100644 --- a/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/LinearGradient.kt @@ -6,7 +6,7 @@ import org.openrndr.extra.parameters.ColorParameter import org.openrndr.extra.parameters.Description import org.openrndr.extra.parameters.DoubleParameter import org.openrndr.extra.shaderphrases.preprocess -import org.openrndr.extras.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.phrases.ColorPhraseBook import org.openrndr.extra.color.spaces.ColorOKLABa import org.openrndr.math.CastableToVector4 import org.openrndr.math.Vector2 diff --git a/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt b/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt index 1ab26e34..7422c7fb 100644 --- a/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/NPointLinearGradient.kt @@ -6,7 +6,7 @@ import org.openrndr.color.ConvertibleToColorRGBa import org.openrndr.draw.ShadeStyle import org.openrndr.extra.parameters.Description import org.openrndr.extra.shaderphrases.preprocess -import org.openrndr.extras.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.phrases.ColorPhraseBook import org.openrndr.extra.color.spaces.ColorOKLABa import org.openrndr.math.CastableToVector4 import org.openrndr.math.Vector2 diff --git a/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt b/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt index eac047c3..ff041340 100644 --- a/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt +++ b/orx-shade-styles/src/commonMain/kotlin/RadialGradient.kt @@ -7,7 +7,7 @@ import org.openrndr.extra.parameters.ColorParameter import org.openrndr.extra.parameters.Description import org.openrndr.extra.parameters.DoubleParameter import org.openrndr.extra.shaderphrases.preprocess -import org.openrndr.extras.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.phrases.ColorPhraseBook import org.openrndr.extra.color.spaces.ColorOKLABa import org.openrndr.math.CastableToVector4 import org.openrndr.math.Vector2 diff --git a/orx-shapes/src/commonMain/kotlin/drawers/BezierPatchDrawer.kt b/orx-shapes/src/commonMain/kotlin/drawers/BezierPatchDrawer.kt index 5b1179e8..d3463711 100644 --- a/orx-shapes/src/commonMain/kotlin/drawers/BezierPatchDrawer.kt +++ b/orx-shapes/src/commonMain/kotlin/drawers/BezierPatchDrawer.kt @@ -12,7 +12,7 @@ import org.openrndr.draw.ShadeStyleGLSL.Companion.fragmentMainConstants import org.openrndr.draw.ShadeStyleGLSL.Companion.vertexMainConstants import org.openrndr.extra.shaderphrases.preprocess import org.openrndr.extra.shapes.phrases.BezierPhraseBook -import org.openrndr.extras.color.phrases.ColorPhraseBook +import org.openrndr.extra.color.phrases.ColorPhraseBook import org.openrndr.extra.color.spaces.ColorOKLABa import org.openrndr.math.Vector4 import kotlin.jvm.JvmName diff --git a/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt b/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt index 19bba926..95e837e7 100644 --- a/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt +++ b/orx-shapes/src/demo/kotlin/DemoBezierPatch05.kt @@ -5,7 +5,7 @@ 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.extras.camera.Orbital +import org.openrndr.extra.camera.Orbital import org.openrndr.math.Vector3 import org.openrndr.shape.Segment3D