graster-nodes: change Table<Color> params to Option<Color>

Author: Firestar99

node-graph/graster-nodes/src/adjustments.rs

@@ -307,7 +307,7 @@ fn black_and_white<T: Adjust<Color>>(
 		GradientStops,
 	)]
 	mut image: T,
-	#[default(Color::BLACK)] tint: Table<Color>,
+	#[default(Color::BLACK)] tint: Option<Color>,
 	#[default(40.)]
 	#[range((-200., 300.))]
 	reds: Percentage,
@@ -327,7 +327,6 @@ fn black_and_white<T: Adjust<Color>>(
 	#[range((-200., 300.))]
 	magentas: Percentage,
 ) -> T {
-	let tint: Option<Color> = tint.into();
 	let tint = tint.unwrap_or(Color::BLACK);
 
 	image.adjust(|color| {

node-graph/graster-nodes/src/blending_nodes.rs

@@ -166,13 +166,11 @@ fn color_overlay<T: Adjust<Color>>(
 		GradientStops,
 	)]
 	mut image: T,
-	#[default(Color::BLACK)] color: Table<Color>,
+	#[default(Color::BLACK)] color: Option<Color>,
 	blend_mode: BlendMode,
 	#[default(100.)] opacity: Percentage,
 ) -> T {
 	let opacity = (opacity as f32 / 100.).clamp(0., 1.);
-
-	let color: Option<Color> = color.into();
 	let color = color.unwrap_or(Color::BLACK);
 
 	image.adjust(|pixel| {
@@ -206,13 +204,7 @@ mod test {
 		// 100% of the output should come from the multiplied value
 		let opacity = 100_f64;
 
-		let result = super::color_overlay(
-			(),
-			Table::new_from_element(Raster::new_cpu(image.clone())),
-			Table::new_from_element(overlay_color),
-			BlendMode::Multiply,
-			opacity,
-		);
+		let result = super::color_overlay((), Table::new_from_element(Raster::new_cpu(image.clone())), Some(overlay_color), BlendMode::Multiply, opacity);
 		let result = result.iter().next().unwrap().element;
 
 		// The output should just be the original green and alpha channels (as we multiply them by 1 and other channels by 0)

node-graph/interpreted-executor/src/node_registry.rs

@@ -51,6 +51,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		#[cfg(feature = "gpu")]
 		into_node!(from: Table<Raster<GPU>>, to: Table<Graphic>),
 		// into_node!(from: Table<Raster<CPU>>, to: Table<Raster<SRGBA8>>),
+		into_node!(from: Table<Color>, to: Option<Color>),
 		#[cfg(feature = "gpu")]
 		into_node!(from: &WasmEditorApi, to: &WgpuExecutor),
 		// =============