From 89fce80affc76bd19acd9ec03c62475c7c2b03ac Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Tue, 28 Jan 2020 00:12:33 +0100 Subject: [PATCH] Upgrade to OPENRNDR 0.3.38, add TemplateLiveProgram.kt --- build.gradle.kts | 10 +++++----- src/main/kotlin/TemplateLiveProgram.kt | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 src/main/kotlin/TemplateLiveProgram.kt diff --git a/build.gradle.kts b/build.gradle.kts index 16078da..c48d384 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,22 +2,22 @@ import org.gradle.internal.os.OperatingSystem import org.jetbrains.kotlin.gradle.tasks.KotlinCompile group = "org.openrndr.template" -version = "0.3.8" +version = "0.3.9" val applicationMainClass = "TemplateProgramKt" val openrndrUseSnapshot = false -val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.37" +val openrndrVersion = if (openrndrUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.38" val panelUseSnapshot = false -val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.19" +val panelVersion = if (panelUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.20" val orxUseSnapshot = false -val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.44" +val orxVersion = if (orxUseSnapshot) "0.4.0-SNAPSHOT" else "0.3.46" // supported features are: orx-camera, orx-compositor,orx-easing, orx-filter-extension,orx-file-watcher, orx-fx // orx-integral-image, orx-interval-tree, orx-jumpflood, orx-kinect-v1, orx-kdtree, orx-mesh-generators,orx-midi, orx-no-clear, // orx-noise, orx-obj, orx-olive, orx-osc, orx-palette, orx-runway -val orxFeatures = setOf("orx-noise", "orx-fx") +val orxFeatures = setOf("orx-noise", "orx-fx", "orx-olive") // supported features are: video, panel val openrndrFeatures = setOf("video", "panel") diff --git a/src/main/kotlin/TemplateLiveProgram.kt b/src/main/kotlin/TemplateLiveProgram.kt new file mode 100644 index 0000000..38e8bbc --- /dev/null +++ b/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()) + } +} \ No newline at end of file