mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-07-07 15:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge cd5e9cdfbb into 24c6281644

Browse source
This commit is contained in:
phailhaus 2025-07-06 21:48:40 -05:00 • committed by GitHub
commit 7ecc7d40f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
node-graph/gcore/src/color/color.rs
View file

@ -454,6 +454,28 @@ impl Color {
Color { red, green, blue, alpha }
}
/// Create a [Color] from given `f32` CMYKA channels (all between 0 and 1)
///
/// # Examples
/// ```
/// use graphene_core::color::Color;
/// let color = Color::from_cmyka(0.5, 0.2, 0.3, 0.5, 1.0);
/// ```
// From https://graphicdesign.stackexchange.com/questions/114260/alternative-formulae-for-cmyk-to-rgb-conversion-for-display-on-screen
pub fn from_cmyka(cyan: f32, magenta: f32, yellow: f32, key: f32, alpha: f32) -> Color {
let cyan_temp: f32 = (1. - cyan) * 255.;
let magenta_temp: f32 = (1. - magenta) * 255.;
let yellow_temp: f32 = (1. - yellow) * 255.;
let red: f32 = (80. + 0.5882 * cyan_temp - 0.3529 * magenta_temp - 0.1373 * yellow_temp + 0.00185 * cyan_temp * magenta_temp + 0.00046 * yellow_temp * cyan_temp) / 255. * key;
let green: f32 =
(66. - 0.1961 * cyan_temp + 0.2745 * magenta_temp - 0.0627 * yellow_temp + 0.00215 * cyan_temp * magenta_temp + 0.00008 * yellow_temp * cyan_temp + 0.00062 * yellow_temp * magenta_temp)
/ 255. * key;
let blue: f32 =
(86. - 0.3255 * cyan_temp - 0.1569 * magenta_temp + 0.1647 * yellow_temp + 0.00046 * cyan_temp * magenta_temp + 0.00123 * yellow_temp * cyan_temp + 0.00215 * yellow_temp * magenta_temp)
/ 255. * key;
Color { red, green, blue, alpha }
}
/// Return the `red` component.
///
/// # Examples

24
node-graph/gmath-nodes/src/lib.rs
View file

@ -612,6 +612,30 @@ fn dot_product(_: impl Ctx, vector_a: DVec2, vector_b: DVec2) -> f64 {
vector_a.dot(vector_b)
}
/// Constructs a color from RGBA components. Clamped to 0 -> 1.
#[node_macro::node(category("Color"))]
fn construct_color_rgba(_: impl Ctx, _primary: (), red: f32, green: f32, blue: f32, alpha: f32) -> Color {
Color::from_rgbaf32_unchecked(red.clamp(0., 1.), green.clamp(0., 1.), blue.clamp(0., 1.), alpha.clamp(0., 1.))
}
/// Constructs a color from HSLA components. Clamped to 0 -> 1.
#[node_macro::node(category("Color"))]
fn construct_color_hsla(_: impl Ctx, _primary: (), hue: f32, saturation: f32, lightness: f32, alpha: f32) -> Color {
Color::from_hsla(hue.clamp(0.0, 1.0), saturation.clamp(0., 1.), lightness.clamp(0., 1.), alpha.clamp(0., 1.))
}
/// Constructs a color from a single grayscale value. Clamped to 0 -> 1.
#[node_macro::node(category("Color"))]
fn construct_color_grayscale(_: impl Ctx, _primary: (), luminance: f32) -> Color {
Color::from_luminance(luminance.clamp(0., 1.))
}
/// Constructs a color from CMYKA components. Clamped to 0 -> 1.
#[node_macro::node(category("Color"))]
fn construct_color_cmyka(_: impl Ctx, _primary: (), cyan: f32, magenta: f32, yellow: f32, key: f32, alpha: f32) -> Color {
Color::from_cmyka(cyan.clamp(0., 1.), magenta.clamp(0., 1.), yellow.clamp(0., 1.), key.clamp(0., 1.), alpha.clamp(0., 1.))
}
#[cfg(test)]
mod test {
use super::*;