Upgrade to OPENRNDR 0.3.39

* Bump library versions
 * Bump template version
 * Small clean-up of TemplateProgram.kt

README.md

@@ -1,12 +1,18 @@
-# openrndr-template
+# OPENRNDR template project
 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
+
+## 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).

build.gradle.kts

@@ -1,41 +1,93 @@
 import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 
-val kotlinVersion = "1.3.50"
+/* the name of this project, default is the template version but you are free to change these */
+group = "org.openrndr.template"
+version = "0.3.10"
+
+val applicationMainClass = "TemplateProgramKt"
+
+/*  Which additional (ORX) libraries should be added to this project. */
+val orxFeatures = setOf(
+//    "orx-camera",
+    "orx-compositor",
+//    "orx-easing",
+//    "orx-filter-extension",
+//    "orx-file-watcher",
+    "orx-fx",
+    "orx-gui",
+//    "orx-integral-image",
+//    "orx-interval-tree",
+    "orx-image-fit",
+//    "orx-jumpflood",
+//    "orx-kinect-v1",
+//    "orx-kdtree",
+//    "orx-mesh-generators"
+//    "orx-midi",
+//    "orx-noclear",
+    "orx-noise",
+//    "orx-obj"
+    "orx-olive",
+//    "orx-osc"
+//    "orx-palette"
+//    "orx-runway"
+    "orx-shade-styles"
+)
+
+/* Which OPENRNDR libraries should be added to this project? */
+val openrndrFeatures = setOf(
+    "panel",
+    "video"
+)
+
+/*  Which version of OPENRNDR, ORX and Panel should be used? */
+val openrndrUseSnapshot = false
+val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.39"
+
+val panelUseSnapshot = false
+val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.21"
+
+val orxUseSnapshot = false
+val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.47"
+
+//<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.SIMPLE
+
+val kotlinVersion = "1.3.61"
 
 plugins {
     java
-    kotlin("jvm") version("1.3.50")
+    kotlin("jvm") version("1.3.61")
 }
-group = "org.openrndr.template"
-version = "0.3.2"
-
-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()
@@ -57,48 +109,73 @@ 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 {
-    runtime(openrndr("gl3"))
-    runtime(openrndrNatives("gl3"))
-    compile(openrndr("core"))
-    compile(openrndr("svg"))
-    compile(openrndr("animatable"))
-    compile(openrndr("extensions"))
-    compile(openrndr("filter"))
 
-    compile("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.0-RC")
+    /*  This is where you add additional (third-party) dependencies */
 
-    compile("io.github.microutils", "kotlin-logging","1.7.2")
+//    implementation("org.jsoup:jsoup:1.12.2")
+//    implementation("com.google.code.gson:gson:2.8.6")
 
-    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")
+    //<editor-fold desc="Managed dependencies">
+    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"))
+
+    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-core","1.3.3")
+    implementation("io.github.microutils", "kotlin-logging","1.7.8")
+
+    when(applicationLogging) {
+        Logging.NONE -> {
+            runtimeOnly("org.slf4j","slf4j-nop","1.7.29")
+        }
+        Logging.SIMPLE -> {
+            runtimeOnly("org.slf4j","slf4j-simple","1.7.29")
+        }
+        Logging.FULL -> {
+            runtimeOnly("org.apache.logging.log4j", "log4j-slf4j-impl", "2.13.0")
+            runtimeOnly("com.fasterxml.jackson.core", "jackson-databind", "2.10.1")
+            runtimeOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml", "2.10.1")
+        }
     }
 
     if ("video" in openrndrFeatures) {
-        compile(openrndr("ffmpeg"))
-        runtime(openrndrNatives("ffmpeg"))
+        implementation(openrndr("ffmpeg"))
+        runtimeOnly(openrndrNatives("ffmpeg"))
     }
 
     if ("panel" in openrndrFeatures) {
-        compile("org.openrndr.panel:openrndr-panel:$panelVersion")
+        implementation("org.openrndr.panel:openrndr-panel:$panelVersion")
     }
 
     for (feature in orxFeatures) {
-        compile(orx(feature))
+        implementation(orx(feature))
+    }
+
+    if ("orx-kinect-v1" in orxFeatures) {
+        runtimeOnly(orxNatives("orx-kinect-v1"))
     }
 
     if ("orx-olive" in orxFeatures) {
-        compile("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
+        implementation("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
     }
 
     implementation(kotlin("stdlib-jdk8"))
-    testCompile("junit", "junit", "4.12")
+    testImplementation("junit", "junit", "4.12")
+    //</editor-fold>
 }
 
+// --------------------------------------------------------------------------------------------------------------------
+
 configure<JavaPluginConvention> {
     sourceCompatibility = JavaVersion.VERSION_1_8
 }

gradle/wrapper/gradle-wrapper.properties

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

src/main/kotlin/TemplateLiveProgram.kt

@@ -0,0 +1,22 @@
+import org.openrndr.Program
+import org.openrndr.application
+import org.openrndr.extra.olive.Olive
+
+/**
+ *  This is a template for a live program.
+ *  The first you will run this program it will create a script file at src/main/kotlin/live.kts
+ *  This script file can be modified while the program is running.
+ *
+ *  Please refer to https://guide.openrndr.org/#/10_OPENRNDR_Extras/C03_Live_coding for more
+ *  instructions on using the live coding environment.
+ */
+
+fun main() = application {
+    configure {
+        width = 800
+        height = 800
+    }
+    program {
+        extend(Olive<Program>())
+    }
+}

src/main/kotlin/TemplateProgram.kt

@@ -1,8 +1,10 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.draw.FontImageMap
+import org.openrndr.draw.loadFont
 import org.openrndr.draw.loadImage
 import org.openrndr.draw.tint
+import kotlin.math.cos
+import kotlin.math.sin
 
 fun main() = application {
     configure {
@@ -11,16 +13,15 @@ fun main() = application {
     }
 
     program {
-
-        val image = loadImage("file:data/images/pm5544.png")
-        val font = FontImageMap.fromUrl("file:data/fonts/IBMPlexMono-Regular.ttf", 64.0)
+        val image = loadImage("data/images/pm5544.png")
+        val font = loadFont("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(Math.cos(seconds)*width/2.0+width/2.0, Math.sin(0.5*seconds)*height/2.0 + height/2.0, 140.0)
+            drawer.circle(cos(seconds) * width / 2.0 + width / 2.0, sin(0.5 * seconds) * height / 2.0 + height / 2.0, 140.0)
 
             drawer.fontMap = font
             drawer.fill = ColorRGBa.WHITE