From 9ca897963f2c39cd17bbf65f57cf7b3ae1f1fe8d Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sun, 23 Aug 2026 20:00:24 +0000 Subject: [PATCH] Prune the unused legacy Adjust and Blend list implementations --- node-graph/nodes/raster/src/adjust.rs | 22 -------- node-graph/nodes/raster/src/blending_nodes.rs | 51 +------------------ 2 files changed, 1 insertion(+), 72 deletions(-) diff --git a/node-graph/nodes/raster/src/adjust.rs b/node-graph/nodes/raster/src/adjust.rs index 41eefad66e..a08e6d84fc 100644 --- a/node-graph/nodes/raster/src/adjust.rs +++ b/node-graph/nodes/raster/src/adjust.rs @@ -12,17 +12,9 @@ impl Adjust for Color { #[cfg(feature = "std")] mod adjust_std { use super::*; - use core_types::list::List; use raster_types::{CPU, Raster}; use vector_types::GradientStops; - impl Adjust for List> { - fn adjust(&mut self, map_fn: impl Fn(&Color) -> Color) { - for element in self.iter_element_values_mut() { - element.adjust(&map_fn); - } - } - } impl Adjust for Raster { fn adjust(&mut self, map_fn: impl Fn(&Color) -> Color) { for color in self.data_mut().data.iter_mut() { @@ -30,20 +22,6 @@ mod adjust_std { } } } - impl Adjust for List { - fn adjust(&mut self, map_fn: impl Fn(&Color) -> Color) { - for element in self.iter_element_values_mut() { - *element = map_fn(element); - } - } - } - impl Adjust for List { - fn adjust(&mut self, map_fn: impl Fn(&Color) -> Color) { - for element in self.iter_element_values_mut() { - element.adjust(&map_fn); - } - } - } impl Adjust for GradientStops { fn adjust(&mut self, map_fn: impl Fn(&Color) -> Color) { for color in self.color.iter_mut() { diff --git a/node-graph/nodes/raster/src/blending_nodes.rs b/node-graph/nodes/raster/src/blending_nodes.rs index fe3b8c533e..3970ceb298 100644 --- a/node-graph/nodes/raster/src/blending_nodes.rs +++ b/node-graph/nodes/raster/src/blending_nodes.rs @@ -21,7 +21,6 @@ impl Blend for Color { mod blend_std { use super::*; use core::cmp::Ordering; - use core_types::list::List; use raster_types::Image; use raster_types::Raster; @@ -37,52 +36,6 @@ mod blend_std { } } - impl Blend for List> { - fn blend(&self, under: &Self, blend_fn: impl Fn(Color, Color) -> Color) -> Self { - let mut result_list = self.clone(); - let pair_count = result_list.len().min(under.len()); - for index in 0..pair_count { - let Some(over) = result_list.element(index) else { break }; - let Some(under_element) = under.element(index) else { break }; - let data = over.data.iter().zip(under_element.data.iter()).map(|(a, b)| blend_fn(*a, *b)).collect(); - let (width, height) = (over.width, over.height); - - *result_list.element_mut(index).unwrap() = Raster::new_cpu(Image { - data, - width, - height, - base64_string: None, - }); - } - result_list - } - } - impl Blend for List { - fn blend(&self, under: &Self, blend_fn: impl Fn(Color, Color) -> Color) -> Self { - let mut result_list = self.clone(); - let pair_count = result_list.len().min(under.len()); - for index in 0..pair_count { - let Some(over) = result_list.element(index) else { break }; - let Some(under_element) = under.element(index) else { break }; - let new_val = blend_fn(*over, *under_element); - *result_list.element_mut(index).unwrap() = new_val; - } - result_list - } - } - impl Blend for List { - fn blend(&self, under: &Self, blend_fn: impl Fn(Color, Color) -> Color) -> Self { - let mut result_list = self.clone(); - let pair_count = result_list.len().min(under.len()); - for index in 0..pair_count { - let Some(over) = result_list.element(index) else { break }; - let Some(under_element) = under.element(index) else { break }; - let new_val = over.blend(under_element, &blend_fn); - *result_list.element_mut(index).unwrap() = new_val; - } - result_list - } - } impl Blend for GradientStops { fn blend(&self, under: &Self, blend_fn: impl Fn(Color, Color) -> Color) -> Self { let mut combined_stops = self.position.iter().chain(under.position.iter()).copied().collect::>(); @@ -208,7 +161,6 @@ fn color_overlay + Clone + Send + Sync + no_std_types::context: mod test { use core_types::blending::BlendMode; use core_types::color::Color; - use core_types::list::List; use raster_types::Image; use raster_types::Raster; @@ -223,8 +175,7 @@ mod test { // 100% of the output should come from the multiplied value let opacity = 100.; - let result = super::color_overlay(&(), List::new_from_element(Raster::new_cpu(image.clone())), overlay_color, BlendMode::Multiply, opacity); - let result = result.element(0).unwrap().clone(); + let result = super::color_overlay(&(), Raster::new_cpu(image.clone()), overlay_color, BlendMode::Multiply, opacity); // The output should just be the original green and alpha channels (as we multiply them by 1 and other channels by 0) assert_eq!(result.data[0], Color::from_rgbaf32_unchecked(0., image_color.g(), 0., image_color.a()));