From 93b607265cc7eeeece4840a532be4919d245451a Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Sat, 13 Mar 2021 19:25:17 +0100
Subject: [PATCH] [orx-color] Fix package name, add Saturatable to ColorOKLCHa

---
 orx-color/src/demo/kotlin/DemoColorPlane01.kt   | 2 +-
 orx-color/src/demo/kotlin/DemoColorPlane02.kt   | 2 +-
 orx-color/src/demo/kotlin/DemoColorRange03.kt   | 4 ++--
 orx-color/src/demo/kotlin/DemoColorRange04.kt   | 4 ++--
 orx-color/src/main/kotlin/palettes/Palettes.kt  | 4 ----
 orx-color/src/main/kotlin/spaces/ColorOKLABa.kt | 2 +-
 orx-color/src/main/kotlin/spaces/ColorOKLCHa.kt | 4 +++-
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/orx-color/src/demo/kotlin/DemoColorPlane01.kt b/orx-color/src/demo/kotlin/DemoColorPlane01.kt
index c88f0b25..a63f6b04 100644
--- a/orx-color/src/demo/kotlin/DemoColorPlane01.kt
+++ b/orx-color/src/demo/kotlin/DemoColorPlane01.kt
@@ -3,9 +3,9 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
 import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extras.camera.Orbital
+import org.openrndr.extras.color.spaces.ColorOKLCHa
 import org.openrndr.extras.meshgenerators.sphereMesh
 import org.openrndr.math.Vector3
-import spaces.ColorOKLCHa
 import kotlin.math.cos
 
 fun main() {
diff --git a/orx-color/src/demo/kotlin/DemoColorPlane02.kt b/orx-color/src/demo/kotlin/DemoColorPlane02.kt
index 08b6a9a6..7a9d9e76 100644
--- a/orx-color/src/demo/kotlin/DemoColorPlane02.kt
+++ b/orx-color/src/demo/kotlin/DemoColorPlane02.kt
@@ -3,9 +3,9 @@ import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
 import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extras.camera.Orbital
+import org.openrndr.extras.color.spaces.ColorOKLCHa
 import org.openrndr.extras.meshgenerators.sphereMesh
 import org.openrndr.math.Vector3
-import spaces.ColorOKLCHa
 import kotlin.math.cos
 
 fun main() {
diff --git a/orx-color/src/demo/kotlin/DemoColorRange03.kt b/orx-color/src/demo/kotlin/DemoColorRange03.kt
index 3a49176f..24efb0af 100644
--- a/orx-color/src/demo/kotlin/DemoColorRange03.kt
+++ b/orx-color/src/demo/kotlin/DemoColorRange03.kt
@@ -4,9 +4,9 @@ import org.openrndr.draw.loadFont
 import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extras.color.palettes.rangeTo
 import org.openrndr.extras.color.spaces.toHSLUVa
+import org.openrndr.extras.color.spaces.toOKLABa
+import org.openrndr.extras.color.spaces.toOKLCHa
 import org.openrndr.extras.color.spaces.toXSLUVa
-import spaces.toOKLABa
-import spaces.toOKLCHa
 
 fun main() {
     application {
diff --git a/orx-color/src/demo/kotlin/DemoColorRange04.kt b/orx-color/src/demo/kotlin/DemoColorRange04.kt
index 7b449701..b3dc7af8 100644
--- a/orx-color/src/demo/kotlin/DemoColorRange04.kt
+++ b/orx-color/src/demo/kotlin/DemoColorRange04.kt
@@ -7,11 +7,11 @@ import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extras.camera.Orbital
 import org.openrndr.extras.color.palettes.rangeTo
 import org.openrndr.extras.color.spaces.toHSLUVa
+import org.openrndr.extras.color.spaces.toOKLABa
+import org.openrndr.extras.color.spaces.toOKLCHa
 import org.openrndr.extras.color.spaces.toXSLUVa
 import org.openrndr.extras.meshgenerators.sphereMesh
 import org.openrndr.math.Vector3
-import spaces.toOKLABa
-import spaces.toOKLCHa
 
 fun main() {
     application {
diff --git a/orx-color/src/main/kotlin/palettes/Palettes.kt b/orx-color/src/main/kotlin/palettes/Palettes.kt
index 47d29f36..c8d3126a 100644
--- a/orx-color/src/main/kotlin/palettes/Palettes.kt
+++ b/orx-color/src/main/kotlin/palettes/Palettes.kt
@@ -2,10 +2,6 @@ package org.openrndr.extras.color.palettes
 
 import org.openrndr.color.*
 import org.openrndr.extras.color.spaces.*
-import spaces.ColorOKLABa
-import spaces.ColorOKLCHa
-import spaces.toOKLABa
-import spaces.toOKLCHa
 
 
 fun <T> colorSequence(vararg offsets: Pair<Double, T>): ColorSequence
diff --git a/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt b/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt
index 3ef51fe6..19d38a07 100644
--- a/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt
+++ b/orx-color/src/main/kotlin/spaces/ColorOKLABa.kt
@@ -1,4 +1,4 @@
-package spaces
+package org.openrndr.extras.color.spaces
 
 import org.openrndr.color.*
 import kotlin.math.pow
diff --git a/orx-color/src/main/kotlin/spaces/ColorOKLCHa.kt b/orx-color/src/main/kotlin/spaces/ColorOKLCHa.kt
index b2bd581e..e445445d 100644
--- a/orx-color/src/main/kotlin/spaces/ColorOKLCHa.kt
+++ b/orx-color/src/main/kotlin/spaces/ColorOKLCHa.kt
@@ -1,4 +1,4 @@
-package spaces
+package org.openrndr.extras.color.spaces
 
 import org.openrndr.color.*
 import org.openrndr.math.mixAngle
@@ -14,6 +14,7 @@ data class ColorOKLCHa(val l: Double, val c: Double, val h: Double, val a: Doubl
     OpacifiableColor<ColorOKLCHa>,
     ShadableColor<ColorOKLCHa>,
     HueShiftableColor<ColorOKLCHa>,
+    SaturatableColor<ColorOKLCHa>,
     AlgebraicColor<ColorOKLCHa> {
 
     companion object {
@@ -33,6 +34,7 @@ data class ColorOKLCHa(val l: Double, val c: Double, val h: Double, val a: Doubl
     override fun opacify(factor: Double) = copy(a = a * factor)
     override fun shade(factor: Double) = copy(l = l * factor)
     override fun shiftHue(shiftInDegrees: Double) = copy(h = h + shiftInDegrees)
+    override fun saturate(factor: Double) = copy(c = c * factor)
 
     override fun plus(right: ColorOKLCHa) = copy(l = l + right.l, c = c + right.c, h = h + right.h, a = a + right.a)
     override fun minus(right: ColorOKLCHa) = copy(l = l - right.l, c = c - right.c, h = h - right.h, a = a - right.a)