Merge branch 'master' into feature/wasm-support

Author: edwinRNDR

.github/workflows/generate-screenshots.yml

@@ -43,13 +43,13 @@ jobs:
         run: ./gradlew publishToMavenLocal snapshot
 
       - name: Build ORX
-        run: ./gradlew build
+        run: ./gradlew build -Popenrndr.application.backend=application-glfw
 
       - name: Collect screenshots
-        run: xvfb-run ./gradlew collectScreenshots
+        run: xvfb-run ./gradlew collectScreenshots -Popenrndr.application.backend=application-glfw
 
       - name: Build main readme
-        run: xvfb-run ./gradlew buildMainReadme
+        run: xvfb-run ./gradlew buildMainReadme -Popenrndr.application.backend=application-glfw
 
       - name: Prepare media branch
         run: |

README.md

@@ -7,6 +7,8 @@ A growing library of assorted data structures, algorithms and utilities to
 complement [OPENRNDR](https://github.com/openrndr/openrndr). 
 Multiplatform, unless they deal with hardware or depend on binary libraries. Those are JVM-only.
 
+Find an auto-generated API documentation page at https://orx.openrndr.org/.
+
 ## Usage
 
 To make use of these extensions clone the [OPENRNDR template](https://github.com/openrndr/openrndr-template), uncomment the ones you need in its [build.gradle.kts](https://github.com/openrndr/openrndr-template/blob/master/build.gradle.kts) file, and reload Gradle. Cloning this repo is optional but useful to run the demos in each ORX folder, to study the source code, and to contribute to existing or new ORX'es.
@@ -29,6 +31,7 @@ To make use of these extensions clone the [OPENRNDR template](https://github.com
 | [`orx-fcurve`](orx-fcurve/) | FCurves are 1 dimensional function curves constructed from 2D bezier functions. They are often used to control a property over time.  `x` values don't have any units, but they often represent a duration in seconds. |
 | [`orx-fft`](orx-fft/) | Simple forward and inverse FFT routine |
 | [`orx-fx`](orx-fx/) | Ready-to-use GPU-based visual effects or filters. Most include [orx-parameters](https://github.com/openrndr/orx/tree/master/orx-parameters) annotations  so they can be easily controlled via orx-gui. |
+| [`orx-g-code`](orx-g-code/) | Utilities for generating g-code for CNC Machines such as pen plotters, laser engravers, 3D printers, and more. |
 | [`orx-gradient-descent`](orx-gradient-descent/) | Finds equation inputs that output a minimum value: easy to use gradient descent based minimizer. |
 | [`orx-hash-grid`](orx-hash-grid/) | 2D space partitioning for fast point queries. |
 | [`orx-image-fit`](orx-image-fit/) | Draws an image ensuring it fits or covers the specified `Rectangle`. |
@@ -51,7 +54,7 @@ To make use of these extensions clone the [OPENRNDR template](https://github.com
 | [`orx-shader-phrases`](orx-shader-phrases/) | A library that provides a `#pragma import` statement for shaders. |
 | [`orx-shapes`](orx-shapes/) | Collection of 2D shape generators and modifiers. |
 | [`orx-svg`](orx-svg/) | SVG reader and writer library. |
-| [`orx-temporal-blur`](orx-temporal-blur/) | Post-processing temporal-blur video effect. CPU intense, therefore not intended  for use with the `ScreenRecorder` extension or other real-time uses. |
+| [`orx-temporal-blur`](orx-temporal-blur/) | Post-processing temporal-blur video effect. CPU intense, not intended for real-time uses. |
 | [`orx-text-on-contour`](orx-text-on-contour/) | Writing texts on contours. |
 | [`orx-text-writer`](orx-text-writer/) | Writing texts with layouts |
 | [`orx-time-operators`](orx-time-operators/) | A collection of time-sensitive functions aimed at controlling raw data over-time,  such as Envelope and LFO. |

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/CollectScreenShots.kt

@@ -132,7 +132,7 @@ abstract class CollectScreenshotsTask @Inject constructor() : DefaultTask() {
                     val codeLines = ktFile.readLines()
                     val main = codeLines.indexOfFirst { it.startsWith("fun main") }
                     val head = codeLines.take(main)
-                    val start = head.indexOfLast { it.startsWith("/**") }
+                    val start = head.indexOfLast { it.startsWith("/*") }
                     val end = head.indexOfLast { it.endsWith("*/") }
 
                     if ((start < end) && (end < main)) {

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts

@@ -45,6 +45,7 @@ val demo: SourceSet by project.sourceSets.creating {
         "orx-runway",
         "orx-syphon",
         "orx-video-profiles",
+        "orx-crash-handler"
     )
     if (project.name !in skipDemos) {
         collectScreenshots(project, this@creating) { }
@@ -60,7 +61,11 @@ dependencies {
     "demoImplementation"(openrndr.findLibrary("application-core").get())
     "demoImplementation"(openrndr.findLibrary("orextensions").get())
 
-    "demoRuntimeOnly"(openrndr.findLibrary("application-glfw").get())
+    if (findProperty("openrndr.application.backend") == null) {
+        "demoRuntimeOnly"(openrndr.findLibrary("application-sdl").get())
+    } else {
+        "demoRuntimeOnly"(openrndr.findLibrary(findProperty("openrndr.application.backend") as String).get())
+    }
 
     "demoRuntimeOnly"(sharedLibs.findLibrary("slf4j-simple").get())
 }

build-logic/orx-convention/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts

@@ -64,10 +64,11 @@ kotlin {
                     outputDir.set(project.file(project.projectDir.toString() + "/images"))
                     dependsOn(compileTaskProvider)
                 }
-                dependencies {
-                        runtimeOnly(openrndr.findLibrary("application-glfw").get())
 
-                }
+//                dependencies {
+//                        runtimeOnly(openrndr.findLibrary("application-glfw").get())
+//
+//                }
             }
         }
         testRuns["test"].executionTask {
@@ -117,7 +118,14 @@ kotlin {
             dependencies {
                 implementation(openrndr.findLibrary("application-core").get())
                 implementation(openrndr.findLibrary("orextensions").get())
-                runtimeOnly(openrndr.findLibrary("application-glfw").get())
+
+                if (findProperty("openrndr.application.backend") == null) {
+                    runtimeOnly(openrndr.findLibrary("application-sdl").get())
+                } else {
+                    runtimeOnly(openrndr.findLibrary(findProperty("openrndr.application.backend") as String).get())
+                }
+
+                runtimeOnly(openrndr.findLibrary("application-sdl").get())
                 runtimeOnly(sharedLibs.findLibrary("slf4j-simple").get())
             }
         }

gradle/libs.versions.toml

@@ -1,30 +1,33 @@
 [versions]
-kotlinApi = "2.2"
-kotlinLanguage = "2.2"
-kotlin = "2.2.20"
+kotlinApi = "2.3"
+kotlinLanguage = "2.3"
+kotlin = "2.3.10"
 jvmTarget = "17"
 openrndr = { require = "[0.5,0.6.0)" }
-dokka = "2.0.0"
+kotest = "6.1.0"
+dokka = "2.1.0"
 nebulaRelease = "18.0.7"
-boofcv = "1.2.3"
+boofcv = "1.3.0"
 libfreenect = "0.5.7-1.5.9"
 librealsense = "2.53.1-1.5.9"
-gson = "2.13.1"
+gson = "2.13.2"
 antlr = "4.13.2"
-antlrKotlin = "1.0.3"
+antlrKotlin = "1.0.9"
 minim = "2.2.2"
-netty = "4.2.4.Final"
+netty = "4.2.9.Final"
 rabbitcontrol = "0.3.39"
-zxing = "3.5.3"
-ktor = "3.2.3"
+zxing = "3.5.4"
+ktor = "3.4.0"
 jgit = "7.3.0.202506031305-r"
 javaosc = "0.9"
-jsoup = "1.21.1"
-mockk = "1.13.11"
-processing = "4.4.6"
-nmcp = "1.1.0"
+jsoup = "1.22.1"
+mockk = "1.14.9"
+processing = "4.5.2"
+nmcp = "1.2.0"
+okhttp = "5.3.2"
 
 [libraries]
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 kotlin-scriptingJvm = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jvm", version.ref = "kotlin" }
@@ -59,4 +62,4 @@ jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 nebula-release = { id = "nebula.release", version.ref = "nebulaRelease" }
 antlr-kotlin = { id = "com.strumenta.antlr-kotlin", version.ref = "antlrKotlin" }
-nmcp = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }
+nmcp = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME