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

[orx-color] Color model changes (#246)

Browse Source
This commit is contained in:
Vechro
2022-07-11 16:40:05 +03:00
committed by GitHub
parent 82502d9d54
commit 5b7327eda1
11 changed files with 218 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orx-jvm/orx-gui/src/main/kotlin/Gui.kt
View File

@@ -194,7 +194,7 @@ class GUI(val baseColor:ColorRGBa = ColorRGBa.GRAY, val defaultStyles: List<Styl
this.width = 100.percent
this.display = Display.FLEX
this.flexDirection = FlexDirection.Row
this.background = Color.RGBa(baseColor.copy(a = 0.99))
this.background = Color.RGBa(baseColor.copy(alpha = 0.99))
}
styleSheet(has class_ "collapsed") {
@@ -213,7 +213,7 @@ class GUI(val baseColor:ColorRGBa = ColorRGBa.GRAY, val defaultStyles: List<Styl
this.paddingRight = 10.px
this.marginRight = 2.px
this.height = 100.percent
this.background = Color.RGBa(baseColor.copy(a = 0.99))
this.background = Color.RGBa(baseColor.copy(alpha = 0.99))
this.overflow = Overflow.Scroll
//<editor-fold desc="1) setup control style">
@@ -881,7 +881,7 @@ class GUI(val baseColor:ColorRGBa = ColorRGBa.GRAY, val defaultStyles: List<Styl
}
ParameterType.Color -> {
val currentValue = (parameter.property as KMutableProperty1<Any, ColorRGBa>).get(labeledObject.obj)
val randomValue = ColorRGBa(Math.random(), Math.random(), Math.random(), currentValue.a)
val randomValue = ColorRGBa(Math.random(), Math.random(), Math.random(), currentValue.alpha)
val newValue = ColorRGBa((1.0 - strength) * currentValue.r + randomValue.r * strength,
(1.0 - strength) * currentValue.g + randomValue.g * strength,
(1.0 - strength) * currentValue.b + randomValue.b * strength)

2
orx-jvm/orx-keyframer/src/main/kotlin/Keyframer.kt
View File

@@ -86,7 +86,7 @@ open class Keyframer {
}
inner class RGBaChannel(keys: Array<String>, defaultValue: ColorRGBa = ColorRGBa.WHITE) :
CompoundChannel(keys, arrayOf(defaultValue.r, defaultValue.g, defaultValue.b, defaultValue.a)) {
CompoundChannel(keys, arrayOf(defaultValue.r, defaultValue.g, defaultValue.b, defaultValue.alpha)) {
operator fun getValue(keyframer: Keyframer, property: KProperty<*>): ColorRGBa =
ColorRGBa(getValue(0), getValue(1), getValue(2), getValue(3))
}

2
orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt
View File

@@ -217,7 +217,7 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true,
ParameterType.Color -> {
val param = rabbitServer.createRGBAParameter(it.label)
val c = (it.property as KMutableProperty1<Any, ColorRGBa>).get(objectWithParameters)
param.value = Color(c.r.toFloat(), c.g.toFloat(), c.b.toFloat(), c.a.toFloat())
param.value = Color(c.r.toFloat(), c.g.toFloat(), c.b.toFloat(), c.alpha.toFloat())
param
}
ParameterType.Vector2 -> {