diff --git a/build.gradle b/build.gradle index 6def7ece..94fe1175 100644 --- a/build.gradle +++ b/build.gradle @@ -12,20 +12,22 @@ buildscript { plugins { // remember to update all the versions here when upgrading kotlin version - id 'org.jetbrains.kotlin.jvm' version '1.5.10' apply false - id 'org.jetbrains.kotlin.multiplatform' version '1.5.10' apply false - id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.10' apply false + id 'org.jetbrains.kotlin.jvm' version '1.5.20' apply false + id 'org.jetbrains.kotlin.multiplatform' version '1.5.20' apply false + id 'org.jetbrains.kotlin.plugin.serialization' version '1.5.20' apply false } def multiplatformModules = [ "orx-noise", - "orx-shader-phrases" + "orx-shader-phrases", + "orx-parameters", + "orx-fx", ] project.ext { kotlinApiVersion = '1.4' kotlinLanguageVersion = '1.4' - kotlinVersion = '1.5.10' + kotlinVersion = '1.5.20' kotlinLoggingVersion = '2.0.8' kotlinxSerializationVersion = '1.1.0' spekVersion = '2.0.15' @@ -44,7 +46,7 @@ ext.isReleaseVersion = !version.endsWith("SNAPSHOT") project.ext { openrndrVersion = openrndrUseSnapshot? "0.5.1-SNAPSHOT" : "0.4.0" jvmTarget = "1.8" - kotlinVersion = "1.5.10" + kotlinVersion = "1.5.20" kotlinApiVersion = "1.4" spekVersion = "2.0.15" libfreenectVersion = "0.5.7-1.5.5" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e5338d37..69a97150 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/openrndr-demos/build.gradle b/openrndr-demos/build.gradle index 1c66ccc0..ee4fa144 100644 --- a/openrndr-demos/build.gradle +++ b/openrndr-demos/build.gradle @@ -13,7 +13,7 @@ dependencies { demoImplementation(project(":orx-camera")) demoImplementation(project(":orx-parameters")) demoImplementation(project(":orx-noise")) - demoImplementation(project(":orx-gui")) + demoImplementation(project(":orx-jvm:orx-gui")) demoImplementation(project(":orx-shader-phrases")) demoImplementation("org.slf4j:slf4j-simple:1.7.30") diff --git a/orx-jumpflood/build.gradle b/orx-jumpflood/build.gradle index 030c97fa..97319052 100644 --- a/orx-jumpflood/build.gradle +++ b/orx-jumpflood/build.gradle @@ -10,8 +10,9 @@ sourceSets { dependencies { implementation project(":orx-fx") + implementation project(":orx-parameters") demoImplementation project(":orx-noise") - demoImplementation project(":orx-gui") + demoImplementation project(":orx-jvm:orx-gui") demoImplementation project(":orx-compositor") demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") diff --git a/orx-dnk3/README.md b/orx-jvm/orx-dnk3/README.md similarity index 100% rename from orx-dnk3/README.md rename to orx-jvm/orx-dnk3/README.md diff --git a/orx-dnk3/build.gradle b/orx-jvm/orx-dnk3/build.gradle similarity index 95% rename from orx-dnk3/build.gradle rename to orx-jvm/orx-dnk3/build.gradle index e5f960b0..4e492f5e 100644 --- a/orx-dnk3/build.gradle +++ b/orx-jvm/orx-dnk3/build.gradle @@ -11,7 +11,7 @@ sourceSets { dependencies { implementation "com.google.code.gson:gson:$gsonVersion" implementation(project(":orx-fx")) - implementation(project(":orx-keyframer")) + implementation(project(":orx-jvm:orx-keyframer")) implementation(project(":orx-easing")) implementation(project(":orx-shader-phrases")) implementation(project(":orx-mesh-generators")) diff --git a/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoAnimations01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoAnimations01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoCamera01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoCamera01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoCamera01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoDSL01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoDSL01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoDSL02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL02.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoDSL02.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoDSL02.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoIrrProbe01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoLights01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoLights01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoLights02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoLights02.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights02.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoLights03.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoLights03.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoLights03.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoObject01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoObject01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoObject01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoScene01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoScene01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoScene02.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene02.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoScene02.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene02.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoScene03.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoScene03.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoScene03.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoSegmentContours01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoSkinning01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoSkinning01.kt diff --git a/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt b/orx-jvm/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt similarity index 100% rename from orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt rename to orx-jvm/orx-dnk3/src/demo/kotlin/DemoVoxelConeTracing01.kt diff --git a/orx-dnk3/src/main/kotlin/Camera.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Camera.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Camera.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Camera.kt diff --git a/orx-dnk3/src/main/kotlin/Entity.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Entity.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Entity.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Entity.kt diff --git a/orx-dnk3/src/main/kotlin/Facet.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Facet.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Facet.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Facet.kt diff --git a/orx-dnk3/src/main/kotlin/Feature.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Feature.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Feature.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Feature.kt diff --git a/orx-dnk3/src/main/kotlin/Light.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Light.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Light.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Light.kt diff --git a/orx-dnk3/src/main/kotlin/Material.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Material.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Material.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Material.kt diff --git a/orx-dnk3/src/main/kotlin/PBRMaterial.kt b/orx-jvm/orx-dnk3/src/main/kotlin/PBRMaterial.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/PBRMaterial.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/PBRMaterial.kt diff --git a/orx-dnk3/src/main/kotlin/Post.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Post.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Post.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Post.kt diff --git a/orx-dnk3/src/main/kotlin/RenderPass.kt b/orx-jvm/orx-dnk3/src/main/kotlin/RenderPass.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/RenderPass.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/RenderPass.kt diff --git a/orx-dnk3/src/main/kotlin/Scene.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Scene.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Scene.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Scene.kt diff --git a/orx-dnk3/src/main/kotlin/SceneRenderer.kt b/orx-jvm/orx-dnk3/src/main/kotlin/SceneRenderer.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/SceneRenderer.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/SceneRenderer.kt diff --git a/orx-dnk3/src/main/kotlin/ShaderUtilities.kt b/orx-jvm/orx-dnk3/src/main/kotlin/ShaderUtilities.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/ShaderUtilities.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/ShaderUtilities.kt diff --git a/orx-dnk3/src/main/kotlin/Shadows.kt b/orx-jvm/orx-dnk3/src/main/kotlin/Shadows.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/Shadows.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/Shadows.kt diff --git a/orx-dnk3/src/main/kotlin/cubemap/CubemapFilter.kt b/orx-jvm/orx-dnk3/src/main/kotlin/cubemap/CubemapFilter.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/cubemap/CubemapFilter.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/cubemap/CubemapFilter.kt diff --git a/orx-dnk3/src/main/kotlin/cubemap/CubemapPassthrough.kt b/orx-jvm/orx-dnk3/src/main/kotlin/cubemap/CubemapPassthrough.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/cubemap/CubemapPassthrough.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/cubemap/CubemapPassthrough.kt diff --git a/orx-dnk3/src/main/kotlin/cubemap/IrradianceConvolution.kt b/orx-jvm/orx-dnk3/src/main/kotlin/cubemap/IrradianceConvolution.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/cubemap/IrradianceConvolution.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/cubemap/IrradianceConvolution.kt diff --git a/orx-dnk3/src/main/kotlin/cubemap/SphericalHarmonics.kt b/orx-jvm/orx-dnk3/src/main/kotlin/cubemap/SphericalHarmonics.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/cubemap/SphericalHarmonics.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/cubemap/SphericalHarmonics.kt diff --git a/orx-dnk3/src/main/kotlin/dsl/PBRMaterialBuilder.kt b/orx-jvm/orx-dnk3/src/main/kotlin/dsl/PBRMaterialBuilder.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/dsl/PBRMaterialBuilder.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/dsl/PBRMaterialBuilder.kt diff --git a/orx-dnk3/src/main/kotlin/dsl/SceneBuilder.kt b/orx-jvm/orx-dnk3/src/main/kotlin/dsl/SceneBuilder.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/dsl/SceneBuilder.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/dsl/SceneBuilder.kt diff --git a/orx-dnk3/src/main/kotlin/features/IrradianceSH.kt b/orx-jvm/orx-dnk3/src/main/kotlin/features/IrradianceSH.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/features/IrradianceSH.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/features/IrradianceSH.kt diff --git a/orx-dnk3/src/main/kotlin/features/VoxelConeTracing.kt b/orx-jvm/orx-dnk3/src/main/kotlin/features/VoxelConeTracing.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/features/VoxelConeTracing.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/features/VoxelConeTracing.kt diff --git a/orx-dnk3/src/main/kotlin/gltf/Glb.kt b/orx-jvm/orx-dnk3/src/main/kotlin/gltf/Glb.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/gltf/Glb.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/gltf/Glb.kt diff --git a/orx-dnk3/src/main/kotlin/gltf/Gltf.kt b/orx-jvm/orx-dnk3/src/main/kotlin/gltf/Gltf.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/gltf/Gltf.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/gltf/Gltf.kt diff --git a/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt b/orx-jvm/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/gltf/GltfScene.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/gltf/GltfScene.kt diff --git a/orx-dnk3/src/main/kotlin/materials/IrradianceDebugMaterial.kt b/orx-jvm/orx-dnk3/src/main/kotlin/materials/IrradianceDebugMaterial.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/materials/IrradianceDebugMaterial.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/materials/IrradianceDebugMaterial.kt diff --git a/orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt b/orx-jvm/orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/post/ScreenspaceReflections.kt diff --git a/orx-dnk3/src/main/kotlin/post/SegmentContours.kt b/orx-jvm/orx-dnk3/src/main/kotlin/post/SegmentContours.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/post/SegmentContours.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/post/SegmentContours.kt diff --git a/orx-dnk3/src/main/kotlin/post/VolumetricIrradiance.kt b/orx-jvm/orx-dnk3/src/main/kotlin/post/VolumetricIrradiance.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/post/VolumetricIrradiance.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/post/VolumetricIrradiance.kt diff --git a/orx-dnk3/src/main/kotlin/query/Query.kt b/orx-jvm/orx-dnk3/src/main/kotlin/query/Query.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/query/Query.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/query/Query.kt diff --git a/orx-dnk3/src/main/kotlin/renderers/DryRenderer.kt b/orx-jvm/orx-dnk3/src/main/kotlin/renderers/DryRenderer.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/renderers/DryRenderer.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/renderers/DryRenderer.kt diff --git a/orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt b/orx-jvm/orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/renderers/PostRenderer.kt diff --git a/orx-dnk3/src/main/kotlin/renderers/SegmentContourRenderer.kt b/orx-jvm/orx-dnk3/src/main/kotlin/renderers/SegmentContourRenderer.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/renderers/SegmentContourRenderer.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/renderers/SegmentContourRenderer.kt diff --git a/orx-dnk3/src/main/kotlin/tools/MeshCollapse.kt b/orx-jvm/orx-dnk3/src/main/kotlin/tools/MeshCollapse.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/tools/MeshCollapse.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/tools/MeshCollapse.kt diff --git a/orx-dnk3/src/main/kotlin/tools/Skybox.kt b/orx-jvm/orx-dnk3/src/main/kotlin/tools/Skybox.kt similarity index 100% rename from orx-dnk3/src/main/kotlin/tools/Skybox.kt rename to orx-jvm/orx-dnk3/src/main/kotlin/tools/Skybox.kt diff --git a/orx-dnk3/src/main/resources/phrases/irradiance-sh/evaluate-sh.frag b/orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/evaluate-sh.frag similarity index 100% rename from orx-dnk3/src/main/resources/phrases/irradiance-sh/evaluate-sh.frag rename to orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/evaluate-sh.frag diff --git a/orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh.frag b/orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh.frag similarity index 100% rename from orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh.frag rename to orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh.frag diff --git a/orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh0.frag b/orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh0.frag similarity index 100% rename from orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh0.frag rename to orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/fetch-sh0.frag diff --git a/orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh.frag b/orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh.frag similarity index 100% rename from orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh.frag rename to orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh.frag diff --git a/orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh0.frag b/orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh0.frag similarity index 100% rename from orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh0.frag rename to orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/gather-sh0.frag diff --git a/orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-coordinates.frag b/orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-coordinates.frag similarity index 100% rename from orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-coordinates.frag rename to orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-coordinates.frag diff --git a/orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-index.frag b/orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-index.frag similarity index 100% rename from orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-index.frag rename to orx-jvm/orx-dnk3/src/main/resources/phrases/irradiance-sh/grid-index.frag diff --git a/orx-dnk3/src/main/resources/shaders/cubemap-filters/cubemap-passthrough.frag b/orx-jvm/orx-dnk3/src/main/resources/shaders/cubemap-filters/cubemap-passthrough.frag similarity index 100% rename from orx-dnk3/src/main/resources/shaders/cubemap-filters/cubemap-passthrough.frag rename to orx-jvm/orx-dnk3/src/main/resources/shaders/cubemap-filters/cubemap-passthrough.frag diff --git a/orx-dnk3/src/main/resources/shaders/cubemap-filters/irradiance-convolution.frag b/orx-jvm/orx-dnk3/src/main/resources/shaders/cubemap-filters/irradiance-convolution.frag similarity index 100% rename from orx-dnk3/src/main/resources/shaders/cubemap-filters/irradiance-convolution.frag rename to orx-jvm/orx-dnk3/src/main/resources/shaders/cubemap-filters/irradiance-convolution.frag diff --git a/orx-dnk3/src/main/resources/shaders/cubemap-filters/spherical-harmonics.frag b/orx-jvm/orx-dnk3/src/main/resources/shaders/cubemap-filters/spherical-harmonics.frag similarity index 100% rename from orx-dnk3/src/main/resources/shaders/cubemap-filters/spherical-harmonics.frag rename to orx-jvm/orx-dnk3/src/main/resources/shaders/cubemap-filters/spherical-harmonics.frag diff --git a/orx-dnk3/src/main/resources/shaders/screenspace-reflections.frag b/orx-jvm/orx-dnk3/src/main/resources/shaders/screenspace-reflections.frag similarity index 100% rename from orx-dnk3/src/main/resources/shaders/screenspace-reflections.frag rename to orx-jvm/orx-dnk3/src/main/resources/shaders/screenspace-reflections.frag diff --git a/orx-dnk3/src/main/resources/shaders/segment-contours-msaa-8.frag b/orx-jvm/orx-dnk3/src/main/resources/shaders/segment-contours-msaa-8.frag similarity index 100% rename from orx-dnk3/src/main/resources/shaders/segment-contours-msaa-8.frag rename to orx-jvm/orx-dnk3/src/main/resources/shaders/segment-contours-msaa-8.frag diff --git a/orx-dnk3/src/main/resources/shaders/segment-contours.frag b/orx-jvm/orx-dnk3/src/main/resources/shaders/segment-contours.frag similarity index 100% rename from orx-dnk3/src/main/resources/shaders/segment-contours.frag rename to orx-jvm/orx-dnk3/src/main/resources/shaders/segment-contours.frag diff --git a/orx-dnk3/src/main/resources/shaders/volumetric-irradiance.frag b/orx-jvm/orx-dnk3/src/main/resources/shaders/volumetric-irradiance.frag similarity index 100% rename from orx-dnk3/src/main/resources/shaders/volumetric-irradiance.frag rename to orx-jvm/orx-dnk3/src/main/resources/shaders/volumetric-irradiance.frag diff --git a/orx-gui/README.md b/orx-jvm/orx-gui/README.md similarity index 100% rename from orx-gui/README.md rename to orx-jvm/orx-gui/README.md diff --git a/orx-gui/build.gradle b/orx-jvm/orx-gui/build.gradle similarity index 95% rename from orx-gui/build.gradle rename to orx-jvm/orx-gui/build.gradle index 6ddce83b..f2381a53 100644 --- a/orx-gui/build.gradle +++ b/orx-jvm/orx-gui/build.gradle @@ -10,7 +10,7 @@ sourceSets { dependencies { api project(":orx-parameters") - api project(":orx-panel") + api project(":orx-jvm:orx-panel") implementation "org.openrndr:openrndr-dialogs:$openrndrVersion" implementation "com.google.code.gson:gson:$gsonVersion" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" diff --git a/orx-gui/src/demo/kotlin/DemoHide01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoHide01.kt similarity index 100% rename from orx-gui/src/demo/kotlin/DemoHide01.kt rename to orx-jvm/orx-gui/src/demo/kotlin/DemoHide01.kt diff --git a/orx-gui/src/demo/kotlin/DemoOptions01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoOptions01.kt similarity index 100% rename from orx-gui/src/demo/kotlin/DemoOptions01.kt rename to orx-jvm/orx-gui/src/demo/kotlin/DemoOptions01.kt diff --git a/orx-gui/src/demo/kotlin/DemoPresets01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoPresets01.kt similarity index 100% rename from orx-gui/src/demo/kotlin/DemoPresets01.kt rename to orx-jvm/orx-gui/src/demo/kotlin/DemoPresets01.kt diff --git a/orx-gui/src/demo/kotlin/DemoSimple01.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoSimple01.kt similarity index 100% rename from orx-gui/src/demo/kotlin/DemoSimple01.kt rename to orx-jvm/orx-gui/src/demo/kotlin/DemoSimple01.kt diff --git a/orx-gui/src/demo/kotlin/DemoXYParameter.kt b/orx-jvm/orx-gui/src/demo/kotlin/DemoXYParameter.kt similarity index 100% rename from orx-gui/src/demo/kotlin/DemoXYParameter.kt rename to orx-jvm/orx-gui/src/demo/kotlin/DemoXYParameter.kt diff --git a/orx-gui/src/main/kotlin/Gui.kt b/orx-jvm/orx-gui/src/main/kotlin/Gui.kt similarity index 100% rename from orx-gui/src/main/kotlin/Gui.kt rename to orx-jvm/orx-gui/src/main/kotlin/Gui.kt diff --git a/orx-keyframer/README.md b/orx-jvm/orx-keyframer/README.md similarity index 100% rename from orx-keyframer/README.md rename to orx-jvm/orx-keyframer/README.md diff --git a/orx-keyframer/build.gradle b/orx-jvm/orx-keyframer/build.gradle similarity index 96% rename from orx-keyframer/build.gradle rename to orx-jvm/orx-keyframer/build.gradle index 067c40a6..00c02bdc 100644 --- a/orx-keyframer/build.gradle +++ b/orx-jvm/orx-keyframer/build.gradle @@ -40,7 +40,7 @@ dependencies { demoImplementation(project(":orx-camera")) - demoImplementation(project(":orx-panel")) + demoImplementation(project(":orx-jvm:orx-panel")) demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") diff --git a/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt similarity index 100% rename from orx-keyframer/src/demo/kotlin/DemoEvelope01.kt rename to orx-jvm/orx-keyframer/src/demo/kotlin/DemoEvelope01.kt diff --git a/orx-keyframer/src/demo/kotlin/DemoFull01.kt b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoFull01.kt similarity index 100% rename from orx-keyframer/src/demo/kotlin/DemoFull01.kt rename to orx-jvm/orx-keyframer/src/demo/kotlin/DemoFull01.kt diff --git a/orx-keyframer/src/demo/kotlin/DemoScrub01.kt b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoScrub01.kt similarity index 100% rename from orx-keyframer/src/demo/kotlin/DemoScrub01.kt rename to orx-jvm/orx-keyframer/src/demo/kotlin/DemoScrub01.kt diff --git a/orx-keyframer/src/demo/kotlin/DemoSimple01.kt b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple01.kt similarity index 100% rename from orx-keyframer/src/demo/kotlin/DemoSimple01.kt rename to orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple01.kt diff --git a/orx-keyframer/src/demo/kotlin/DemoSimple02.kt b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple02.kt similarity index 100% rename from orx-keyframer/src/demo/kotlin/DemoSimple02.kt rename to orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimple02.kt diff --git a/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt b/orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt similarity index 100% rename from orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt rename to orx-jvm/orx-keyframer/src/demo/kotlin/DemoSimpleExpressions01.kt diff --git a/orx-keyframer/src/demo/resources/demo-envelope-01.json b/orx-jvm/orx-keyframer/src/demo/resources/demo-envelope-01.json similarity index 100% rename from orx-keyframer/src/demo/resources/demo-envelope-01.json rename to orx-jvm/orx-keyframer/src/demo/resources/demo-envelope-01.json diff --git a/orx-keyframer/src/demo/resources/demo-full-01.json b/orx-jvm/orx-keyframer/src/demo/resources/demo-full-01.json similarity index 100% rename from orx-keyframer/src/demo/resources/demo-full-01.json rename to orx-jvm/orx-keyframer/src/demo/resources/demo-full-01.json diff --git a/orx-keyframer/src/demo/resources/demo-simple-01.json b/orx-jvm/orx-keyframer/src/demo/resources/demo-simple-01.json similarity index 100% rename from orx-keyframer/src/demo/resources/demo-simple-01.json rename to orx-jvm/orx-keyframer/src/demo/resources/demo-simple-01.json diff --git a/orx-keyframer/src/demo/resources/demo-simple-02.json b/orx-jvm/orx-keyframer/src/demo/resources/demo-simple-02.json similarity index 100% rename from orx-keyframer/src/demo/resources/demo-simple-02.json rename to orx-jvm/orx-keyframer/src/demo/resources/demo-simple-02.json diff --git a/orx-keyframer/src/demo/resources/demo-simple-expressions-01.json b/orx-jvm/orx-keyframer/src/demo/resources/demo-simple-expressions-01.json similarity index 100% rename from orx-keyframer/src/demo/resources/demo-simple-expressions-01.json rename to orx-jvm/orx-keyframer/src/demo/resources/demo-simple-expressions-01.json diff --git a/orx-keyframer/src/main/antlr/KeyLangLexer.g4 b/orx-jvm/orx-keyframer/src/main/antlr/KeyLangLexer.g4 similarity index 100% rename from orx-keyframer/src/main/antlr/KeyLangLexer.g4 rename to orx-jvm/orx-keyframer/src/main/antlr/KeyLangLexer.g4 diff --git a/orx-keyframer/src/main/antlr/KeyLangParser.g4 b/orx-jvm/orx-keyframer/src/main/antlr/KeyLangParser.g4 similarity index 100% rename from orx-keyframer/src/main/antlr/KeyLangParser.g4 rename to orx-jvm/orx-keyframer/src/main/antlr/KeyLangParser.g4 diff --git a/orx-keyframer/src/main/kotlin/Expressions.kt b/orx-jvm/orx-keyframer/src/main/kotlin/Expressions.kt similarity index 100% rename from orx-keyframer/src/main/kotlin/Expressions.kt rename to orx-jvm/orx-keyframer/src/main/kotlin/Expressions.kt diff --git a/orx-keyframer/src/main/kotlin/Key.kt b/orx-jvm/orx-keyframer/src/main/kotlin/Key.kt similarity index 100% rename from orx-keyframer/src/main/kotlin/Key.kt rename to orx-jvm/orx-keyframer/src/main/kotlin/Key.kt diff --git a/orx-keyframer/src/main/kotlin/KeyQuaternion.kt b/orx-jvm/orx-keyframer/src/main/kotlin/KeyQuaternion.kt similarity index 100% rename from orx-keyframer/src/main/kotlin/KeyQuaternion.kt rename to orx-jvm/orx-keyframer/src/main/kotlin/KeyQuaternion.kt diff --git a/orx-keyframer/src/main/kotlin/KeyVector3.kt b/orx-jvm/orx-keyframer/src/main/kotlin/KeyVector3.kt similarity index 100% rename from orx-keyframer/src/main/kotlin/KeyVector3.kt rename to orx-jvm/orx-keyframer/src/main/kotlin/KeyVector3.kt diff --git a/orx-keyframer/src/main/kotlin/Keyframer.kt b/orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt similarity index 100% rename from orx-keyframer/src/main/kotlin/Keyframer.kt rename to orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt diff --git a/orx-keyframer/src/test/kotlin/TestExpressionErrors.kt b/orx-jvm/orx-keyframer/src/test/kotlin/TestExpressionErrors.kt similarity index 100% rename from orx-keyframer/src/test/kotlin/TestExpressionErrors.kt rename to orx-jvm/orx-keyframer/src/test/kotlin/TestExpressionErrors.kt diff --git a/orx-keyframer/src/test/kotlin/TestFunctionCall.kt b/orx-jvm/orx-keyframer/src/test/kotlin/TestFunctionCall.kt similarity index 100% rename from orx-keyframer/src/test/kotlin/TestFunctionCall.kt rename to orx-jvm/orx-keyframer/src/test/kotlin/TestFunctionCall.kt diff --git a/orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt b/orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt similarity index 100% rename from orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt rename to orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerChannel.kt diff --git a/orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt b/orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt similarity index 100% rename from orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt rename to orx-jvm/orx-keyframer/src/test/kotlin/TestKeyframerErrors.kt diff --git a/orx-keyframer/src/test/kotlin/TestOperators.kt b/orx-jvm/orx-keyframer/src/test/kotlin/TestOperators.kt similarity index 100% rename from orx-keyframer/src/test/kotlin/TestOperators.kt rename to orx-jvm/orx-keyframer/src/test/kotlin/TestOperators.kt diff --git a/orx-keyframer/src/test/resources/error-reporting/easing.json b/orx-jvm/orx-keyframer/src/test/resources/error-reporting/easing.json similarity index 100% rename from orx-keyframer/src/test/resources/error-reporting/easing.json rename to orx-jvm/orx-keyframer/src/test/resources/error-reporting/easing.json diff --git a/orx-keyframer/src/test/resources/error-reporting/time-01.json b/orx-jvm/orx-keyframer/src/test/resources/error-reporting/time-01.json similarity index 100% rename from orx-keyframer/src/test/resources/error-reporting/time-01.json rename to orx-jvm/orx-keyframer/src/test/resources/error-reporting/time-01.json diff --git a/orx-keyframer/src/test/resources/error-reporting/time-02.json b/orx-jvm/orx-keyframer/src/test/resources/error-reporting/time-02.json similarity index 100% rename from orx-keyframer/src/test/resources/error-reporting/time-02.json rename to orx-jvm/orx-keyframer/src/test/resources/error-reporting/time-02.json diff --git a/orx-keyframer/src/test/resources/error-reporting/value-01.json b/orx-jvm/orx-keyframer/src/test/resources/error-reporting/value-01.json similarity index 100% rename from orx-keyframer/src/test/resources/error-reporting/value-01.json rename to orx-jvm/orx-keyframer/src/test/resources/error-reporting/value-01.json diff --git a/orx-jvm/orx-kotlin-parser/build.gradle b/orx-jvm/orx-kotlin-parser/build.gradle index fb9dc66a..364466ad 100644 --- a/orx-jvm/orx-kotlin-parser/build.gradle +++ b/orx-jvm/orx-kotlin-parser/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation("org.antlr:antlr4-runtime:$antlrVersion") demoImplementation(project(":orx-camera")) - demoImplementation(project(":orx-panel")) + demoImplementation(project(":orx-jvm:orx-panel")) demoImplementation("org.openrndr:openrndr-application:$openrndrVersion") demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion") demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion") diff --git a/orx-panel/README.md b/orx-jvm/orx-panel/README.md similarity index 100% rename from orx-panel/README.md rename to orx-jvm/orx-panel/README.md diff --git a/orx-panel/build.gradle b/orx-jvm/orx-panel/build.gradle similarity index 100% rename from orx-panel/build.gradle rename to orx-jvm/orx-panel/build.gradle diff --git a/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt b/orx-jvm/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt similarity index 100% rename from orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt rename to orx-jvm/orx-panel/src/demo/kotlin/DemoHorizontalLayout01.kt diff --git a/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt b/orx-jvm/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt similarity index 100% rename from orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt rename to orx-jvm/orx-panel/src/demo/kotlin/DemoVerticalLayout01.kt diff --git a/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt b/orx-jvm/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt similarity index 100% rename from orx-panel/src/demo/kotlin/DemoWatchDiv01.kt rename to orx-jvm/orx-panel/src/demo/kotlin/DemoWatchDiv01.kt diff --git a/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt b/orx-jvm/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt similarity index 100% rename from orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt rename to orx-jvm/orx-panel/src/demo/kotlin/DemoWatchObjectDiv01.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/FontManager.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/FontManager.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/FontManager.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/FontManager.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableCopyOnWriteArrayList.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableCopyOnWriteArrayList.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableCopyOnWriteArrayList.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableCopyOnWriteArrayList.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableHashSet.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableHashSet.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableHashSet.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/collections/ObservableHashSet.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Body.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Body.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Body.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Body.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Button.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Canvas.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Canvas.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Canvas.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Canvas.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Colorpicker.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Colorpicker.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Colorpicker.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Colorpicker.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/ColorpickerButton.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Div.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Div.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Div.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Div.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/DropdownButton.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Element.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeButton.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeEditor.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeEditor.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeEditor.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/EnvelopeEditor.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/LayoutBuilder.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/LayoutBuilder.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/LayoutBuilder.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/LayoutBuilder.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SlidersVector.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/TextElements.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchListDiv.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchListDiv.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchListDiv.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchListDiv.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchObjectDiv.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/WatchPropertyDiv.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/XYPad.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/hash/WatchHash.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/hash/WatchHash.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/hash/WatchHash.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/hash/WatchHash.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/layout/Layouter.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/layout/Layouter.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/layout/Layouter.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/layout/Layouter.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/style/DefaultStyles.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/DefaultStyles.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/style/DefaultStyles.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/DefaultStyles.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/style/Matcher.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/Matcher.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/style/Matcher.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/Matcher.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/style/Selector.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/Selector.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/style/Selector.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/Selector.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/style/StyleSheet.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/StyleSheet.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/style/StyleSheet.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/StyleSheet.kt diff --git a/orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt b/orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt similarity index 100% rename from orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt rename to orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/tools/Tooltip.kt diff --git a/orx-panel/src/main/resources/fonts/Roboto-Medium.ttf b/orx-jvm/orx-panel/src/main/resources/fonts/Roboto-Medium.ttf similarity index 100% rename from orx-panel/src/main/resources/fonts/Roboto-Medium.ttf rename to orx-jvm/orx-panel/src/main/resources/fonts/Roboto-Medium.ttf diff --git a/orx-panel/src/main/resources/fonts/Roboto-Regular.ttf b/orx-jvm/orx-panel/src/main/resources/fonts/Roboto-Regular.ttf similarity index 100% rename from orx-panel/src/main/resources/fonts/Roboto-Regular.ttf rename to orx-jvm/orx-panel/src/main/resources/fonts/Roboto-Regular.ttf diff --git a/orx-panel/src/test/java/org/openrndr/panel/test/SelectorBuilderTest.kt b/orx-jvm/orx-panel/src/test/java/org/openrndr/panel/test/SelectorBuilderTest.kt similarity index 100% rename from orx-panel/src/test/java/org/openrndr/panel/test/SelectorBuilderTest.kt rename to orx-jvm/orx-panel/src/test/java/org/openrndr/panel/test/SelectorBuilderTest.kt diff --git a/orx-panel/src/test/java/org/openrndr/panel/test/StyleSheetTest.kt b/orx-jvm/orx-panel/src/test/java/org/openrndr/panel/test/StyleSheetTest.kt similarity index 100% rename from orx-panel/src/test/java/org/openrndr/panel/test/StyleSheetTest.kt rename to orx-jvm/orx-panel/src/test/java/org/openrndr/panel/test/StyleSheetTest.kt diff --git a/orx-triangulation/README.md b/orx-jvm/orx-triangulation/README.md similarity index 100% rename from orx-triangulation/README.md rename to orx-jvm/orx-triangulation/README.md diff --git a/orx-triangulation/build.gradle b/orx-jvm/orx-triangulation/build.gradle similarity index 100% rename from orx-triangulation/build.gradle rename to orx-jvm/orx-triangulation/build.gradle diff --git a/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt b/orx-jvm/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt similarity index 100% rename from orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt rename to orx-jvm/orx-triangulation/src/demo/kotlin/DemoDelaunay01.kt diff --git a/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt b/orx-jvm/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt similarity index 100% rename from orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt rename to orx-jvm/orx-triangulation/src/demo/kotlin/DemoDelaunay02.kt diff --git a/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt b/orx-jvm/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt similarity index 100% rename from orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt rename to orx-jvm/orx-triangulation/src/demo/kotlin/DemoVoronoi01.kt diff --git a/orx-triangulation/src/main/kotlin/Delaunay.kt b/orx-jvm/orx-triangulation/src/main/kotlin/Delaunay.kt similarity index 100% rename from orx-triangulation/src/main/kotlin/Delaunay.kt rename to orx-jvm/orx-triangulation/src/main/kotlin/Delaunay.kt diff --git a/orx-triangulation/src/main/kotlin/Voronoi.kt b/orx-jvm/orx-triangulation/src/main/kotlin/Voronoi.kt similarity index 100% rename from orx-triangulation/src/main/kotlin/Voronoi.kt rename to orx-jvm/orx-triangulation/src/main/kotlin/Voronoi.kt diff --git a/orx-parameters/build.gradle.kts b/orx-parameters/build.gradle.kts index d22ff0ed..5634d94a 100644 --- a/orx-parameters/build.gradle.kts +++ b/orx-parameters/build.gradle.kts @@ -37,6 +37,7 @@ kotlin { @Suppress("UNUSED_VARIABLE") val commonMain by getting { dependencies { + implementation("org.openrndr:openrndr-application:$openrndrVersion") implementation("org.openrndr:openrndr-math:$openrndrVersion") implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") implementation("io.github.microutils:kotlin-logging:$kotlinLoggingVersion") diff --git a/orx-shader-phrases/build.garble b/orx-shader-phrases/build.garble deleted file mode 100644 index dec2d403..00000000 --- a/orx-shader-phrases/build.garble +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f537e73b..3389728c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ include 'openrndr-demos', 'orx-jvm:orx-chataigne', 'orx-color', 'orx-compositor', - 'orx-dnk3', + 'orx-jvm:orx-dnk3', 'orx-easing', 'orx-jvm:orx-file-watcher', 'orx-parameters', @@ -17,10 +17,10 @@ include 'openrndr-demos', 'orx-integral-image', 'orx-interval-tree', 'orx-jumpflood', - 'orx-gui', + 'orx-jvm:orx-gui', 'orx-image-fit', 'orx-kdtree', - 'orx-keyframer', + 'orx-jvm:orx-keyframer', 'orx-mesh-generators', 'orx-jvm:orx-kotlin-parser', 'orx-jvm:orx-midi', @@ -30,7 +30,7 @@ include 'openrndr-demos', 'orx-olive', 'orx-jvm:orx-osc', 'orx-palette', - 'orx-panel', + 'orx-jvm:orx-panel', 'orx-poisson-fill', 'orx-quadtree', 'orx-jvm:orx-rabbit-control', @@ -55,7 +55,7 @@ include 'openrndr-demos', 'orx-jvm:orx-tensorflow-natives-windows', 'orx-timer', 'orx-time-operators', - 'orx-triangulation', + 'orx-jvm:orx-triangulation', 'orx-jvm:orx-kinect-common', 'orx-jvm:orx-kinect-v1', 'orx-jvm:orx-kinect-v1-natives-linux-arm64',