Bumped orx to 0.3.34

.github/workflows/build-on-commit.yaml

@@ -1,15 +0,0 @@
-name: Build on commit
-on:
-  push:
-    branches:
-      - master
-jobs:
-  build:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 14
-      - name: Build sources
-        run: ./gradlew build

.github/workflows/publish-binaries-linux-x64.yaml

@@ -1,30 +0,0 @@
-name: Publish Linux/x64 binaries
-
-on:
-  push:
-    tags:
-      - v0.*
-      - v0.*.*
-      - v1.*
-      - v1.*.*
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 14
-        uses: actions/setup-java@v1
-        with:
-          java-version: 14
-      - name: Build with Gradle
-        run: ./gradlew jpackageZip
-      - name: Create Release
-        uses: ncipollo/release-action@v1.6.1
-        id: create_release
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          allowUpdates: true
-          replaceArtifacts: false
-          body: Fully automated release
-          artifacts: "./build/distributions/openrndr-application-linux-x64.zip"

.github/workflows/publish-binaries-macos.yaml

@@ -1,30 +0,0 @@
-name: Publish macOS binaries
-
-on:
-  push:
-    tags:
-      - v0.*
-      - v0.*.*
-      - v1.*
-      - v1.*.*
-
-jobs:
-  build:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 14
-        uses: actions/setup-java@v1
-        with:
-          java-version: 14
-      - name: Build with Gradle
-        run: ./gradlew jpackageZip
-      - name: Create Release
-        uses: ncipollo/release-action@v1.6.1
-        id: create_release
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          allowUpdates: true
-          replaceArtifacts: false
-          body: Fully automated release
-          artifacts: "./build/distributions/openrndr-application-macos.zip"

.github/workflows/publish-binaries-windows.yaml

@@ -1,30 +0,0 @@
-name: Publish Windows binaries
-
-on:
-  push:
-    tags:
-      - v0.*
-      - v0.*.*
-      - v1.*
-      - v1.*.*
-      -
-jobs:
-  build:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 14
-        uses: actions/setup-java@v1
-        with:
-          java-version: 14
-      - name: Build with Gradle
-        run: ./gradlew jpackageZip
-      - name: Create Release
-        uses: ncipollo/release-action@v1.6.1
-        id: create_release
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          allowUpdates: true
-          replaceArtifacts: false
-          body: Fully automated release
-          artifacts: "./build/distributions/openrndr-application-windows.zip"

README.md

@@ -1,24 +1,12 @@
-# OPENRNDR template project
+# openrndr-template
 A feature rich template for creating OPENRNDR programs based on Gradle/Kts
 
+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 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`
-
-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)
-
 ## Gradle tasks
  - `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
- - `jpackageZip` creates a zip with a stand-alone executable for the current platform (works with Java 14 only)
-
-## Cross builds
-To create runnable jars for a platform different from the platform you use to build one uses `./gradlew jar --PtargetPlatform=<platform>`. The supported platforms are `windows`, `macos`, `linux-x64` and `linux-arm64`. Note that the `linux-arm64` platform will only work with OPENRNDR snapshot builds from master and OPENRNDR 0.3.39 (a future version).
-
-## Github Actions
-
-This repository contains a number of Github Actions in `./github/workflows`. 
-The actions enable a basic build run on commit, plus publication actions that are executed when
-a commit is tagged with a version number like `v0.*` or `v1.*`.

build.gradle.kts

@@ -1,111 +1,45 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
-/* the name of this project, default is the template version but you are free to change these */
-group = "org.openrndr.template"
-version = "0.3.13"
-
-val applicationMainClass = "TemplateProgramKt"
-
-/*  Which additional (ORX) libraries should be added to this project. */
-val orxFeatures = setOf(
-//  "orx-boofcv",
-//  "orx-camera",
-//  "orx-chataigne",
-    "orx-compositor",
-//  "orx-dnk3"
-//  "orx-easing",
-//  "orx-file-watcher",
-//  "orx-parameters",
-//  "orx-filter-extension",
-    "orx-fx",
-//  "orx-glslify",
-//  "orx-gradient-descent",
-    "orx-gui",
-    "orx-image-fit",
-//  "orx-integral-image",
-//  "orx-interval-tree",
-//  "orx-jumpflood",
-//  "orx-kdtree",
-//  "orx-mesh-generators",
-//  "orx-midi",
-//  "orx-no-clear",
-    "orx-noise",
-//  "orx-obj-loader",
-    "orx-olive",
-//  "orx-osc",
-//  "orx-palette",
-//  "orx-poisson-fill",
-//  "orx-rabbit-control
-//  "orx-runway",
-    "orx-shade-styles",
-//  "orx-shader-phrases",
-//  "orx-shapes",
-//  "orx-syphon",
-//  "orx-temporal-blur",
-//  "orx-time-operators,
-//  "orx-kinect-v1",
-
-    "orx-panel"
-)
-
-/* Which OPENRNDR libraries should be added to this project? */
-val openrndrFeatures = setOf(
-    "video"
-)
-
-/*  Which version of OPENRNDR and ORX should be used? */
-val openrndrUseSnapshot = false
-val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.43"
-
-val orxUseSnapshot = false
-val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.52"
-
-//<editor-fold desc="This is code for OPENRNDR, no need to edit this .. most of the times">
-val supportedPlatforms = setOf("windows", "macos", "linux-x64", "linux-arm64")
-
-val openrndrOs = if (project.hasProperty("targetPlatform")) {
-    val platform : String = project.property("targetPlatform") as String
-    if (platform !in supportedPlatforms) {
-        throw IllegalArgumentException("target platform not supported: $platform")
-    } else {
-        platform
-    }
-} else when (OperatingSystem.current()) {
-    OperatingSystem.WINDOWS -> "windows"
-    OperatingSystem.MAC_OS -> "macos"
-    OperatingSystem.LINUX -> when(val h = DefaultNativePlatform("current").architecture.name) {
-        "x86-64" -> "linux-x64"
-        "aarch64" -> "linux-arm64"
-        else ->throw IllegalArgumentException("architecture not supported: $h")
-    }
-    else -> throw IllegalArgumentException("os not supported")
-}
-//</editor-fold>
-
-enum class Logging {
-    NONE,
-    SIMPLE,
-    FULL
-}
-
-/*  What type of logging should this project use? */
-val applicationLogging = Logging.FULL
-
-val kotlinVersion = "1.3.72"
+val kotlinVersion = "1.3.50"
 
 plugins {
     java
-    kotlin("jvm") version("1.3.72")
-    id("com.github.johnrengelman.shadow") version ("6.0.0")
-    id("org.beryx.runtime") version ("1.9.1")
+    kotlin("jvm") version("1.3.50")
 }
+group = "org.openrndr.template"
+version = "0.3.4"
+
+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.34"
+
+// 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) {
+    if (openrndrUseSnapshot || orxUseSnapshot || panelUseSnapshot) {
         mavenLocal()
     }
     maven(url = "https://dl.bintray.com/openrndr/openrndr")
@@ -128,61 +62,51 @@ fun DependencyHandler.orxNatives(module: String): Any {
 }
 
 dependencies {
-    /*  This is where you add additional (third-party) dependencies */
+    runtime(openrndr("gl3"))
+    runtime(openrndrNatives("gl3"))
+    compile(openrndr("core"))
+    compile(openrndr("svg"))
+    compile(openrndr("animatable"))
+    compile(openrndr("extensions"))
+    compile(openrndr("filter"))
 
-//    implementation("org.jsoup:jsoup:1.12.2")
-//    implementation("com.google.code.gson:gson:2.8.6")
+    compile("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.0-RC")
 
-    runtimeOnly(openrndr("gl3"))
-    runtimeOnly(openrndrNatives("gl3"))
-    implementation(openrndr("openal"))
-    runtimeOnly(openrndrNatives("openal"))
-    implementation(openrndr("core"))
-    implementation(openrndr("svg"))
-    implementation(openrndr("animatable"))
-    implementation(openrndr("extensions"))
-    implementation(openrndr("filter"))
+    compile("io.github.microutils", "kotlin-logging","1.7.2")
 
-    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.7")
-    implementation("io.github.microutils", "kotlin-logging","1.7.10")
-
-    when(applicationLogging) {
-        Logging.NONE -> {
-            runtimeOnly("org.slf4j","slf4j-nop","1.7.30")
-        }
-        Logging.SIMPLE -> {
-            runtimeOnly("org.slf4j","slf4j-simple","1.7.30")
-        }
-        Logging.FULL -> {
-            runtimeOnly("org.apache.logging.log4j", "log4j-slf4j-impl", "2.13.3")
-            runtimeOnly("com.fasterxml.jackson.core", "jackson-databind", "2.11.1")
-            runtimeOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.11.1")
-        }
+    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) {
-        implementation(openrndr("ffmpeg"))
-        runtimeOnly(openrndrNatives("ffmpeg"))
+        compile(openrndr("ffmpeg"))
+        runtime(openrndrNatives("ffmpeg"))
+    }
+
+    if ("panel" in openrndrFeatures) {
+        compile("org.openrndr.panel:openrndr-panel:$panelVersion")
     }
 
     for (feature in orxFeatures) {
-        implementation(orx(feature))
-    }
-
-    if ("orx-kinect-v1" in orxFeatures) {
-        runtimeOnly(orxNatives("orx-kinect-v1"))
+        compile(orx(feature))
     }
 
     if ("orx-olive" in orxFeatures) {
-        implementation("org.jetbrains.kotlin:kotlin-script-runtime:$kotlinVersion")
+        compile("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
+    }
+
+    if ("orx-kinect-v1" in orxFeatures) {
+        runtime(orxNatives("orx-kinect-v1"))
     }
 
     implementation(kotlin("stdlib-jdk8"))
-    testImplementation("junit", "junit", "4.12")
+    testCompile("junit", "junit", "4.12")
 }
 
-// --------------------------------------------------------------------------------------------------------------------
-
 configure<JavaPluginConvention> {
     sourceCompatibility = JavaVersion.VERSION_1_8
 }
@@ -190,65 +114,28 @@ tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-
-project.setProperty("mainClassName", applicationMainClass)
-tasks {
-    named<ShadowJar>("shadowJar") {
+tasks.withType<Jar> {
     manifest {
         attributes["Main-Class"] = applicationMainClass
     }
-        minimize {
-            exclude(dependency("org.openrndr:openrndr-gl3:.*"))
-            exclude(dependency("org.jetbrains.kotlin:kotlin-reflect:.*"))
-        }
-    }
-    named<org.beryx.runtime.JPackageTask>("jpackage") {
-        doLast {
-            when (OperatingSystem.current()) {
-                OperatingSystem.WINDOWS, OperatingSystem.LINUX -> {
-                    copy {
-                        from("data") {
-                            include("**/*")
-                        }
-                        into("build/jpackage/openrndr-application/data")
-                    }
-                }
-                OperatingSystem.MAC_OS -> {
-                    copy {
-                        from("data") {
-                            include("**/*")
-                        }
-                        into("build/jpackage/openrndr-application.app/data")
-                    }
-                }
-            }
-        }
-    }
+    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) })
     }
 
-tasks.register<Zip>("jpackageZip") {
-    archiveFileName.set("openrndr-application-$openrndrOs.zip")
-    from("$buildDir/jpackage") {
-        include("**/*")
+    exclude(listOf("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA", "**/module-info*"))
+    archiveFileName.set("application-$openrndrOs.jar")
 }
-}
-tasks.findByName("jpackageZip")?.dependsOn("jpackage")
 
-runtime {
-    jpackage {
-        imageName = "openrndr-application"
-        skipInstaller = true
-        if (OperatingSystem.current() == OperatingSystem.MAC_OS) {
-            jvmArgs.add("-XstartOnFirstThread")
-        }
-    }
-    options.empty()
-    options.add("--strip-debug")
-    options.add("--compress")
-    options.add("1")
-    options.add("--no-header-files")
-    options.add("--no-man-pages")
-    modules.empty()
-    modules.add("jdk.unsupported")
-    modules.add("java.management")
+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)

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Thu Aug 01 12:32:31 CEST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

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)
-        }
-    }
-}

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.draw.tint
-import kotlin.math.cos
-import kotlin.math.sin
 
 fun main() = application {
     configure {
@@ -13,15 +11,16 @@ fun main() = application {
     }
 
     program {
-        val image = loadImage("data/images/pm5544.png")
-        val font = loadFont("data/fonts/IBMPlexMono-Regular.ttf", 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

src/main/resources/log4j2.yaml

@@ -2,11 +2,10 @@ Configuration:
   status: warn
   Appenders:
       Console:
-      - name: Console_Info
-        target: SYSTEM_ERR
+        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}"
+          Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
       File:
         append: false
         name: File_Appender
@@ -15,7 +14,7 @@ Configuration:
           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