From 67164e35fa980f73f176841a129aead66b9ce554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Fri, 10 Jan 2025 14:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E4=BA=8EOklch?= =?UTF-8?q?=E7=9A=84=E8=89=B2=E7=9B=B8=E5=88=86=E7=95=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- color-module/src/color_card.rs | 20 ++++++++++---------- src/color_functions/color_module_bg.wasm | Bin 499128 -> 499128 bytes 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/color-module/src/color_card.rs b/color-module/src/color_card.rs index a6636fc..e9edab6 100644 --- a/color-module/src/color_card.rs +++ b/color-module/src/color_card.rs @@ -20,7 +20,7 @@ pub struct ColorDescription { const COLOR_CARDS_JSON: &str = include_str!("colorcards.json"); pub const COLOR_CARDS: LazyLock> = LazyLock::new(|| serde_json::from_str(COLOR_CARDS_JSON).expect("Failed to parse color cards")); -const CHROMA_EPSILON: f32 = 0.0001; +const CHROMA_EPSILON: f32 = 0.02; #[derive(Debug, Clone, PartialEq, Display, EnumString, EnumIter)] #[strum(serialize_all = "lowercase")] @@ -42,7 +42,7 @@ pub enum Category { impl Category { pub fn from_oklch_components(lightness: f32, chroma: f32, hue: f32) -> Self { if chroma < CHROMA_EPSILON { - if lightness < 0.1 { + if lightness < 0.15 { Category::Black } else if lightness > 0.9 { Category::White @@ -52,15 +52,15 @@ impl Category { } else { let processed_hue = hue % 360.0; match processed_hue { - 0.0..=30.0 => Category::Red, - 30.0..=60.0 => Category::Orange, - 60.0..=90.0 => Category::Yellow, - 90.0..=150.0 => Category::Green, - 150.0..=210.0 => Category::Cyan, + 0.0..=15.0 => Category::Magenta, + 15.0..=45.0 => Category::Red, + 45.0..=75.0 => Category::Orange, + 75.0..=120.0 => Category::Yellow, + 120.0..=180.0 => Category::Green, + 180.0..=210.0 => Category::Cyan, 210.0..=270.0 => Category::Blue, - 270.0..=300.0 => Category::Purple, - 300.0..=330.0 => Category::Magenta, - 330.0..=360.0 => Category::Red, + 270.0..=345.0 => Category::Purple, + 345.0..=360.0 => Category::Magenta, _ => Category::Unknown, } } diff --git a/src/color_functions/color_module_bg.wasm b/src/color_functions/color_module_bg.wasm index d1143b88eb7042cb4cf4e596469324148f9771f5..5ffe623c786a635f742406af350d7d883ceb227e 100644 GIT binary patch delta 463 zcmdn7TW-g0xrP?TElkrq>bb5jwuyCRaZq5?Vu}#3RT6e)0D=Tp1rVdaG2XR^m(h`( zhnX9sAOI*mYo?@KtSeBElZT1hkpZd>s=>qwr~xP`<;Vz@FmZxPOoK}>fhDFvCA1kn zz-5@hG9O@COq^k6u|Uk4uI|ZXDc`ULF3#@A4VKyB94`%FHmun`!;^`ZaoBmQeYrOi U5HkZY3lOscG28a#-t2-w0EyLNz5oCK delta 463 zcmdn7TW-g0xrP?TElkrq>czKTw1{LDNK>$$t?3pvRv93TtP97$1M@FbRsD=V3pa!6%lp_;ZqQD6%u>~%{43^jel@MYO zbB1YQ0n3O@ckpDgv|yM97iR~HPjiMEwG=MF;K&Uz%sE~f%3QjAh9?s*