Added natives for orx-kinect-v1

Bumped OPENRNDR to 0.3.35, orx to 0.3.32, kotlin to 1.3.50
2019-08-28 12:58:20 +02:00 · 2019-08-27 19:38:24 +02:00
28 changed files with 333 additions and 1013 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-*.bat eol=crlf
-
--- a/.github/workflows/build-on-commit.yaml
+++ b/.github/workflows/build-on-commit.yaml
@@ -1,23 +0,0 @@
-name: Build on commit
-on:
-  push:
-    branches:
-      - master
-      - next-version
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-          #cache: 'gradle'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-
-      - name: Build sources
-        run: ./gradlew build
--- a/.github/workflows/build-snapshot-on-commit.yaml
+++ b/.github/workflows/build-snapshot-on-commit.yaml
@@ -1,63 +0,0 @@
-name: Build snapshot on commit
-on:
-  push:
-    branches:
-      - snapshot
-
-defaults:
-  run:
-    working-directory: ./template
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout OPENRNDR repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/openrndr
-          path: ./openrndr
-          ref: master
-
-      - name: Checkout ORX repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/orx
-          path: ./orx
-          ref: master
-
-      - name: Checkout current repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/openrndr-template
-          path: ./template
-          ref: snapshot
-
-      - uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-
-      - name: Set swap space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 8
-
-      - name: Build OPENRNDR
-        working-directory: ./openrndr
-        run: ./gradlew publishToMavenLocal snapshot
-
-      - name: Build ORX
-        working-directory: ./orx
-        run: ./gradlew publishToMavenLocal snapshot
-
-      - name: Build template
-        working-directory: ./template
-        run: ./gradlew build
-
--- a/.github/workflows/publish-binaries.yaml
+++ b/.github/workflows/publish-binaries.yaml
@@ -1,59 +0,0 @@
-name: Publish binaries
-
-on:
-  push:
-    tags:
-      - v1.*
-      - v1.*.*
-
-permissions:
-  contents: write
-
-# Required to make env var work on Windows
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-
-    runs-on: ${{ matrix.os }}          
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v7
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          #cache: 'gradle'
-
-      - name: Build with Gradle
-        run: ./gradlew jpackageZip
-
-      - run: echo "OR_TARGET_NAME=linux-x64" >> $GITHUB_ENV
-        if: matrix.os == 'ubuntu-latest'
-
-      - run: echo "OR_TARGET_NAME=macos" >> $GITHUB_ENV
-        if: matrix.os == 'macos-latest'
-
-      - run: echo "OR_TARGET_NAME=windows" >> $GITHUB_ENV
-        if: matrix.os == 'windows-latest'
-
-      - name: Rename jpackage zip
-        run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-${{env.OR_TARGET_NAME}}.zip
-
-      - name: Create Release
-        uses: ncipollo/release-action@v1.20.0
-        id: create_release
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          allowUpdates: true
-          replacesArtifacts: false
-          body: Fully automated release
-          artifacts: "./build/distributions/openrndr-application-${{env.OR_TARGET_NAME}}.zip"
-
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,3 @@ build
 out
 .idea
 .gradle
-.kotlin
-.lwjgl
-video/
-screenshots/
-gui-parameters/
-ffmpegOutput.txt
-ShaderError.glsl
-
--- a/README.md
+++ b/README.md
@@ -1,73 +1,12 @@
-# OPENRNDR template project
+# openrndr-template
+A feature rich template for creating OPENRNDR programs based on Gradle/Kts

-A feature rich template for creating OPENRNDR programs based on [Gradle/Kts](https://en.wikipedia.org/wiki/Gradle).
+You will find some [basic instructions](https://guide.openrndr.org/#/02_Getting_Started_with_OPENRNDR/C00_SetupYourFirstProgram) in the [OPENRNDR guide](https://guide.openrndr.org)

-The template consists of a configuration for Gradle and two example OPENRNDR programs. The Gradle configuration should serve as the
+The template consists of a configuration for Gradle and an example OPENRNDR program. The Gradle configuration should serve as the
 go-to starting point for writing OPENRNDR-based software.

-If you are looking at this from IntelliJ IDEA you can start by expanding the _project_ tab on the left. You will find a template program in `src/main/kotlin/TemplateProgram.kt` and a live-coding example in `src/main/kotlin/TemplateLiveProgram.kt`.
-
-You will find some [basic instructions](https://guide.openrndr.org/setUpYourFirstProgram.html) in the [OPENRNDR guide](https://guide.openrndr.org).
-
 ## Gradle tasks
-
- - `./gradlew run` runs `TemplateProgram.kt` (Use `gradlew.bat run` under Windows)
- - `./gradlew run -Popenrndr.application=MyProgramKt` runs `src/main/kotlin/myProgram.kt`
- - `./gradlew run -Popenrndr.application=foo.bar.MyProgramKt` runs `src/main/kotlin/foo/bar/myProgram.kt` (assuming `package foo.bar` is used in myProgram.kt)
- - `./gradlew shadowJar` creates an executable platform specific jar file with all dependencies. Run the resulting program by typing `java -jar build/libs/openrndr-template-1.0.0-all.jar` in a terminal from the project root. If your project contains multiple `main` methods, specify which one to run with `java -cp build/libs/openrndr-template-1.0.0-all.jar MyProgramKt`, where `MyProgramKt` can also be `foo.bar.MyProgramKt` if it's in the package `foo.bar`.
- - `./gradlew jpackageZip` creates a zip with a stand-alone executable for the current platform (requires Java 17 or newer). Run it like this: `cd build/jpackage/openrndr-application/ && bin/openrndr-application`.
- - `./gradlew dependencyUpydates` checks whether any dependencies have newer versions.
-
-## Tips and issues
-
-See the [wiki](https://github.com/openrndr/openrndr-template/wiki)
-
-## Cross builds
-
-See the [wiki](https://github.com/openrndr/openrndr-template/wiki)
-
-## Updating OPENRNDR, ORX and other dependencies
-
-The openrndr-template depends on various packages including the core [openrndr](https://github.com/openrndr/openrndr/) and the [orx](https://github.com/openrndr/orx/) extensions and
-provides the optional [orsl](https://github.com/openrndr/orsl/) shader helper modules.
-The version numbers of these dependencies are specified in your [libs.versions.toml](gradle/libs.versions.toml) file. 
-Learn more about this file in the [Gradle documentation](https://docs.gradle.org/current/userguide/platforms.html#sub:conventional-dependencies-toml) website.
-
-Newer versions bring useful features and bug fixes. The most recent versions are<br>
-![Maven Central Version](https://img.shields.io/maven-central/v/org.openrndr/openrndr-math-jvm?label=OPENRNDR&color=%23FFC0CB) 
-![Maven Central Version](https://img.shields.io/maven-central/v/org.openrndr.extra/orx-noise-jvm?label=ORX&color=%23FFC0CB)
-![Maven Central Version](https://img.shields.io/maven-central/v/org.openrndr.orsl/orsl-shader-generator-jvm?label=ORSL&color=%23FFC0CB).
-
-Switch to the [next-version branch](https://github.com/openrndr/openrndr-template/tree/next-version) or enter these versions manually in your toml file. 
-They can look like "0.4.3" or "0.4.3-alpha4". Use the complete string, as in:
-
-    openrndr = "0.4.5-alpha5"
-         orx = "0.4.5-alpha5"
-        orsl = "0.4.5-alpha5"
-
-You can add other dependencies needed by your project to your [build.gradle.kts](build.gradle.kts) file, inside the `dependencies { }` block. 
-
-⚠️ Remember to reload the Gradle configuration after changing any dependencies.
-
-## Github Actions
-
-This repository contains various Github Actions under `./github/workflows`:
-
- [build-on-commit.yaml](.github/workflows/build-on-commit.yaml) runs a basic build on every commit, 
-which can help detect issues in the source code.
-
- [publish-binaries.yaml](.github/workflows/publish-binaries.yaml) publishes binaries for Linux, Mac and Windows 
-any time a commit is tagged with a version number like `v1.*`. For example, we can create and push a tag with these git commands:
-    ```
-    git tag -a v1.0.0 -m "v1.0.0"
-    git push origin v1.0.0
-    ```
-
-    You can follow the progress of the action under the Actions tab in GitHub. Once complete, the executables will appear under the Releases section.
-
-## Building libraries
-
-This template can be used to create a library with your classes and extensions and reuse them across projects or share them with other people. 
-To publish the project as a library, open [build.gradle.kts](build.gradle.kts) and replace the `conventions.distribute-application` plugin with `conventions.publish-library`. 
-This automatically sets up the `maven-publish` plugin, which adds the `publishToMavenLocal` task. 
-The plugin also adds a `demo` sourceSet with runtime dependencies set to go. Demos can be placed in `src/demo/kotlin` and started right away.
+ - `run` runs the TemplateProgram
+ - `jar` creates an executable platform specific jar file with all dependencies
+ - `zipDistribution` creates a zip file containing the application jar and the data folder
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,30 +1,141 @@
-group = property("project.group") ?: error("project.group not set")
-version = property("project.version") ?: error("project.version not set")
+import org.gradle.internal.os.OperatingSystem
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val kotlinVersion = "1.3.50"

 plugins {
-    alias(libs.plugins.kotlin.serialization)
-    id("conventions.kotlin-jvm")
-    id("conventions.openrndr-tasks")
-    id("conventions.distribute-application")
+    java
+    kotlin("jvm") version("1.3.50")
+}
+group = "org.openrndr.template"
+version = "0.3.3"
+
+val applicationMainClass = "TemplateProgramKt"
+val applicationFullLogging = false
+
+val openrndrUseSnapshot = false
+val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.35"
+val openrndrOs = when (OperatingSystem.current()) {
+    OperatingSystem.WINDOWS -> "windows"
+    OperatingSystem.MAC_OS -> "macos"
+    OperatingSystem.LINUX -> "linux-x64"
+    else -> throw IllegalArgumentException("os not supported")
+}
+
+// supported features are: video, panel
+val openrndrFeatures = setOf("video", "panel")
+
+val panelUseSnapshot = false
+val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.17-m3"
+
+val orxUseSnapshot = false
+val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.32"
+
+// supported features are: orx-camera, orx-compositor,orx-easing, orx-filter-extension,orx-file-watcher, orx-kinect-v1
+// orx-integral-image, orx-interval-tree, orx-jumpflood,orx-kdtree, orx-mesh-generators,orx-midi, orx-no-clear,
+// orx-noise, orx-obj, orx-olive
+
+val orxFeatures = setOf("orx-noise")
+
+repositories {
+    mavenCentral()
+    if (openrndrUseSnapshot || orxUseSnapshot || panelUseSnapshot) {
+        mavenLocal()
+    }
+    maven(url = "https://dl.bintray.com/openrndr/openrndr")
+}
+
+fun DependencyHandler.orx(module: String): Any {
+        return "org.openrndr.extra:$module:$orxVersion"
+}
+
+fun DependencyHandler.openrndr(module: String): Any {
+    return "org.openrndr:openrndr-$module:$openrndrVersion"
+}
+
+fun DependencyHandler.openrndrNatives(module: String): Any {
+    return "org.openrndr:openrndr-$module-natives-$openrndrOs:$openrndrVersion"
+}
+
+fun DependencyHandler.orxNatives(module: String): Any {
+    return "org.openrndr.extra:$module-natives-$openrndrOs:$orxVersion"
 }

 dependencies {
-    implementation(openrndr.bundles.basic)
-    implementation(openrndr.bundles.video)
-    runtimeOnly(openrndr.bundles.runtime.sdl)
-//    runtimeOnly(openrndr.bundles.runtime.glfw)
-    runtimeOnly(openrndr.gl3)
-    implementation(openrndr.dialogs)
-    implementation(openrndr.orextensions)
+    runtime(openrndr("gl3"))
+    runtime(openrndrNatives("gl3"))
+    compile(openrndr("core"))
+    compile(openrndr("svg"))
+    compile(openrndr("animatable"))
+    compile(openrndr("extensions"))
+    compile(openrndr("filter"))

-    implementation(orx.bundles.basic)
-    implementation(orx.olive)
+    compile("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.0-RC")

-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.kotlinx.serialization.core)
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.slf4j.api)
-    implementation(libs.kotlin.logging)
-    runtimeOnly(libs.bundles.logging.simple)
-    testImplementation(libs.junit)
-}
+    compile("io.github.microutils", "kotlin-logging","1.7.2")
+
+    if (!applicationFullLogging) {
+        runtime("org.slf4j","slf4j-nop","1.7.25")
+    } else {
+        runtime("org.apache.logging.log4j", "log4j-slf4j-impl", "2.12.0")
+        runtime("com.fasterxml.jackson.core", "jackson-databind", "2.8.7")
+        runtime("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.8.7")
+    }
+
+    if ("video" in openrndrFeatures) {
+        compile(openrndr("ffmpeg"))
+        runtime(openrndrNatives("ffmpeg"))
+    }
+
+    if ("panel" in openrndrFeatures) {
+        compile("org.openrndr.panel:openrndr-panel:$panelVersion")
+    }
+
+    for (feature in orxFeatures) {
+        compile(orx(feature))
+    }
+
+    if ("orx-olive" in orxFeatures) {
+        compile("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
+    }
+
+    if ("orx-kinect-v1" in orxFeatures) {
+        runtime(orxNatives("orx-kinect-v1"))
+    }
+
+    implementation(kotlin("stdlib-jdk8"))
+    testCompile("junit", "junit", "4.12")
+}
+
+configure<JavaPluginConvention> {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}
+tasks.withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
+tasks.withType<Jar> {
+    manifest {
+        attributes["Main-Class"] = applicationMainClass
+    }
+    doFirst {
+        from(configurations.compileClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+        from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    }
+
+    exclude(listOf("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA", "**/module-info*"))
+    archiveFileName.set("application-$openrndrOs.jar")
+}
+
+tasks.create("zipDistribution", Zip::class.java) {
+    archiveFileName.set("application-$openrndrOs.zip")
+    from("./") {
+        include("data/**")
+    }
+    from("$buildDir/libs/application-$openrndrOs.jar")
+}.dependsOn(tasks.jar)
+
+tasks.create("run", JavaExec::class.java) {
+    main = applicationMainClass
+    classpath = sourceSets.main.get().runtimeClasspath
+}.dependsOn(tasks.build)
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,12 +0,0 @@
-plugins {
-    `kotlin-dsl`
-}
-
-val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
-
-dependencies {
-    implementation(libs.findLibrary("shadow-gradle-plugin").get())
-    implementation(libs.findLibrary("runtime-gradle-plugin").get())
-    implementation(libs.findLibrary("kotlin-gradle-plugin").get())
-    implementation(libs.findLibrary("xversions-gradle-plugin").get())
-}
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -1,39 +0,0 @@
-rootProject.name = "buildSrc"
-
-dependencyResolutionManagement {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-        mavenLocal {
-            content {
-                includeGroup("org.openrndr")
-                includeGroup("org.openrndr.extra")
-            }
-        }
-    }
-
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-        // We use a regex to get the openrndr/orx versions from the primary catalog as there is no public Gradle API to parse catalogs.
-        val orRegEx = Regex("^openrndr[ ]*=[ ]*(?:\\{[ ]*require[ ]*=[ ]*)?\"(.*)\"[ ]*(?:\\})?", RegexOption.MULTILINE)
-        val orxRegEx = Regex("^orx[ ]*=[ ]*(?:\\{[ ]*require[ ]*=[ ]*)?\"(.*)\"[ ]*(?:\\})?", RegexOption.MULTILINE)
-        val openrndrVersion = orRegEx.find(File(rootDir,"../gradle/libs.versions.toml").readText())?.groupValues?.get(1) ?: error("can't find openrndr version")
-        val orxVersion = orxRegEx.find(File(rootDir,"../gradle/libs.versions.toml").readText())?.groupValues?.get(1) ?: error("can't find orx version")
-
-        create("orx") {
-            from("org.openrndr.extra:orx-module-catalog:$orxVersion")
-        }
-        create("openrndr") {
-            from("org.openrndr:openrndr-module-catalog:$openrndrVersion")
-        }
-    }
-}
-
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-
-    }
-}
--- a/buildSrc/src/main/kotlin/conventions/distribute-application.gradle.kts
+++ b/buildSrc/src/main/kotlin/conventions/distribute-application.gradle.kts
@@ -1,80 +0,0 @@
-package conventions
-import org.gradle.internal.os.OperatingSystem
-import kotlin.collections.set
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-plugins {
-    id("com.gradleup.shadow")
-    id("org.beryx.runtime")
-}
-
-val applicationMainClass: String by properties
-
-application {
-    mainClass = if (hasProperty("openrndr.application"))
-        "${property("openrndr.application")}"
-    else
-        applicationMainClass
-}
-
-tasks {
-    named<ShadowJar>("shadowJar") {
-        manifest {
-            attributes["Main-Class"] = applicationMainClass
-            attributes["Implementation-Version"] = project.version
-        }
-        minimize {
-            exclude(dependency("org.openrndr:openrndr-gl3:.*"))
-            exclude(dependency("org.openrndr:openrndr-application-glfw"))
-            exclude(dependency("org.openrndr:openrndr-application-sdl"))
-            exclude(dependency("org.jetbrains.kotlin:kotlin-reflect:.*"))
-            exclude(dependency("org.slf4j:slf4j-simple:.*"))
-            exclude(dependency("org.apache.logging.log4j:log4j-slf4j2-impl:.*"))
-            exclude(dependency("com.fasterxml.jackson.core:jackson-databind:.*"))
-            exclude(dependency("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:.*"))
-            exclude(dependency("org.bytedeco:.*"))
-        }
-    }
-}
-
-tasks {
-    named<org.beryx.runtime.JPackageTask>("jpackage") {
-        doLast {
-            val destPath = if (OperatingSystem.current().isMacOsX)
-                "build/jpackage/openrndr-application.app/Contents/Resources/data"
-            else
-                "build/jpackage/openrndr-application/data"
-
-            copy {
-                from("data") { include("**/*") }
-                into(destPath)
-            }
-        }
-    }
-
-    register<Zip>("jpackageZip") {
-        archiveFileName = "openrndr-application.zip"
-        from("${layout.buildDirectory.get()}/jpackage") {
-            include("**/*")
-        }
-        filesMatching("**/bin/*") {
-            permissions {
-                unix("0755")
-            }
-        }
-        dependsOn("jpackage")
-    }
-}
-
-runtime {
-    jpackage {
-        imageName = "openrndr-application"
-        skipInstaller = true
-        if (OperatingSystem.current().isMacOsX) {
-            jvmArgs.add("-XstartOnFirstThread")
-            jvmArgs.add($$"-Duser.dir=$APPDIR/../Resources")
-        }
-    }
-    options = listOf("--strip-debug", "--compress", "zip-6", "--no-header-files", "--no-man-pages")
-    modules = listOf("jdk.unsupported", "java.management", "java.desktop")
-}
--- a/buildSrc/src/main/kotlin/conventions/kotlin-jvm.gradle.kts
+++ b/buildSrc/src/main/kotlin/conventions/kotlin-jvm.gradle.kts
@@ -1,71 +0,0 @@
-package conventions
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-
-val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
-
-plugins {
-    java
-    kotlin("jvm")
-    id("com.github.ben-manes.versions")
-}
-
-repositories {
-    mavenCentral()
-    mavenLocal()
-}
-
-java {
-    targetCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
-    sourceCompatibility = JavaVersion.valueOf("VERSION_${libs.findVersion("jvmTarget").get().displayName}")
-}
-
-kotlin {
-    compilerOptions {
-        apiVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinApi").get().displayName.replace(".", "_")}"))
-        languageVersion.set(KotlinVersion.valueOf("KOTLIN_${libs.findVersion("kotlinLanguage").get().displayName.replace(".", "_")}"))
-        jvmTarget.set(JvmTarget.valueOf("JVM_${libs.findVersion("jvmTarget").get().displayName}"))
-    }
-}
-
-fun arch(arch: String = System.getProperty("os.arch")): String {
-    return when (arch) {
-        "x86-64", "x86_64", "amd64" -> "x86-64"
-        "arm64", "aarch64" -> "aarch64"
-        else -> error("unsupported arch $arch")
-    }
-}
-
-fun Project.addHostMachineAttributesToRuntimeConfigurations() {
-    val currentOperatingSystemName: String = DefaultNativePlatform.getCurrentOperatingSystem().toFamilyName()
-    val currentArchitectureName: String = arch()
-
-    configurations.matching {
-        it.name.endsWith("runtimeClasspath", ignoreCase = true)
-    }.configureEach {
-        attributes {
-            attribute(OperatingSystemFamily.OPERATING_SYSTEM_ATTRIBUTE, objects.named(currentOperatingSystemName))
-            attribute(MachineArchitecture.ARCHITECTURE_ATTRIBUTE, objects.named(currentArchitectureName))
-        }
-    }
-}
-
-addHostMachineAttributesToRuntimeConfigurations()
-
-
-tasks {
-    dependencyUpdates {
-        gradleReleaseChannel = "current"
-
-        val nonStableKeywords = listOf("alpha", "beta", "rc")
-
-        fun isNonStable(version: String) = nonStableKeywords.any {
-            version.lowercase().contains(it)
-        }
-
-        rejectVersionIf {
-            isNonStable(candidate.version) && !isNonStable(currentVersion)
-        }
-    }
-}
--- a/buildSrc/src/main/kotlin/conventions/openrndr-tasks.gradle.kts
+++ b/buildSrc/src/main/kotlin/conventions/openrndr-tasks.gradle.kts
@@ -1,42 +0,0 @@
-package conventions
-
-val applicationMainClass by properties
-tasks.register("create executable jar for $applicationMainClass") {
-    group = " \uD83E\uDD8C OPENRNDR"
-    dependsOn("shadowJar")
-}
-
-tasks.register("run $applicationMainClass") {
-    group = " \uD83E\uDD8C OPENRNDR"
-    dependsOn("run")
-}
-
-tasks.register("create standalone executable for $applicationMainClass") {
-    group = " \uD83E\uDD8C OPENRNDR"
-    dependsOn("jpackageZip")
-}
-
-tasks.register("add IDE file scopes") {
-    group = " \uD83E\uDD8C OPENRNDR"
-    val scopesFolder = File("${project.projectDir}/.idea/scopes")
-    scopesFolder.mkdirs()
-
-    val files = listOf(
-        "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||file:*.svg"
-    )
-    files.forEach { (name, pattern) ->
-        val file = File(scopesFolder, "__$name.xml")
-        if (!file.exists()) {
-            file.writeText(
-                """
-                    <component name="DependencyValidationManager">
-                      <scope name=" ★ $name" pattern="$pattern" />
-                    </component>
-                    """.trimIndent()
-            )
-        }
-    }
-}
--- a/buildSrc/src/main/kotlin/conventions/publish-library.gradle.kts
+++ b/buildSrc/src/main/kotlin/conventions/publish-library.gradle.kts
@@ -1,37 +0,0 @@
-package conventions
-
-import org.gradle.kotlin.dsl.java
-import org.gradle.kotlin.dsl.kotlin
-
-plugins {
-    java
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
-val openrndr = extensions.getByType<VersionCatalogsExtension>().named("openrndr")
-
-val demo = sourceSets.create("demo")
-val main = sourceSets.getByName("main")
-
-demo.compileClasspath += main.compileClasspath
-demo.runtimeClasspath += main.runtimeClasspath
-demo.compileClasspath += main.output
-demo.runtimeClasspath += main.output
-
-dependencies {
-    "demoRuntimeOnly"(openrndr.findLibrary("gl3").get())
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            from(components["java"])
-            groupId = property("project.group")?.toString() ?: error("project.group not set")
-            artifactId = property("project.name")?.toString() ?: error("project.name not set")
-            description = property("project.name")?.toString() ?: error("project.name not set")
-            version = property("project.version")?.toString() ?: error("project.version not set")
-        }
-    }
-}
--- a/data/fonts/IBMPlexMono-Regular.ttf
+++ b/data/fonts/IBMPlexMono-Regular.ttf
--- a/data/fonts/default.otf
+++ b/data/fonts/default.otf
--- a/data/fonts/license.txt
+++ b/data/fonts/license.txt
@@ -1,92 +0,0 @@
-Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/data/images/cheeta.jpg
+++ b/data/images/cheeta.jpg
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,10 +1 @@
-project.name=openrndr-template
-project.group=org.openrndr
-project.version=1.0.0
-applicationMainClass=TemplateProgramKt
-openrndr.tasks=true
-kotlin.code.style=official
-#org.gradle.configuration-cache=true
-#org.gradle.configuration-cache.parallel=true
-#org.gradle.configuration-cache.problems=warn
-
+kotlin.code.style=official
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,59 +0,0 @@
-[versions]
-jvmTarget = "17"
-kotlin = "2.3.21"
-kotlinApi = "2.2"
-kotlinLanguage = "2.2"
-
-openrndr = "0.5.0-alpha4"
-orx = "0.5.0-alpha4"
-orsl = "0.4.5-alpha5"
-orml = "0.4.1"
-
-slf4j = "2.0.18"
-log4j = "2.23.1"
-jackson = "2.17.2"
-junit = "4.13.2"
-kotlinxCoroutines = "1.11.0"
-kotlinxSerialization = "1.11.0"
-kotlinLogging = "8.0.03"
-kotlinCsvJvm = "1.9.3"
-jsoup = "1.17.1"
-shadow = "9.4.0"
-runtime = "2.0.1"
-versions = "0.54.0"
-
-[libraries]
-kotlin-script-runtime = { group = "org.jetbrains.kotlin", name = "kotlin-script-runtime", version.ref = "kotlin" }
-
-slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
-slf4j-nop = { group = "org.slf4j", name = "slf4j-nop", version.ref = "slf4j" }
-slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
-log4j-slf4j2 = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j" }
-log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
-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" }
-
-shadow-gradle-plugin = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
-runtime-gradle-plugin = { group = "org.beryx.runtime", name = "org.beryx.runtime.gradle.plugin", version.ref = "runtime" }
-kotlin-gradle-plugin = { group = "org.jetbrains.kotlin.jvm", name = "org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin" }
-xversions-gradle-plugin = { group = "com.github.ben-manes.versions", name = "com.github.ben-manes.versions.gradle.plugin", version.ref = "versions" }
-kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
-kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
-kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" }
-kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "kotlinLogging" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" }
-csv = { group = "com.github.doyaaaaaken", name = "kotlin-csv-jvm", version.ref = "kotlinCsvJvm" }
-
-[plugins]
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
-runtime = { id = "org.beryx.runtime", version.ref = "runtime" }
-gitarchive-tomarkdown = { id = "org.openrndr.extra.gitarchiver.tomarkdown", version.ref = "orx" }
-versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
-
-[bundles]
-logging-none = ["slf4j-nop"]
-logging-simple = ["slf4j-simple"]
-logging-full = ["log4j-slf4j2", "log4j-core", "jackson-databind", "jackson-json"]
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,9 +1,6 @@
+#Thu Aug 01 12:32:31 CEST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
-networkTimeout=10000
-retries=0
-retryBackOffMs=500
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
--- a/308
+++ b/308
@@ -1,128 +1,78 @@
-#!/bin/sh
-
-#
-# Copyright © 2015 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+#!/usr/bin/env sh

 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

-
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -131,118 +81,92 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi

+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")

-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
 fi

-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,82 +1,84 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@rem
@rem ##########################################################################

-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m"

@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init

-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
+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.

-"%COMSPEC%" /c exit 1
+goto fail

 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init

-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
+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.

-"%COMSPEC%" /c exit 1
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*

 :execute
@rem Setup the command line

-
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/settings.gradle
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'openrndr-template'
+
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,35 +0,0 @@
-rootProject.name = extra["project.name"]?.toString() ?: error("project.name not set")
-
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        mavenLocal()
-    }
-}
-
-dependencyResolutionManagement {
-    repositories {
-        mavenCentral()
-        mavenLocal {
-            content {
-                includeGroup("org.openrndr")
-                includeGroup("org.openrndr.extra")
-            }
-        }
-    }
-
-    versionCatalogs {
-        // We use a regex to get the openrndr/orx versions from the primary catalog as there is no public Gradle API to parse catalogs.
-        val orRegEx = Regex("^openrndr[ ]*=[ ]*(?:\\{[ ]*require[ ]*=[ ]*)?\"(.*)\"[ ]*(?:\\})?", RegexOption.MULTILINE)
-        val orxRegEx = Regex("^orx[ ]*=[ ]*(?:\\{[ ]*require[ ]*=[ ]*)?\"(.*)\"[ ]*(?:\\})?", RegexOption.MULTILINE)
-        val openrndrVersion = orRegEx.find(File(rootDir,"gradle/libs.versions.toml").readText())?.groupValues?.get(1) ?: error("can't find openrndr version")
-        val orxVersion = orxRegEx.find(File(rootDir,"gradle/libs.versions.toml").readText())?.groupValues?.get(1) ?: error("can't find orx version")
-
-        create("orx") {
-            from("org.openrndr.extra:orx-module-catalog:$orxVersion")
-        }
-        create("openrndr") {
-            from("org.openrndr:openrndr-module-catalog:$openrndrVersion")
-        }
-    }
-}
--- a/src/main/kotlin/TemplateLiveProgram.kt
+++ b/src/main/kotlin/TemplateLiveProgram.kt
@@ -1,22 +0,0 @@
-import org.openrndr.application
-import org.openrndr.color.ColorRGBa
-import org.openrndr.extra.olive.oliveProgram
-
-/**
- *  This is a template for a live program.
- *
- *  It uses oliveProgram {} instead of program {}. All code inside the
- *  oliveProgram {} can be changed while the program is running.
- */
-
-fun main() = application {
-    configure {
-        width = 800
-        height = 800
-    }
-    oliveProgram {
-        extend {
-            drawer.clear(ColorRGBa.PINK)
-        }
-    }
-}
--- a/src/main/kotlin/TemplateProgram.kt
+++ b/src/main/kotlin/TemplateProgram.kt
@@ -1,10 +1,8 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.loadFont
+import org.openrndr.draw.FontImageMap
 import org.openrndr.draw.loadImage
-import org.openrndr.extra.color.colormatrix.tint
-import kotlin.math.cos
-import kotlin.math.sin
+import org.openrndr.draw.tint

 fun main() = application {
    configure {
@@ -13,19 +11,20 @@ fun main() = application {
    }

    program {
-        val image = loadImage("data/images/pm5544.png")
-        val font = loadFont("data/fonts/default.otf", 64.0)
+
+        val image = loadImage("file:data/images/pm5544.png")
+        val font = FontImageMap.fromUrl("file:data/fonts/IBMPlexMono-Regular.ttf", 64.0)

        extend {
            drawer.drawStyle.colorMatrix = tint(ColorRGBa.WHITE.shade(0.2))
            drawer.image(image)

            drawer.fill = ColorRGBa.PINK
-            drawer.circle(cos(seconds) * width / 2.0 + width / 2.0, sin(0.5 * seconds) * height / 2.0 + height / 2.0, 140.0)
+            drawer.circle(Math.cos(seconds)*width/2.0+width/2.0, Math.sin(0.5*seconds)*height/2.0 + height/2.0, 140.0)

            drawer.fontMap = font
            drawer.fill = ColorRGBa.WHITE
-            drawer.text("OPENRNDR", width / 2.0, height / 2.0)
+            drawer.text("OPENRNDR", width/2.0, height /2.0)
        }
    }
-}
+}
--- a/src/main/resources/log4j2.yaml
+++ b/src/main/resources/log4j2.yaml
@@ -1,21 +1,20 @@
 Configuration:
  status: warn
  Appenders:
-    Console:
-      - name: Console_Info
-        target: SYSTEM_ERR
+      Console:
+        name: Console
+        target: SYSTEM_OUT
        PatternLayout:
-          Pattern: "%highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=green} %style{[%t]}{white} %style{%-30.30c{1.}}{white} %style{ ↘ %m%n%ex}{white}"
-          #Pattern: "%style{%d{yyyy-MM-dd HH:mm:ss.SSS}}{white} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=green} %style{[%t]}{white} %style{%-30.30c{1.}}{cyan} %style{:%m%n%ex}{white}"
-    File:
-      append: false
-      name: File_Appender
-      fileName: application.log
-      PatternLayout:
-        Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
+          Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
+      File:
+        append: false
+        name: File_Appender
+        fileName: application.log
+        PatternLayout:
+          Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
  Loggers:
    Root:
-      level: info
+      level: debug
      AppenderRef:
-        - ref: Console_Info
+        - ref: Console
        - ref: File_Appender
Author	SHA1	Message	Date
edwin	2e52f074f2	Added natives for orx-kinect-v1	2019-08-28 12:58:20 +02:00
edwin	7d6ac87a34	Bumped OPENRNDR to 0.3.35, orx to 0.3.32, kotlin to 1.3.50	2019-08-27 19:38:24 +02:00