From c64562999ad39f0252a4a8ad30ac8647746dee27 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Mon, 18 May 2020 15:25:54 +0200 Subject: [PATCH] Add configuration option for script host to oliveProgram --- orx-olive/images/DemoOlive01Kt.png | Bin 0 -> 33331 bytes .../src/demo/kotlin/DemoOliveScriptless01.kt | 3 ++- orx-olive/src/main/kotlin/OliveProgram.kt | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 orx-olive/images/DemoOlive01Kt.png diff --git a/orx-olive/images/DemoOlive01Kt.png b/orx-olive/images/DemoOlive01Kt.png new file mode 100644 index 0000000000000000000000000000000000000000..e4a00494b098ceface6e330af3f8b74b32347e9e GIT binary patch literal 33331 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 VxctLhO$G)A22WQ%mvv4FO#mOeb@%`P literal 0 HcmV?d00001 diff --git a/orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt b/orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt index 8100a887..cd564617 100644 --- a/orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt +++ b/orx-olive/src/demo/kotlin/DemoOliveScriptless01.kt @@ -2,6 +2,7 @@ import org.openrndr.Extension import org.openrndr.application import org.openrndr.color.ColorRGBa import org.openrndr.extensions.SingleScreenshot +import org.openrndr.extra.olive.OliveScriptHost import org.openrndr.extra.olive.oliveProgram import kotlin.math.cos @@ -11,7 +12,7 @@ fun main() { width = 1280 height = 720 } - oliveProgram { + oliveProgram(scriptHost = OliveScriptHost.JSR223) { extend { drawer.clear(ColorRGBa.GRAY) drawer.fill = ColorRGBa.WHITE diff --git a/orx-olive/src/main/kotlin/OliveProgram.kt b/orx-olive/src/main/kotlin/OliveProgram.kt index 45b02f88..06b00024 100644 --- a/orx-olive/src/main/kotlin/OliveProgram.kt +++ b/orx-olive/src/main/kotlin/OliveProgram.kt @@ -7,7 +7,7 @@ import java.nio.file.Files import java.nio.file.Paths import kotlin.streams.toList -open class OliveProgram(private val sourceLocation: String) : Program() { +open class OliveProgram(private val sourceLocation: String, private val scriptHost: OliveScriptHost) : Program() { val olive = extend(Olive(scriptMode = ScriptMode.OLIVE_PROGRAM)) { script = sourceLocation } @@ -19,7 +19,7 @@ fun stackRootClassName(thread: Thread = Thread.currentThread(), sanitize: Boolea return if (sanitize) rootClass.replace(Regex("Kt$"), "") else rootClass } -fun ApplicationBuilder.oliveProgram(init: OliveProgram.() -> Unit): OliveProgram { +fun ApplicationBuilder.oliveProgram(scriptHost: OliveScriptHost = OliveScriptHost.JSR223_REUSE, init: OliveProgram.() -> Unit): OliveProgram { val rootClassName = stackRootClassName(sanitize = true).split(".").last() var sourceLocation = "src/main/kotlin/$rootClassName.kt" @@ -33,7 +33,7 @@ fun ApplicationBuilder.oliveProgram(init: OliveProgram.() -> Unit): OliveProgram error("multiple source candidates found: $otherCandidates") } } - program = object : OliveProgram(sourceLocation) { + program = object : OliveProgram(sourceLocation, scriptHost) { override fun setup() { super.setup() init()