kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce duplication in orx build scripts. (#240)

Browse Source 
Co-authored-by: hamoid <abe@hamoid.com>
This commit is contained in:
Vechro
2022-06-19 09:06:16 +03:00
committed by GitHub
parent 88719292e9
commit 9f7a4899fa
74 changed files with 646 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
orx-jvm/orx-olive/build.gradle
View File

@@ -12,16 +12,17 @@ dependencies {
implementation project(":orx-jvm:orx-file-watcher")
implementation project(":orx-jvm:orx-kotlin-parser")
implementation "org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-scripting-jsr223:$kotlinVersion"
implementation libs.kotlin.scriptingJvm
implementation libs.kotlin.scriptingJvmHost
implementation libs.kotlin.reflect
implementation libs.kotlin.scriptingJSR223
demoImplementation(project(":orx-camera"))
demoImplementation("org.openrndr:openrndr-application:$openrndrVersion")
demoImplementation("org.openrndr:openrndr-extensions:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3:$openrndrVersion")
demoRuntimeOnly("org.openrndr:openrndr-gl3-natives-$openrndrOS:$openrndrVersion")
demoImplementation(libs.openrndr.application)
demoImplementation(libs.openrndr.extensions)
demoRuntimeOnly(libs.openrndr.gl3)
demoRuntimeOnly(libs.openrndr.gl3.natives)
demoImplementation(sourceSets.getByName("main").output)
}

34
orx-jvm/orx-olive/src/main/kotlin/Olive.kt
View File

@@ -1,5 +1,6 @@
package org.openrndr.extra.olive
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import mu.KotlinLogging
@@ -67,6 +68,7 @@ class Olive<P : Program>(val resources: Resources? = null, private var scriptMod
private var watcher: (() -> Unit)? = null
@OptIn(DelicateCoroutinesApi::class)
override fun setup(program: Program) {
System.setProperty("idea.io.use.fallback", "true")
System.setProperty("org.openrndr.ignoreShadeStyleErrors", "true")
@@ -74,22 +76,22 @@ class Olive<P : Program>(val resources: Resources? = null, private var scriptMod
val store = mutableMapOf<Event<*>, List<(Any) -> Unit>>()
val originalExtensions = program.extensions.map { it }
val trackedListeners = listOf<Event<*>>(program.mouse.buttonDown,
program.mouse.buttonUp,
program.mouse.clicked,
program.mouse.dragged,
program.mouse.moved,
program.mouse.scrolled,
program.keyboard.keyUp,
program.keyboard.keyDown,
program.keyboard.keyRepeat,
program.window.drop,
program.window.focused,
program.window.minimized,
program.window.moved,
program.window.sized,
program.window.unfocused,
program.requestAssets,
program.produceAssets
program.mouse.buttonUp,
program.mouse.clicked,
program.mouse.dragged,
program.mouse.moved,
program.mouse.scrolled,
program.keyboard.keyUp,
program.keyboard.keyDown,
program.keyboard.keyRepeat,
program.window.drop,
program.window.focused,
program.window.minimized,
program.window.moved,
program.window.sized,
program.window.unfocused,
program.requestAssets,
program.produceAssets
)
trackedListeners.forEach { it.saveListeners(store) }