Prep gcore splitup 2: Vector extension traits (#2759)

* extension trait for `MergeByDistance::merge_by_distance_*`

* extension trait for `VectorData::append_bezpath`

* extension trait for `HandleId::set_relative_position`

* remove unreferenced rust files

node-graph/gcore/src/vector/algorithms/merge_by_distance.rs

@@ -3,9 +3,14 @@ use glam::{DAffine2, DVec2};
 use petgraph::prelude::UnGraphMap;
 use rustc_hash::FxHashSet;
 
-impl VectorData {
+pub trait MergeByDistanceExt {
 	/// Collapse all points with edges shorter than the specified distance
-	pub fn merge_by_distance_topological(&mut self, distance: f64) {
+	fn merge_by_distance_topological(&mut self, distance: f64);
+	fn merge_by_distance_spatial(&mut self, transform: DAffine2, distance: f64);
+}
+
+impl MergeByDistanceExt for VectorData {
+	fn merge_by_distance_topological(&mut self, distance: f64) {
 		// Treat self as an undirected graph
 		let indices = VectorDataIndex::build_from(self);
 
@@ -95,7 +100,7 @@ impl VectorData {
 		self.point_domain.retain(&mut self.segment_domain, |id| !points_to_delete.contains(id));
 	}
 
-	pub fn merge_by_distance_spatial(&mut self, transform: DAffine2, distance: f64) {
+	fn merge_by_distance_spatial(&mut self, transform: DAffine2, distance: f64) {
 		let point_count = self.point_domain.positions().len();
 
 		// Find min x and y for grid cell normalization

node-graph/gcore/src/vector/algorithms/mod.rs

@@ -1,6 +1,6 @@
 pub mod bezpath_algorithms;
-mod instance;
-mod merge_by_distance;
+pub mod instance;
+pub mod merge_by_distance;
 pub mod offset_subpath;
-mod poisson_disk;
+pub mod poisson_disk;
 pub mod spline;

node-graph/gcore/src/vector/mod.rs

@@ -1,4 +1,4 @@
-mod algorithms;
+pub mod algorithms;
 pub mod brush_stroke;
 pub mod click_target;
 pub mod generator_nodes;

node-graph/gcore/src/vector/vector_data.rs

@@ -186,11 +186,6 @@ impl VectorData {
 		self.point_domain.push(id, point.position);
 	}
 
-	/// Appends a Kurbo BezPath to the vector data.
-	pub fn append_bezpath(&mut self, bezpath: kurbo::BezPath) {
-		AppendBezpath::append_bezpath(self, bezpath);
-	}
-
 	/// Construct some new vector data from a single subpath with an identity transform and black fill.
 	pub fn from_subpath(subpath: impl Borrow<bezier_rs::Subpath<PointId>>) -> Self {
 		Self::from_subpaths([subpath], false)
@@ -637,16 +632,6 @@ impl HandleId {
 		handle_position.map(|pos| (pos - anchor_position).length()).unwrap_or(f64::MAX)
 	}
 
-	/// Set the handle's position relative to the anchor which is the start anchor for the primary handle and end anchor for the end handle.
-	#[must_use]
-	pub fn set_relative_position(self, relative_position: DVec2) -> VectorModificationType {
-		let Self { ty, segment } = self;
-		match ty {
-			HandleType::Primary => VectorModificationType::SetPrimaryHandle { segment, relative_position },
-			HandleType::End => VectorModificationType::SetEndHandle { segment, relative_position },
-		}
-	}
-
 	/// Convert an end handle to the primary handle and a primary handle to an end handle. Note that the new handle may not exist (e.g. for a quadratic bézier).
 	#[must_use]
 	pub fn opposite(self) -> Self {

node-graph/gcore/src/vector/vector_data/modification.rs

@@ -634,6 +634,33 @@ impl<'a> AppendBezpath<'a> {
 	}
 }
 
+pub trait VectorDataExt {
+	/// Appends a Kurbo BezPath to the vector data.
+	fn append_bezpath(&mut self, bezpath: BezPath);
+}
+
+impl VectorDataExt for VectorData {
+	fn append_bezpath(&mut self, bezpath: BezPath) {
+		AppendBezpath::append_bezpath(self, bezpath);
+	}
+}
+
+pub trait HandleExt {
+	/// Set the handle's position relative to the anchor which is the start anchor for the primary handle and end anchor for the end handle.
+	#[must_use]
+	fn set_relative_position(self, relative_position: DVec2) -> VectorModificationType;
+}
+
+impl HandleExt for HandleId {
+	fn set_relative_position(self, relative_position: DVec2) -> VectorModificationType {
+		let Self { ty, segment } = self;
+		match ty {
+			HandleType::Primary => VectorModificationType::SetPrimaryHandle { segment, relative_position },
+			HandleType::End => VectorModificationType::SetEndHandle { segment, relative_position },
+		}
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

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

@@ -3,12 +3,13 @@ use super::algorithms::offset_subpath::offset_subpath;
 use super::algorithms::spline::{solve_spline_first_handle_closed, solve_spline_first_handle_open};
 use super::misc::{CentroidType, point_to_dvec2};
 use super::style::{Fill, Gradient, GradientStops, Stroke};
-use super::{PointId, SegmentDomain, SegmentId, StrokeId, VectorData, VectorDataTable};
+use super::{PointId, SegmentDomain, SegmentId, StrokeId, VectorData, VectorDataExt, VectorDataTable};
 use crate::instances::{Instance, InstanceMut, Instances};
 use crate::raster_types::{CPU, GPU, RasterDataTable};
 use crate::registry::types::{Angle, Fraction, IntegerCount, Length, Multiplier, Percentage, PixelLength, PixelSize, SeedValue};
 use crate::renderer::GraphicElementRendered;
 use crate::transform::{Footprint, ReferencePoint, Transform};
+use crate::vector::algorithms::merge_by_distance::MergeByDistanceExt;
 use crate::vector::misc::{MergeByDistanceAlgorithm, PointSpacingType};
 use crate::vector::style::{PaintOrder, StrokeAlign, StrokeCap, StrokeJoin};
 use crate::vector::{FillId, PointDomain, RegionId};