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

Upgrade to JDK 17. Add @JvmRecord annotations

Browse Source
This commit is contained in:
Edwin Jakobs
2024-06-01 07:31:44 +02:00
parent 06f593053b
commit 78fbff54c5
38 changed files with 94 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orx-color/src/commonMain/kotlin/spaces/ColorHPLUVa.kt
View File

@@ -4,8 +4,10 @@ import kotlinx.serialization.Serializable
import org.openrndr.color.*
import org.openrndr.math.Vector4
import org.openrndr.math.mixAngle
import kotlin.jvm.JvmRecord
@Serializable
@JvmRecord
data class ColorHPLUVa(val h: Double, val s: Double, val l: Double, override val alpha: Double = 1.0) :
ColorModel<ColorHPLUVa>,
HueShiftableColor<ColorHPLUVa>,

4
orx-color/src/commonMain/kotlin/spaces/ColorHSLUVa.kt
View File

@@ -5,6 +5,7 @@ import org.openrndr.color.*
import org.openrndr.math.Vector4
import org.openrndr.math.map
import org.openrndr.math.mixAngle
import kotlin.jvm.JvmRecord
import kotlin.math.*
private val m = arrayOf(
@@ -81,6 +82,7 @@ private fun maxChromaForLH(L100: Double, H: Double): Double {
* HSLUV color space
*/
@Serializable
@JvmRecord
data class ColorHSLUVa(val h: Double, val s: Double, val l: Double, override val alpha: Double = 1.0) :
ColorModel<ColorHSLUVa>,
HueShiftableColor<ColorHSLUVa>,
@@ -89,8 +91,6 @@ data class ColorHSLUVa(val h: Double, val s: Double, val l: Double, override val
LuminosityColor<ColorHSLUVa>,
AlgebraicColor<ColorHSLUVa> {
@Deprecated("Legacy alpha parameter name", ReplaceWith("alpha"))
val a = alpha
fun toLCHUVa(): ColorLCHUVa {

4
orx-color/src/commonMain/kotlin/spaces/ColorOKHSLa.kt
View File

@@ -4,10 +4,12 @@ import kotlinx.serialization.Serializable
import org.openrndr.color.*
import org.openrndr.math.Vector4
import org.openrndr.math.mixAngle
import kotlin.jvm.JvmRecord
import kotlin.math.*
@Suppress("LocalVariableName")
@Serializable
@JvmRecord
data class ColorOKHSLa(val h: Double, val s: Double, val l: Double, override val alpha: Double = 1.0) :
ColorModel<ColorOKHSLa>,
HueShiftableColor<ColorOKHSLa>,
@@ -52,8 +54,6 @@ data class ColorOKHSLa(val h: Double, val s: Double, val l: Double, override val
}
}
@Deprecated("Legacy alpha parameter name", ReplaceWith("alpha"))
val a = alpha
override fun toRGBa(): ColorRGBa {
if (l == 0.0 || l == 1.0) {

5
orx-color/src/commonMain/kotlin/spaces/ColorOKHSVa.kt
View File

@@ -4,10 +4,12 @@ import kotlinx.serialization.Serializable
import org.openrndr.color.*
import org.openrndr.math.Vector4
import org.openrndr.math.mixAngle
import kotlin.jvm.JvmRecord
import kotlin.math.*
@Suppress("LocalVariableName")
@Serializable
@JvmRecord
data class ColorOKHSVa(val h: Double, val s: Double, val v: Double, override val alpha: Double = 1.0) :
ColorModel<ColorOKHSVa>,
HueShiftableColor<ColorOKHSVa>,
@@ -54,9 +56,6 @@ data class ColorOKHSVa(val h: Double, val s: Double, val v: Double, override val
}
}
@Deprecated("Legacy alpha parameter name", ReplaceWith("alpha"))
val a = alpha
override fun toRGBa(): ColorRGBa {
val a_ = cos(2 * PI * h / 360.0)
val b_ = sin(2 * PI * h / 360.0)

2
orx-color/src/commonMain/kotlin/spaces/ColorOKLABa.kt
View File

@@ -3,6 +3,7 @@ package org.openrndr.extra.color.spaces
import kotlinx.serialization.Serializable
import org.openrndr.color.*
import org.openrndr.math.Vector4
import kotlin.jvm.JvmRecord
import kotlin.math.abs
import kotlin.math.pow
import kotlin.math.sign
@@ -15,6 +16,7 @@ import kotlin.math.sign
*/
@Suppress("LocalVariableName")
@Serializable
@JvmRecord
data class ColorOKLABa(val l: Double, val a: Double, val b: Double, override val alpha: Double = 1.0) :
ColorModel<ColorOKLABa>,
ShadableColor<ColorOKLABa>,

5
orx-color/src/commonMain/kotlin/spaces/ColorOKLCHa.kt
View File

@@ -3,12 +3,14 @@ package org.openrndr.extra.color.spaces
import kotlinx.serialization.Serializable
import org.openrndr.color.*
import org.openrndr.math.*
import kotlin.jvm.JvmRecord
import kotlin.math.*
/**
* Color in cylindrical OKLab space
*/
@Serializable
@JvmRecord
data class ColorOKLCHa(val l: Double, val c: Double, val h: Double, override val alpha: Double = 1.0) :
ColorModel<ColorOKLCHa>,
ShadableColor<ColorOKLCHa>,
@@ -31,9 +33,6 @@ data class ColorOKLCHa(val l: Double, val c: Double, val h: Double, override val
}
}
@Deprecated("Legacy alpha parameter name", ReplaceWith("alpha"))
val a = alpha
override fun opacify(factor: Double) = copy(alpha = alpha * factor)
override fun shade(factor: Double) = copy(l = l * factor)

4
orx-color/src/commonMain/kotlin/spaces/ColorXSLUVa.kt
View File

@@ -5,8 +5,10 @@ import org.openrndr.color.*
import org.openrndr.math.Vector4
import org.openrndr.math.map
import org.openrndr.math.mixAngle
import kotlin.jvm.JvmRecord
@Serializable
@JvmRecord
data class ColorXSLUVa(val x: Double, val s: Double, val l: Double, override val alpha: Double = 1.0) :
ColorModel<ColorXSLUVa>,
HueShiftableColor<ColorXSLUVa>,
@@ -14,8 +16,6 @@ data class ColorXSLUVa(val x: Double, val s: Double, val l: Double, override val
ShadableColor<ColorXSLUVa>,
AlgebraicColor<ColorXSLUVa> {
@Deprecated("Legacy alpha parameter name", ReplaceWith("alpha"))
val a = alpha
override val hue: Double
get() = x
override fun withHue(hue: Double): ColorXSLUVa = copy(x = hue)