Make the node graph use Table<GradientStops> instead of GradientStops

editor/src/messages/portfolio/document/node_graph/node_properties.rs

@@ -214,19 +214,19 @@ pub(crate) fn property_from_type(
 						Some(x) if x == TypeId::of::<String>() => text_widget(default_info).into(),
 						Some(x) if x == TypeId::of::<DVec2>() => vec2_widget(default_info, "X", "Y", "", None, false),
 						Some(x) if x == TypeId::of::<DAffine2>() => transform_widget(default_info, &mut extra_widgets),
-						Some(x) if x == TypeId::of::<Color>() => color_widget(default_info, ColorInput::default()),
-						Some(x) if x == TypeId::of::<Option<Color>>() => color_widget(default_info, ColorInput::default()),
 						// ==========================
 						// PRIMITIVE COLLECTION TYPES
 						// ==========================
 						Some(x) if x == TypeId::of::<Vec<f64>>() => array_of_number_widget(default_info, TextInput::default()).into(),
 						Some(x) if x == TypeId::of::<Vec<DVec2>>() => array_of_vec2_widget(default_info, TextInput::default()).into(),
+						// ===========
+						// TABLE TYPES
+						// ===========
+						Some(x) if x == TypeId::of::<Table<Color>>() => color_widget(default_info, ColorInput::default().allow_none(true)),
+						Some(x) if x == TypeId::of::<Table<GradientStops>>() => color_widget(default_info, ColorInput::default().allow_none(false)),
 						// ============
 						// STRUCT TYPES
 						// ============
-						Some(x) if x == TypeId::of::<Table<Color>>() => color_widget(default_info, ColorInput::default().allow_none(true)),
-						Some(x) if x == TypeId::of::<Table<GradientStops>>() => color_widget(default_info, ColorInput::default().allow_none(false)),
-						Some(x) if x == TypeId::of::<GradientStops>() => color_widget(default_info, ColorInput::default().allow_none(false)),
 						Some(x) if x == TypeId::of::<Font>() => font_widget(default_info),
 						Some(x) if x == TypeId::of::<Curve>() => curve_widget(default_info),
 						Some(x) if x == TypeId::of::<Footprint>() => footprint_widget(default_info, &mut extra_widgets),
@@ -1145,14 +1145,6 @@ pub fn color_widget(parameter_widgets_info: ParameterWidgetsInfo, color_button:
 
 	// Add the color input
 	match &**tagged_value {
-		TaggedValue::ColorNotInTable(color) => widgets.push(
-			color_button
-				.value(FillChoice::Solid(*color))
-				.allow_none(false)
-				.on_update(update_value(|input: &ColorInput| TaggedValue::ColorNotInTable(input.value.as_solid().unwrap()), node_id, index))
-				.on_commit(commit_value)
-				.widget_instance(),
-		),
 		TaggedValue::Color(color_table) => widgets.push(
 			color_button
 				.value(match color_table.iter().next() {
@@ -1171,7 +1163,7 @@ pub fn color_widget(parameter_widgets_info: ParameterWidgetsInfo, color_button:
 			color_button
 				.value(match gradient_table.iter().next() {
 					Some(row) => FillChoice::Gradient(row.element.clone()),
-					None => FillChoice::None,
+					None => FillChoice::Gradient(GradientStops::default()),
 				})
 				.on_update(update_value(
 					|input: &ColorInput| TaggedValue::GradientTable(input.value.as_gradient().iter().map(|&gradient| TableRow::new_from_element(gradient.clone())).collect()),
@@ -1181,18 +1173,7 @@ pub fn color_widget(parameter_widgets_info: ParameterWidgetsInfo, color_button:
 				.on_commit(commit_value)
 				.widget_instance(),
 		),
-		TaggedValue::GradientStops(gradient_stops) => widgets.push(
-			color_button
-				.value(FillChoice::Gradient(gradient_stops.clone()))
-				.on_update(update_value(
-					|input: &ColorInput| TaggedValue::GradientStops(input.value.as_gradient().cloned().unwrap_or_default()),
-					node_id,
-					index,
-				))
-				.on_commit(commit_value)
-				.widget_instance(),
-		),
-		x => warn!("Colour {x:?}"),
+		x => warn!("Color {x:?}"),
 	}
 
 	LayoutGroup::Row { widgets }

editor/src/messages/portfolio/document/node_graph/utility_types.rs

@@ -35,7 +35,7 @@ impl FrontendGraphDataType {
 			TaggedValue::Raster(_) => Self::Raster,
 			TaggedValue::Vector(_) => Self::Vector,
 			TaggedValue::Color(_) => Self::Color,
-			TaggedValue::Gradient(_) | TaggedValue::GradientStops(_) | TaggedValue::GradientTable(_) => Self::Gradient,
+			TaggedValue::Gradient(_) | TaggedValue::GradientTable(_) => Self::Gradient,
 			TaggedValue::String(_) | TaggedValue::VecString(_) => Self::Typography,
 			_ => Self::General,
 		}

editor/src/messages/portfolio/document/utility_types/network_interface/resolved_types.rs

@@ -67,7 +67,7 @@ impl TypeSource {
 				TaggedValue::Raster(_) => FrontendGraphDataType::Raster,
 				TaggedValue::Vector(_) => FrontendGraphDataType::Vector,
 				TaggedValue::Color(_) => FrontendGraphDataType::Color,
-				TaggedValue::Gradient(_) | TaggedValue::GradientStops(_) | TaggedValue::GradientTable(_) => FrontendGraphDataType::Gradient,
+				TaggedValue::Gradient(_) | TaggedValue::GradientTable(_) => FrontendGraphDataType::Gradient,
 				TaggedValue::String(_) => FrontendGraphDataType::Typography,
 				_ => FrontendGraphDataType::General,
 			},

editor/src/messages/portfolio/document_migration.rs

@@ -282,13 +282,15 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 		node: graphene_std::math_nodes::footprint_value::IDENTIFIER,
 		aliases: &["graphene_math_nodes::FootprintValueNode", "graphene_core::ops::FootprintValueNode"],
 	},
-	NodeReplacement {
-		node: graphene_std::math_nodes::gradient_table_value::IDENTIFIER,
-		aliases: &["graphene_math_nodes::GradientTableValueNode", "graphene_core::ops::GradientTableValueNode"],
-	},
 	NodeReplacement {
 		node: graphene_std::math_nodes::gradient_value::IDENTIFIER,
-		aliases: &["graphene_math_nodes::GradientValueNode", "graphene_core::ops::GradientValueNode"],
+		aliases: &[
+			"graphene_math_nodes::GradientValueNode",
+			"graphene_core::ops::GradientValueNode",
+			"graphene_math_nodes::GradientTableValueNode",
+			"graphene_core::ops::GradientTableValueNode",
+			"math_nodes::GradientTableValueNode",
+		],
 	},
 	NodeReplacement {
 		node: graphene_std::math_nodes::greater_than::IDENTIFIER,

node-graph/graph-craft/src/document/value.rs

@@ -26,6 +26,7 @@ use std::hash::Hash;
 use std::marker::PhantomData;
 use std::str::FromStr;
 pub use std::sync::Arc;
+use text_nodes::vector_types::GradientStop;
 
 pub struct TaggedValueTypeError;
 
@@ -182,7 +183,6 @@ tagged_value! {
 	U64(u64),
 	Bool(bool),
 	String(String),
-	ColorNotInTable(Color),
 	// ========================
 	// LISTS OF PRIMITIVE TYPES
 	// ========================
@@ -209,8 +209,10 @@ tagged_value! {
 	#[serde(alias = "ArtboardGroup")]
 	Artboard(Table<Artboard>),
 	#[serde(deserialize_with = "core_types::misc::migrate_color")] // TODO: Eventually remove this migration document upgrade code
-	#[serde(alias = "ColorTable", alias = "OptionalColor")]
+	#[serde(alias = "ColorTable", alias = "OptionalColor", alias = "ColorNotInTable")]
 	Color(Table<Color>),
+	#[serde(deserialize_with = "graphic_types::vector_types::gradient::migrate_gradient_stops")] // TODO: Eventually remove this migration document upgrade code
+	#[serde(alias = "GradientPositions", alias = "GradientStops")]
 	GradientTable(Table<GradientStops>),
 	// ============
 	// STRUCT TYPES
@@ -222,8 +224,6 @@ tagged_value! {
 	DAffine2(DAffine2),
 	Stroke(graphic_types::vector_types::vector::style::Stroke),
 	Gradient(graphic_types::vector_types::vector::style::Gradient),
-	#[serde(alias = "GradientPositions")] // TODO: Eventually remove this alias document upgrade code
-	GradientStops(GradientStops),
 	Font(text_nodes::Font),
 	BrushStrokes(Vec<BrushStroke>),
 	BrushCache(BrushCache),
@@ -333,6 +333,35 @@ impl TaggedValue {
 			None
 		}
 
+		fn to_gradient(input: &str) -> Option<GradientStops> {
+			// String syntax: (e.g. "000000ff, ff0000ff")
+			let stops = input.split(',').filter_map(|s| to_color(s.trim())).collect::<Vec<_>>();
+			if stops.len() == 1 {
+				Some(GradientStops::new(vec![
+					GradientStop {
+						position: 0.,
+						midpoint: 0.5,
+						color: stops[0],
+					},
+					GradientStop {
+						position: 1.,
+						midpoint: 0.5,
+						color: stops[0],
+					},
+				]))
+			} else if stops.len() >= 2 {
+				let step = 1. / (stops.len() - 1) as f64;
+				Some(GradientStops::new(stops.into_iter().enumerate().map(|(i, color)| GradientStop {
+					position: i as f64 * step,
+					midpoint: 0.5,
+					color,
+				})))
+			} else {
+				log::error!("Invalid default value gradient string: {input}");
+				None
+			}
+		}
+
 		fn to_reference_point(input: &str) -> Option<ReferencePoint> {
 			let mut choices = input.split("::");
 			let (first, second) = (choices.next()?.trim(), choices.next()?.trim());
@@ -375,9 +404,8 @@ impl TaggedValue {
 					() if ty == TypeId::of::<u32>() => FromStr::from_str(string).map(TaggedValue::U32).ok()?,
 					() if ty == TypeId::of::<DVec2>() => to_dvec2(string).map(TaggedValue::DVec2)?,
 					() if ty == TypeId::of::<bool>() => FromStr::from_str(string).map(TaggedValue::Bool).ok()?,
-					() if ty == TypeId::of::<Color>() => to_color(string).map(TaggedValue::ColorNotInTable)?,
-					() if ty == TypeId::of::<Option<Color>>() => TaggedValue::ColorNotInTable(to_color(string)?),
 					() if ty == TypeId::of::<Table<Color>>() => to_color(string).map(|color| TaggedValue::Color(Table::new_from_element(color)))?,
+					() if ty == TypeId::of::<Table<GradientStops>>() => to_gradient(string).map(|color| TaggedValue::GradientTable(Table::new_from_element(color)))?,
 					() if ty == TypeId::of::<Fill>() => to_color(string).map(|color| TaggedValue::Fill(Fill::solid(color)))?,
 					() if ty == TypeId::of::<ReferencePoint>() => to_reference_point(string).map(TaggedValue::ReferencePoint)?,
 					_ => return None,
@@ -537,8 +565,3 @@ mod fake_hash {
 		}
 	}
 }
-
-#[test]
-fn can_construct_color() {
-	assert_eq!(TaggedValue::from_type(&concrete!(Color)).unwrap(), TaggedValue::ColorNotInTable(Color::default()));
-}

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

@@ -94,7 +94,6 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::style::StrokeAlign]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::style::Stroke]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::style::Gradient]),
-		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => GradientStops]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => Vec<graphene_std::uuid::NodeId>]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => Box<graphene_std::vector::VectorModification>]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::misc::CentroidType]),
@@ -157,7 +156,6 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Table<Color>]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Image<Color>]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Table<GradientStops>]),
-		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => GradientStops]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Vec<DVec2>]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Vec<NodeId>]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Vec<f64>]),
@@ -183,7 +181,6 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		#[cfg(feature = "gpu")]
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Table<Raster<GPU>>]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Option<f64>]),
-		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Color]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Option<Color>]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => [f64; 4]]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => Graphic]),

node-graph/libraries/rendering/src/renderer.rs

@@ -12,11 +12,8 @@ use core_types::uuid::{NodeId, generate_uuid};
 use dyn_any::DynAny;
 use glam::{DAffine2, DVec2};
 use graphic_types::Vector;
-use graphic_types::raster_types::BitmapMut;
-use graphic_types::raster_types::Image;
-use graphic_types::raster_types::{CPU, GPU, Raster};
-use graphic_types::vector_types::gradient::GradientStops;
-use graphic_types::vector_types::gradient::GradientType;
+use graphic_types::raster_types::{BitmapMut, CPU, GPU, Image, Raster};
+use graphic_types::vector_types::gradient::{GradientStops, GradientType};
 use graphic_types::vector_types::subpath::Subpath;
 use graphic_types::vector_types::vector::click_target::{ClickTarget, FreePoint};
 use graphic_types::vector_types::vector::style::{Fill, PaintOrder, RenderMode, Stroke, StrokeAlign};

node-graph/libraries/vector-types/src/gradient.rs

@@ -447,6 +447,24 @@ impl Gradient {
 	}
 }
 
+// TODO: Eventually remove this migration document upgrade code
+pub fn migrate_gradient_stops<'de, D: serde::Deserializer<'de>>(deserializer: D) -> Result<core_types::table::Table<GradientStops>, D::Error> {
+	use core_types::table::Table;
+	use serde::Deserialize;
+
+	#[derive(serde::Deserialize)]
+	#[serde(untagged)]
+	enum GradientStopsFormat {
+		GradientStops(GradientStops),
+		GradientTable(Table<GradientStops>),
+	}
+
+	Ok(match GradientStopsFormat::deserialize(deserializer)? {
+		GradientStopsFormat::GradientStops(stops) => Table::new_from_element(stops),
+		GradientStopsFormat::GradientTable(table) => table,
+	})
+}
+
 impl core_types::bounds::BoundingBox for GradientStops {
 	fn bounding_box(&self, _transform: DAffine2, _include_stroke: bool) -> core_types::bounds::RenderBoundingBox {
 		core_types::bounds::RenderBoundingBox::Infinite

node-graph/node-macro/src/parsing.rs

@@ -1455,11 +1455,9 @@ mod tests {
 					() -> Table<Raster<CPU>>,
 					() -> Table<Color>,
 					() -> Table<GradientStops>,
-					() -> GradientStops,
 					Footprint -> Table<Raster<CPU>>,
 					Footprint -> Table<Color>,
 					Footprint -> Table<GradientStops>,
-					Footprint -> GradientStops,
 				)]
 				image: impl Node<F, Output = T>,
 			) -> T {

node-graph/nodes/gcore/src/animation.rs

@@ -3,7 +3,8 @@ use core_types::transform::Footprint;
 use core_types::uuid::NodeId;
 use core_types::{CloneVarArgs, Color, Context, Ctx, ExtractAll, ExtractAnimationTime, ExtractPointerPosition, ExtractRealTime, OwnedContextImpl};
 use glam::{DAffine2, DVec2};
-use graphic_types::{Artboard, Graphic, Vector, vector_types::GradientStops};
+use graphic_types::vector_types::GradientStops;
+use graphic_types::{Artboard, Graphic, Vector};
 use raster_types::{CPU, GPU, Raster};
 
 const DAY: f64 = 1000. * 3600. * 24.;
@@ -84,7 +85,6 @@ async fn quantize_real_time<T>(
 		Context -> Table<Color>,
 		Context -> Table<Artboard>,
 		Context -> Table<GradientStops>,
-		Context -> GradientStops,
 		Context -> (),
 	)]
 	value: impl Node<'n, Context<'static>, Output = T>,
@@ -128,7 +128,6 @@ async fn quantize_animation_time<T>(
 		Context -> Table<Color>,
 		Context -> Table<Artboard>,
 		Context -> Table<GradientStops>,
-		Context -> GradientStops,
 		Context -> (),
 	)]
 	value: impl Node<'n, Context<'static>, Output = T>,

node-graph/nodes/gcore/src/context_modification.rs

@@ -5,7 +5,8 @@ use core_types::transform::Footprint;
 use core_types::uuid::NodeId;
 use core_types::{Color, OwnedContextImpl};
 use glam::{DAffine2, DVec2};
-use graphic_types::{Artboard, Graphic, Vector, vector_types::GradientStops};
+use graphic_types::vector_types::GradientStops;
+use graphic_types::{Artboard, Graphic, Vector};
 use raster_types::{CPU, GPU, Raster};
 
 /// Filters out what should be unused components of the context based on the specified requirements.
@@ -37,7 +38,6 @@ async fn context_modification<T>(
 		Context -> Table<Color>,
 		Context -> Table<Artboard>,
 		Context -> Table<GradientStops>,
-		Context -> GradientStops,
 	)]
 	value: impl Node<Context<'static>, Output = T>,
 	/// The parts of the context to keep when evaluating the input value. All other parts are nullified.

node-graph/nodes/gcore/src/logic.rs

@@ -3,7 +3,8 @@ use core_types::registry::types::TextArea;
 use core_types::table::Table;
 use core_types::{Context, Ctx};
 use glam::{DAffine2, DVec2};
-use graphic_types::{Artboard, Graphic, Vector, vector_types::GradientStops};
+use graphic_types::vector_types::GradientStops;
+use graphic_types::{Artboard, Graphic, Vector};
 use raster_types::{CPU, GPU, Raster};
 
 /// Type-asserts a value to be a string.
@@ -152,7 +153,7 @@ async fn switch<T, C: Send + 'n + Clone>(
 		Context -> Table<Raster<CPU>>,
 		Context -> Table<Raster<GPU>>,
 		Context -> Table<Color>,
-		Context -> GradientStops,
+		Context -> Table<GradientStops>,
 	)]
 	if_true: impl Node<C, Output = T>,
 	#[expose]
@@ -171,7 +172,7 @@ async fn switch<T, C: Send + 'n + Clone>(
 		Context -> Table<Raster<CPU>>,
 		Context -> Table<Raster<GPU>>,
 		Context -> Table<Color>,
-		Context -> GradientStops,
+		Context -> Table<GradientStops>,
 	)]
 	if_false: impl Node<C, Output = T>,
 ) -> T {