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

[orx-chataigne] Remove verbosity, change layout, exclude demo from actions

Browse Source
This commit is contained in:
Edwin Jakobs
2020-06-30 13:50:24 +02:00
parent b0a0c7d674
commit fee5475fe9
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -179,6 +179,8 @@ task collectScreenshots {
continue
if (sub.name == "orx-runway")
continue
if (sub.name == "orx-chataigne")
continue
def set = sub.sourceSets.demo
def ucl = new URLClassLoader(set.runtimeClasspath.collect { it.toURI().toURL() } as URL[])

25
orx-chataigne/src/main/kotlin/ChataigneOSC.kt
View File

@@ -1,12 +1,15 @@
import mu.KotlinLogging
import org.openrndr.color.ColorRGBa
import org.openrndr.extra.osc.OSC
import java.awt.Color
import kotlin.reflect.KProperty
private val logger = KotlinLogging.logger {}
open class ChataigneOSC(
val osc: OSC
) {
inner class DoubleChannel(key:String) {
inner class DoubleChannel(key: String) {
private var currentDouble = 0.0
init {
@@ -15,32 +18,26 @@ open class ChataigneOSC(
}
}
operator fun getValue(thisRef: Any?, property: KProperty<*>):Double {
operator fun getValue(thisRef: Any?, property: KProperty<*>): Double {
return currentDouble
}
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Double) {
print("$value")
}
}
inner class ColorChannel(key:String) {
inner class ColorChannel(key: String) {
private var currentColor = ColorRGBa.BLACK
init {
println(key)
osc.listen(key) {
val c = it[0] as Color
currentColor = ColorRGBa(c.red/255.0, c.green/255.0, c.blue/255.0, c.alpha/255.0)
currentColor = ColorRGBa(c.red / 255.0, c.green / 255.0, c.blue / 255.0, c.alpha / 255.0)
}
}
operator fun getValue(thisRef: Any?, property: KProperty<*>):ColorRGBa {
operator fun getValue(thisRef: Any?, property: KProperty<*>): ColorRGBa {
return currentColor
}
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Double) {
print("$value")
}
}
fun update(seconds: Double) {
@@ -48,6 +45,8 @@ open class ChataigneOSC(
}
init {
println("setup Chataigne with OSC ${osc.address} in:${osc.portIn} out:${osc.portOut}")
logger.info {
"setup Chataigne with OSC ${osc.address} in:${osc.portIn} out:${osc.portOut}"
}
}
}