Rename the nodes 'Length' -> 'Magnitude', 'Flatten Path' -> 'Combine Paths', 'Vec2 Value' -> 'Combine Vec2', and add a new 'Vec2 Value' node (#4349)

* Rename the node 'Length' -> 'Magnitude'

* Rename the node 'Flatten Path' -> 'Combine Paths'

* Replace the node 'Vec2 Value' with 'Combine Vec2' and add a new 'Vec2 Value' that's actually a vec2

* Update demo artwork

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

@@ -4,7 +4,7 @@ use glam::{DVec2, IVec2, UVec2};
 
 /// Obtains the X or Y component of a vec2.
 ///
-/// The inverse of this node is "Vec2 Value", which can have either or both its X and Y parameters exposed as graph inputs.
+/// The inverse of this node is **Combine Vec2**, which composes a vec2 from its X and Y components.
 #[node_macro::node(name("Extract XY"), category("Math: Vector"))]
 fn extract_xy<T: Into<DVec2>>(_: impl Ctx, #[implementations(DVec2, IVec2, UVec2)] vector: T, axis: XY) -> f64 {
 	match axis {

node-graph/nodes/graphic/src/graphic.rs

@@ -957,7 +957,7 @@ pub fn flatten_vector<T: IntoGraphicList>(_: impl Ctx, #[implementations(List<Gr
 	// TODO: we stash the pre-flattened list on the output so `List<Vector>::collect_metadata` can recurse into it,
 	// TODO: which conflates render output with editor metadata and forces the pre-compensation dance below.
 	// TODO: The cleaner fix is to drive each layer's metadata from its own Monitor's captured `(Context, List<Graphic>)`,
-	// TODO: at which point this attribute (and the equivalents in Boolean Operation, Solidify Stroke, Flatten Path,
+	// TODO: at which point this attribute (and the equivalents in Boolean Operation, Solidify Stroke, Combine Paths,
 	// TODO: Morph, Rasterize) become unnecessary.
 	if !output.is_empty() {
 		// Item 0 carries a composed transform inherited from the flattened input, but the merged_layers

node-graph/nodes/math/src/lib.rs

@@ -803,8 +803,8 @@ fn percentage_value(_: impl Ctx, _primary: (), percentage: Percentage) -> f64 {
 
 /// Constructs a two-dimensional vector value which may be set to any XY pair.
 #[node_macro::node(category("Value"), name("Vec2 Value"))]
-fn vec2_value(_: impl Ctx, _primary: (), x: f64, y: f64) -> DVec2 {
-	DVec2::new(x, y)
+fn vec2_value(_: impl Ctx, _primary: (), #[name("Vec2")] vec2: DVec2) -> DVec2 {
+	vec2
 }
 
 /// Constructs a color value which may be set to any color.
@@ -897,6 +897,23 @@ fn footprint_value(_: impl Ctx, _primary: (), transform: DAffine2, #[default(100
 	}
 }
 
+/// Composes a vec2 from its X and Y components.
+///
+/// The inverse of this node is **Split Vec2**, which decomposes a vec2 back into its X and Y components.
+#[node_macro::node(category("Math: Vector"), name("Combine Vec2"))]
+fn combine_vec2(
+	_: impl Ctx,
+	_primary: (),
+	/// The X component of the vec2.
+	#[expose]
+	x: f64,
+	/// The Y component of the vec2.
+	#[expose]
+	y: f64,
+) -> DVec2 {
+	DVec2::new(x, y)
+}
+
 /// The dot product operation (`·`) calculates the degree of similarity of a vec2 pair based on their angles and lengths.
 ///
 /// Calculated as `‖a‖‖b‖cos(θ)`, it represents the product of their lengths (`‖a‖‖b‖`) scaled by the alignment of their directions (`cos(θ)`).
@@ -965,10 +982,9 @@ fn angle_to<T: ToPosition, U: ToPosition>(
 	if radians { angle } else { angle.to_degrees() }
 }
 
-// TODO: Rename to "Magnitude"
 /// The magnitude operator (`‖x‖`) calculates the length of a vec2, which is the distance from the base to the tip of the arrow represented by the vector.
 #[node_macro::node(category("Math: Vector"))]
-fn length(_: impl Ctx, vector: DVec2) -> f64 {
+fn magnitude(_: impl Ctx, vector: DVec2) -> f64 {
 	vector.length()
 }
 
@@ -992,9 +1008,9 @@ mod test {
 	}
 
 	#[test]
-	pub fn length_function() {
+	pub fn magnitude_function() {
 		let vector = DVec2::new(3., 4.);
-		assert_eq!(length(&(), vector), 5.);
+		assert_eq!(magnitude(&(), vector), 5.);
 	}
 
 	#[test]

node-graph/nodes/vector/src/vector_nodes.rs

@@ -2047,9 +2047,9 @@ fn flatten_path_core<'e>(
 	Ok((output, Attr(DAffine2::IDENTITY), Attr(fill), Attr(stroke), Attr(layer_path.as_slice()), Attr(Some(merged_layers))))
 }
 
-// TODO: Rename to "Combine Paths" and make this happen per-element instead of flattening every element into a single path. The migration for this should then become a Flatten Vector -> Combine Paths pair of nodes.
+// TODO: Make this happen per-element instead of flattening every element into a single path. The migration for this should then become a Flatten Vector -> Combine Paths pair of nodes.
 #[node_macro::node(category("Vector"), path(graphene_core::vector))]
-pub fn flatten_path<'e>(
+pub fn combine_paths<'e>(
 	ctx: impl Ctx + ExtractArena<'e> + ExtractIndex + InjectIndex + Copy,
 	content: IList<Graphic<'static>>,
 ) -> Result<
@@ -2069,10 +2069,10 @@ pub fn flatten_path<'e>(
 	flatten_path_core(ctx.arena(), flattened, snapshot)
 }
 
-/// The path flattening over a plain vector level, as [`flatten_path`].
-/// Registered under the flatten path identifier.
+/// The path flattening over a plain vector level, as [`combine_paths`].
+/// Registered under the combine paths identifier.
 #[node_macro::node(category(""))]
-pub fn flatten_path_vector<'e>(
+pub fn combine_paths_vector<'e>(
 	ctx: impl Ctx + ExtractArena<'e> + ExtractIndex + InjectIndex + Copy,
 	content: IList<Vector>,
 ) -> Result<
@@ -2092,7 +2092,7 @@ pub fn flatten_path_vector<'e>(
 	flatten_path_core(ctx.arena(), flattened, snapshot)
 }
 
-pub use _flatten_path_vector_mod::flatten_path_vector_entries;
+pub use _combine_paths_vector_mod::combine_paths_vector_entries;
 
 /// Convert vector geometry into a polyline composed of evenly spaced points.
 #[node_macro::node(category("Vector: Modifier"), path(core_types::vector), properties("sample_polyline_properties"), memoize)]
@@ -4111,6 +4111,7 @@ mod test {
 			assert_eq!(manipulator_groups_anchors[i], expected_bounding_box[i]);
 		}
 	}
+
 	#[test]
 	fn sample_polyline() {
 		let path = BezPath::from_vec(vec![PathEl::MoveTo(Point::ZERO), PathEl::CurveTo(Point::ZERO, Point::new(100., 0.), Point::new(100., 0.))]);