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

Add threaded script loading to orx-olive

Browse Source
This commit is contained in:
Edwin Jakobs
2020-02-08 13:55:10 +01:00
parent c30c71ac0d
commit 26ea9a48f6
2 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,21 @@
package org.openrndr.extra.olive
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import mu.KotlinLogging
import org.openrndr.Extension
import org.openrndr.Program
import org.openrndr.draw.Session
import org.openrndr.events.Event
import org.openrndr.launch
import org.operndr.extras.filewatcher.stop
import org.operndr.extras.filewatcher.triggerChange
import org.operndr.extras.filewatcher.watchFile
import java.io.File
private val logger = KotlinLogging.logger {}
private fun <T> Event<T>.saveListeners(store: MutableMap<Event<*>, List<(Any) -> Unit>>) {
@Suppress("UNCHECKED_CAST")
store[this] = listeners.map { it } as List<(Any) -> Unit>
@@ -89,17 +96,30 @@ class Olive<P : Program>(val resources: Resources? = null) : Extension {
watcher = program.watchFile(File(script)) {
try {
val func = loadFromScript<P.()->Unit>(it)
val futureFunc = GlobalScope.async {
val start = System.currentTimeMillis()
val f = loadFromScript<P.() -> Unit>(it)
val end = System.currentTimeMillis()
logger.info { "loading script took ${end - start}ms" }
f
}
program.extensions.clear()
program.extensions.addAll(originalExtensions)
program.launch {
val func = futureFunc.await()
program.extensions.clear()
program.extensions.addAll(originalExtensions)
trackedListeners.forEach { l -> l.restoreListeners(store) }
session?.end()
session = Session.root.fork()
trackedListeners.forEach { l -> l.restoreListeners(store) }
session?.end()
session = Session.root.fork()
@Suppress("UNCHECKED_CAST")
func(program as P)
Unit
}
Unit
@Suppress("UNCHECKED_CAST")
func(program as P)
} catch (e: Throwable) {
e.printStackTrace()
}