Merge 3299027 into ee54371

Author: Ogeon

.github/workflows/ci.yml

@@ -31,15 +31,17 @@ jobs:
       - name: find-crate check
         run: cargo check -v -p palette --no-default-features --features "std find-crate"
       - name: Default check
-        run: cargo check -v --workspace --exclude no_std_test
-      - run: cargo test -v
+        run: cargo check -v -p palette
+      - name: Full check
+        run: cargo check -v -p palette --all-features
+      - run: cargo test -v -p palette --all-features
       - name: Test features
         shell: bash
         working-directory: palette
         run: bash ../scripts/test_features.sh
       - name: "Test #[no_std]"
         if: ${{ runner.os == 'Linux' && matrix.toolchain == 'nightly' }}
-        run: cargo build -v --package no_std_test --features nightly --target thumbv6m-none-eabi
+        run: cargo build -v --package no_std_test --all-features --target thumbv6m-none-eabi
   miri:
     name: Miri tests
     runs-on: ubuntu-latest

.vscode/settings.json

@@ -3,9 +3,10 @@
         "random",
         "serializing",
         "bytemuck",
-        "wide"
+        "wide",
+        "cam16"
     ],
     "rust-analyzer.imports.granularity.enforce": true,
     "rust-analyzer.imports.granularity.group": "crate",
     "rust-analyzer.imports.group.enable": true
-}
+}

no_std_test/Cargo.toml

@@ -14,6 +14,7 @@ bench = false
 
 [features]
 nightly = []
+all_features = ["palette/libm", "palette/named_from_str", "palette/cam16"]
 
 [dependencies.libc]
 version = "0.2"
@@ -22,4 +23,3 @@ default-features = false
 [dependencies.palette]
 path = "../palette"
 default-features = false
-features = ["libm", "named_from_str"]

palette/Cargo.toml

@@ -28,6 +28,7 @@ build = "build/main.rs"
 
 [features]
 default = ["named_from_str", "std", "approx"]
+cam16 = ["palette_derive/cam16"]
 named_from_str = ["named", "phf"]
 named = []
 random = ["rand"]

palette/src/cam16.rs

@@ -0,0 +1,88 @@
+//! Types for the CIE CAM16 color appearance model.
+
+use crate::{
+    angle::{RealAngle, SignedAngle},
+    bool_mask::LazySelect,
+    num::{Abs, Arithmetics, One, PartialCmp, Powf, Real, Signum, Sqrt, Trigonometry, Zero},
+    white_point::{self},
+    Xyz,
+};
+
+pub use full::*;
+pub use parameters::*;
+pub use partial::*;
+pub use ucs_jab::*;
+pub use ucs_jmh::*;
+
+mod full;
+mod math;
+mod parameters;
+mod partial;
+mod ucs_jab;
+mod ucs_jmh;
+
+/// Converts a color to CAM16, using a set of parameters.
+pub trait IntoCam16<WpParam, T> {
+    /// Convert `self` into CAM16, with `parameters` that describe the viewing
+    /// conditions.
+    fn into_cam16(self, parameters: BakedParameters<WpParam, T>) -> Cam16<T>;
+}
+
+impl<WpParam, T> IntoCam16<WpParam, T> for Xyz<WpParam::StaticWp, T>
+where
+    WpParam: WhitePointParameter<T>,
+    T: Real + Arithmetics + Powf + Sqrt + Abs + Signum + Trigonometry + RealAngle + Clone,
+{
+    fn into_cam16(self, parameters: BakedParameters<WpParam, T>) -> Cam16<T> {
+        math::xyz_to_cam16(self.with_white_point(), parameters.inner)
+    }
+}
+
+/// Converts CAM16 to a color, using a set of parameters.
+pub trait FromCam16<WpParam, T>: Sized {
+    /// Convert `cam16` into `Self`, with `parameters` that describe the viewing
+    /// conditions.
+    fn from_cam16(cam16: Cam16<T>, parameters: BakedParameters<WpParam, T>) -> Self {
+        Self::from_partial_cam16(DynPartialCam16::from(cam16), parameters)
+    }
+
+    /// Convert the partially specified `cam16` into `Self`, with `parameters`
+    /// that describe the viewing conditions.
+    fn from_partial_cam16<L, C>(
+        cam16: PartialCam16<T, L, C>,
+        parameters: BakedParameters<WpParam, T>,
+    ) -> Self
+    where
+        L: Cam16Luminance<T>,
+        C: Cam16Chromaticity<T>;
+}
+
+impl<WpParam, T> FromCam16<WpParam, T> for Xyz<WpParam::StaticWp, T>
+where
+    WpParam: WhitePointParameter<T>,
+    T: Real
+        + One
+        + Zero
+        + Sqrt
+        + Powf
+        + Abs
+        + Signum
+        + Arithmetics
+        + Trigonometry
+        + RealAngle
+        + SignedAngle
+        + PartialCmp
+        + Clone,
+    T::Mask: LazySelect<Xyz<white_point::Any, T>>,
+{
+    fn from_partial_cam16<L, C>(
+        cam16: PartialCam16<T, L, C>,
+        parameters: BakedParameters<WpParam, T>,
+    ) -> Self
+    where
+        L: Cam16Luminance<T>,
+        C: Cam16Chromaticity<T>,
+    {
+        math::cam16_to_xyz(cam16.into_dynamic(), parameters.inner).with_white_point()
+    }
+}