diff --git a/build.gradle b/build.gradle index 482837f1..39245755 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ def openrndrUseSnapshot = false apply plugin: 'org.jetbrains.dokka' project.ext { - openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.47-rc.1" + openrndrVersion = openrndrUseSnapshot? "0.4.0-SNAPSHOT" : "0.3.47-rc.2" kotlinVersion = "1.4.31" spekVersion = "2.0.15" libfreenectVersion = "0.5.7-1.5.4" diff --git a/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt b/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt index 19d38a07..acac1269 100644 --- a/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt +++ b/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt @@ -1,6 +1,8 @@ package org.openrndr.extras.color.spaces import org.openrndr.color.* +import org.openrndr.math.CastableToVector4 +import org.openrndr.math.Vector4 import kotlin.math.pow /** @@ -8,6 +10,7 @@ import kotlin.math.pow */ data class ColorOKLABa(val l: Double, val a: Double, val b: Double, val alpha: Double = 1.0) : ConvertibleToColorRGBa, + CastableToVector4, ShadableColor, OpacifiableColor, AlgebraicColor { @@ -57,6 +60,8 @@ data class ColorOKLABa(val l: Double, val a: Double, val b: Double, val alpha: D override fun minus(right: ColorOKLABa) = ColorOKLABa(l - right.l, a - right.a, b - right.b, alpha - right.alpha) override fun plus(right: ColorOKLABa) = ColorOKLABa(l + right.l, a + right.a, b + right.b, alpha + right.alpha) override fun times(scale: Double) = ColorOKLABa(l * scale, a * scale, b * scale, alpha * scale) + + override fun toVector4() = Vector4(l, a, b, alpha) } fun ColorRGBa.toOKLABa() = ColorOKLABa.fromRGBa(this) \ No newline at end of file