fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-19 02:48:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Table<Gradient> as a graphical type (#3051)

Browse Source
This commit is contained in:
Keavon Chambers
2025-08-13 01:42:51 -07:00
committed by GitHub
parent 1b351aca76
commit bdc029c692
33 changed files with 689 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
node-graph/graster-nodes/src/adjust.rs
View File

@@ -27,8 +27,15 @@ mod adjust_std {
}
impl Adjust<Color> for Table<Color> {
fn adjust(&mut self, map_fn: impl Fn(&Color) -> Color) {
for color in self.iter_mut() {
*color.element = map_fn(color.element);
for row in self.iter_mut() {
*row.element = map_fn(row.element);
}
}
}
impl Adjust<Color> for Table<GradientStops> {
fn adjust(&mut self, map_fn: impl Fn(&Color) -> Color) {
for row in self.iter_mut() {
row.element.adjust(&map_fn);
}
}
}

15
node-graph/graster-nodes/src/adjustments.rs
View File

@@ -46,6 +46,7 @@ fn luminance<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -70,6 +71,7 @@ fn gamma_correction<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -90,6 +92,7 @@ fn extract_channel<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -113,6 +116,7 @@ fn make_opaque<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -138,6 +142,7 @@ fn brightness_contrast<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -227,6 +232,7 @@ fn levels<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,
@@ -294,6 +300,7 @@ async fn black_and_white<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,
@@ -369,6 +376,7 @@ async fn hue_saturation<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -403,6 +411,7 @@ async fn invert<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -425,6 +434,7 @@ async fn threshold<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,
@@ -470,6 +480,7 @@ async fn vibrance<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,
@@ -635,6 +646,7 @@ async fn channel_mixer<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,
@@ -763,6 +775,7 @@ async fn selective_color<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,
@@ -905,6 +918,7 @@ async fn posterize<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,
@@ -938,6 +952,7 @@ async fn exposure<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut input: T,

12
node-graph/graster-nodes/src/blending_nodes.rs
View File

@@ -51,6 +51,15 @@ mod blend_std {
result_table
}
}
impl Blend<Color> for Table<GradientStops> {
fn blend(&self, under: &Self, blend_fn: impl Fn(Color, Color) -> Color) -> Self {
let mut result_table = self.clone();
for (over, under) in result_table.iter_mut().zip(under.iter()) {
*over.element = over.element.blend(under.element, &blend_fn);
}
result_table
}
}
impl Blend<Color> for GradientStops {
fn blend(&self, under: &Self, blend_fn: impl Fn(Color, Color) -> Color) -> Self {
let mut combined_stops = self.iter().map(|(position, _)| position).chain(under.iter().map(|(position, _)| position)).collect::<Vec<_>>();
@@ -128,6 +137,7 @@ async fn blend<T: Blend<Color> + Send>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
over: T,
@@ -135,6 +145,7 @@ async fn blend<T: Blend<Color> + Send>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
under: T,
@@ -150,6 +161,7 @@ fn color_overlay<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,

1
node-graph/graster-nodes/src/gradient_map.rs
View File

@@ -15,6 +15,7 @@ async fn gradient_map<T: Adjust<Color>>(
#[implementations(
Table<Raster<CPU>>,
Table<Color>,
Table<GradientStops>,
GradientStops,
)]
mut image: T,