From 58d1321c30cfa42aa053ab72d0e6c36d51c24d48 Mon Sep 17 00:00:00 2001 From: propensive Date: Wed, 5 Jun 2024 20:29:30 +0000 Subject: [PATCH 1/2] Apply automatic changes --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ebe3ac0..56419d8 100644 --- a/readme.md +++ b/readme.md @@ -179,7 +179,7 @@ as long as caution is taken to avoid a mismatch between the project's stability level and the required stability and maintainability of your own project. Iridescence is designed to be _small_. Its entire source code currently consists -of 442 lines of code. +of 489 lines of code. ## Building From 31769afe695974960992eb3f316d29efe7554e9e Mon Sep 17 00:00:00 2001 From: Jon Pretty Date: Thu, 6 Jun 2024 09:52:29 +0200 Subject: [PATCH 2/2] More renames of `RgbColor` --- src/core/iridescence.Cielab.scala | 2 +- src/core/iridescence.Cmy.scala | 2 +- src/core/iridescence.Cmyk.scala | 2 +- src/core/iridescence.Hsl.scala | 2 +- src/core/iridescence.Hsv.scala | 2 +- src/core/iridescence.Rgb12Opaque.scala | 2 +- src/core/iridescence.Rgb24Opaque.scala | 2 +- src/core/iridescence.Rgb32Opaque.scala | 2 +- src/core/iridescence.Srgb.scala | 2 +- src/core/iridescence.Xyz.scala | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/iridescence.Cielab.scala b/src/core/iridescence.Cielab.scala index d13881f..7cd8d2b 100644 --- a/src/core/iridescence.Cielab.scala +++ b/src/core/iridescence.Cielab.scala @@ -24,7 +24,7 @@ import anticipation.* import hypotenuse.* object Cielab: - given (using ColorProfile) => Cielab is RgbColor = _.srgb.rgb24.asInt + given (using ColorProfile) => Cielab is Chromatic = _.srgb.rgb24.asInt case class Cielab(l: Double, a: Double, b: Double): def srgb(using ColorProfile): Srgb = xyz.srgb diff --git a/src/core/iridescence.Cmy.scala b/src/core/iridescence.Cmy.scala index 60a5fc3..e421016 100644 --- a/src/core/iridescence.Cmy.scala +++ b/src/core/iridescence.Cmy.scala @@ -23,7 +23,7 @@ import scala.util.chaining.* import anticipation.* object Cmy: - given Cmy is RgbColor = _.srgb.rgb24.asInt + given Cmy is Chromatic = _.srgb.rgb24.asInt case class Cmy(cyan: Double, magenta: Double, yellow: Double): def srgb: Srgb = Srgb((1 - cyan), (1 - magenta), (1 - yellow)) diff --git a/src/core/iridescence.Cmyk.scala b/src/core/iridescence.Cmyk.scala index b641be4..c282025 100644 --- a/src/core/iridescence.Cmyk.scala +++ b/src/core/iridescence.Cmyk.scala @@ -23,7 +23,7 @@ import scala.util.chaining.* import anticipation.* object Cmyk: - given Cmyk is RgbColor = _.srgb.rgb24.asInt + given Cmyk is Chromatic = _.srgb.rgb24.asInt case class Cmyk(cyan: Double, magenta: Double, yellow: Double, key: Double): def srgb: Srgb = cmy.srgb diff --git a/src/core/iridescence.Hsl.scala b/src/core/iridescence.Hsl.scala index fd6b3a8..3eeba03 100644 --- a/src/core/iridescence.Hsl.scala +++ b/src/core/iridescence.Hsl.scala @@ -23,7 +23,7 @@ import scala.util.chaining.* import anticipation.* object Hsl: - given Hsl is RgbColor = _.srgb.rgb24.asInt + given Hsl is Chromatic = _.srgb.rgb24.asInt case class Hsl(hue: Double, saturation: Double, lightness: Double): def saturate: Hsv = Hsv(hue, 1, lightness) diff --git a/src/core/iridescence.Hsv.scala b/src/core/iridescence.Hsv.scala index 724fc94..b060d84 100644 --- a/src/core/iridescence.Hsv.scala +++ b/src/core/iridescence.Hsv.scala @@ -23,7 +23,7 @@ import scala.util.chaining.* import anticipation.* object Hsv: - given Hsv is RgbColor = _.srgb.rgb24.asInt + given Hsv is Chromatic = _.srgb.rgb24.asInt case class Hsv(hue: Double, saturation: Double, value: Double): def saturate: Hsv = Hsv(hue, 1, value) diff --git a/src/core/iridescence.Rgb12Opaque.scala b/src/core/iridescence.Rgb12Opaque.scala index 8018535..263bd4c 100644 --- a/src/core/iridescence.Rgb12Opaque.scala +++ b/src/core/iridescence.Rgb12Opaque.scala @@ -26,7 +26,7 @@ object Rgb12Opaque: object Rgb12: given underlying: Underlying[Rgb12, Int] = ### - given Rgb12 is RgbColor = _.srgb.rgb24.asInt + given Rgb12 is Chromatic = _.srgb.rgb24.asInt def apply(red: Int, green: Int, blue: Int): Rgb12 = ((red&15) << 8) + ((green&15) << 4) + (blue&15) diff --git a/src/core/iridescence.Rgb24Opaque.scala b/src/core/iridescence.Rgb24Opaque.scala index e8f1244..77c6be5 100644 --- a/src/core/iridescence.Rgb24Opaque.scala +++ b/src/core/iridescence.Rgb24Opaque.scala @@ -26,7 +26,7 @@ object Rgb24Opaque: object Rgb24: given underlying: Underlying[Rgb24, Int] = ### - given Rgb24 is RgbColor = _.asInt + given Rgb24 is Chromatic = _.asInt def apply(red: Int, green: Int, blue: Int): Rgb24 = ((red&255) << 16) + ((green&255) << 8) + (blue&255) def apply(packedInt: Int): Rgb24 = packedInt & 0x00ffffff diff --git a/src/core/iridescence.Rgb32Opaque.scala b/src/core/iridescence.Rgb32Opaque.scala index 7697446..42dedf9 100644 --- a/src/core/iridescence.Rgb32Opaque.scala +++ b/src/core/iridescence.Rgb32Opaque.scala @@ -26,7 +26,7 @@ object Rgb32Opaque: object Rgb32: given underlying: Underlying[Rgb32, Int] = ### - given Rgb32 is RgbColor = _.srgb.rgb24.asInt + given Rgb32 is Chromatic = _.srgb.rgb24.asInt def apply(red: Int, green: Int, blue: Int): Rgb32 = ((red&1023) << 22) + ((green&4095) << 10) + (blue&1023) diff --git a/src/core/iridescence.Srgb.scala b/src/core/iridescence.Srgb.scala index 6a2d680..f29e2ac 100644 --- a/src/core/iridescence.Srgb.scala +++ b/src/core/iridescence.Srgb.scala @@ -26,7 +26,7 @@ import rudiments.* object Srgb: - given Srgb is RgbColor = _.rgb24.asInt + given Srgb is Chromatic = _.rgb24.asInt case class Srgb(red: Double, green: Double, blue: Double): def css: Text = Text(s"rgb(${(red*255).toInt}, ${(green*255).toInt}, ${(blue*255).toInt})") diff --git a/src/core/iridescence.Xyz.scala b/src/core/iridescence.Xyz.scala index 2653f75..1e3e084 100644 --- a/src/core/iridescence.Xyz.scala +++ b/src/core/iridescence.Xyz.scala @@ -24,7 +24,7 @@ import anticipation.* import hypotenuse.* object Xyz: - given Xyz is RgbColor = _.srgb.rgb24.asInt + given Xyz is Chromatic = _.srgb.rgb24.asInt case class Xyz(x: Double, y: Double, z: Double): def luminescence: Double = y