From a768a40a520cacc0fa37599d02f0df2ad16f1483 Mon Sep 17 00:00:00 2001 From: Abe Pazos Date: Thu, 4 Apr 2024 18:45:21 +0200 Subject: [PATCH] Update examples --- build.gradle.kts | 10 ++++++++-- gradle/libs.versions.toml | 16 +++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 +++++++++---------- .../40_Interaction/C140_UserInterfaces003.kt | 2 +- 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f8c9e88..25328e7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,14 +14,17 @@ val orxFeatures = setOf( "orx-camera", // "orx-chataigne", "orx-color", +// "orx-composition", "orx-compositor", // "orx-compute-graph", // "orx-compute-graph-nodes", "orx-delegate-magic", // "orx-dnk3", // "orx-easing", -// "orx-expression-evaluator", "orx-envelopes", +// "orx-expression-evaluator", +// "orx-fcurve", +// "orx-fft", // "orx-file-watcher", "orx-fx", // "orx-git-archiver", @@ -49,6 +52,7 @@ val orxFeatures = setOf( "orx-panel", // "orx-parameters", "orx-poisson-fill", +// "orx-property-watchers", // "orx-quadtree", // "orx-rabbit-control", // "orx-realsense2", @@ -56,9 +60,11 @@ val orxFeatures = setOf( "orx-shade-styles", // "orx-shader-phrases", "orx-shapes", +// "orx-svg", // "orx-syphon", // "orx-temporal-blur", // "orx-tensorflow", +// "orx-text-writer", // "orx-time-operators", // "orx-timer", // "orx-triangulation", @@ -333,7 +339,7 @@ if (properties["openrndr.tasks"] == "true") { "Code" to "file:*.kt||file:*.frag||file:*.vert||file:*.glsl", "Text" to "file:*.txt||file:*.md||file:*.xml||file:*.json", "Gradle" to "file[*buildSrc*]:*/||file:*gradle.*||file:*.gradle||file:*/gradle-wrapper.properties||file:*.toml", - "Media" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr||file:*.mp3||file:*.wav||file:*.mp4||file:*.mov" + "Media" to "file:*.png||file:*.jpg||file:*.dds||file:*.exr||file:*.mp3||file:*.wav||file:*.mp4||file:*.mov||file:*.svg" ) files.forEach { (name, pattern) -> val file = File(scopesFolder, "__$name.xml") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2a1dd90..8aa57d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kotlin = "1.9.22" +kotlin = "1.9.23" openrndr = "0.4.4" orx = "0.4.4" orml = "0.4.1" -slf4j = "2.0.11" -log4j = "2.22.1" -jackson = "2.16.1" +slf4j = "2.0.12" +log4j = "2.23.1" +jackson = "2.17.0" [libraries] kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" } @@ -19,8 +19,8 @@ log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version. jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" } jackson-json = { group = "com.fasterxml.jackson.dataformat", name = "jackson-dataformat-yaml", version.ref = "jackson" } -kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" } -kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.2" } +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.8.0" } +kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.3" } junit = { group = "junit", name = "junit", version = "4.13.2" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.1" } gson = { group = "com.google.code.gson", name = "gson", version = "2.10.1" } @@ -29,7 +29,7 @@ csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version = "1. [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } -runtime = { id = "org.beryx.runtime", version = "1.13.0" } +runtime = { id = "org.beryx.runtime", version = "1.13.1" } gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" } -versions = { id = "com.github.ben-manes.versions", version = "0.50.0" } +versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/src/main/kotlin/examples/40_Interaction/C140_UserInterfaces003.kt b/src/main/kotlin/examples/40_Interaction/C140_UserInterfaces003.kt index 95d5765..33aa146 100644 --- a/src/main/kotlin/examples/40_Interaction/C140_UserInterfaces003.kt +++ b/src/main/kotlin/examples/40_Interaction/C140_UserInterfaces003.kt @@ -17,8 +17,8 @@ fun main() { layout { slider { label = "Slide me" - value = 0.50 range = Range(0.0, 1.0) + value = 0.50 precision = 2 events.valueChanged.listen { println("the new value is ${it.newValue}")