Remove the path-bool library (#3882)

node-graph/graph-craft/Cargo.toml

@@ -23,7 +23,6 @@ wasm = [
 # Local dependencies
 dyn-any = { workspace = true }
 core-types = { workspace = true }
-path-bool-nodes = { workspace = true }
 brush-nodes = { workspace = true }
 graphene-core = { workspace = true }
 graphene-application-io = { workspace = true }

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

@@ -267,7 +267,7 @@ tagged_value! {
 	GradientType(vector::style::GradientType),
 	ReferencePoint(vector::ReferencePoint),
 	CentroidType(vector::misc::CentroidType),
-	BooleanOperation(path_bool_nodes::BooleanOperation),
+	BooleanOperation(vector::misc::BooleanOperation),
 	TextAlign(text_nodes::TextAlign),
 }
 

node-graph/interpreted-executor/Cargo.toml

@@ -16,7 +16,6 @@ graph-craft = { workspace = true }
 graphene-core = { workspace = true }
 wgpu-executor = { workspace = true }
 core-types = { workspace = true }
-path-bool-nodes = { workspace = true }
 dyn-any = { workspace = true }
 
 # Workspace dependencies

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

@@ -86,7 +86,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => BlendMode]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => ImageTexture]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::transform::ReferencePoint]),
-		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::path_bool::BooleanOperation]),
+		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::misc::BooleanOperation]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::style::Fill]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::style::StrokeCap]),
 		async_node!(graphene_core::memo::MonitorNode<_, _, _>, input: Context, fn_params: [Context => graphene_std::vector::style::StrokeJoin]),
@@ -225,7 +225,7 @@ fn node_registry() -> HashMap<ProtoNodeIdentifier, HashMap<NodeIOTypes, NodeCons
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::vector::style::GradientType]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::transform::ReferencePoint]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::vector::misc::CentroidType]),
-		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => path_bool_nodes::BooleanOperation]),
+		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::vector::misc::BooleanOperation]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => graphene_std::text::TextAlign]),
 		async_node!(graphene_core::memo::MemoNode<_, _>, input: Context, fn_params: [Context => RenderIntermediate]),
 	];

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

@@ -7,6 +7,23 @@ use glam::DVec2;
 use kurbo::{BezPath, CubicBez, Line, ParamCurve, ParamCurveDeriv, PathSeg, Point, QuadBez};
 use std::ops::Sub;
 
+#[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash, DynAny, node_macro::ChoiceType)]
+#[widget(Radio)]
+pub enum BooleanOperation {
+	#[default]
+	#[icon("BooleanUnion")]
+	Union,
+	#[icon("BooleanSubtractFront")]
+	SubtractFront,
+	#[icon("BooleanSubtractBack")]
+	SubtractBack,
+	#[icon("BooleanIntersect")]
+	Intersect,
+	#[icon("BooleanDifference")]
+	Difference,
+}
+
 /// Represents different geometric interpretations of calculating the centroid (center of mass).
 #[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash, DynAny, node_macro::ChoiceType)]

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

@@ -14,7 +14,7 @@ pub use graphene_core::debug;
 pub use graphic_nodes;
 pub use graphic_types::{Artboard, Graphic, Vector};
 pub use math_nodes;
-pub use path_bool_nodes as path_bool;
+pub use path_bool_nodes;
 pub use raster_nodes;
 pub use repeat_nodes;
 pub use text_nodes;

node-graph/nodes/path-bool/Cargo.toml

@@ -6,22 +6,13 @@ description = "Path boolean operation nodes for Graphene"
 authors = ["Graphite Authors <contact@graphite.art>"]
 license = "MIT OR Apache-2.0"
 
-[features]
-wasm = ["core-types/wasm", "tsify", "wasm-bindgen"]
-
 [dependencies]
 # Local dependencies
-dyn-any = { workspace = true }
 core-types = { workspace = true }
 graphic-types = { workspace = true }
 node-macro = { workspace = true }
 glam = { workspace = true }
 linesweeper = { workspace = true }
 log = { workspace = true }
-serde = { workspace = true }
 smallvec = { workspace = true }
 vector-types = { workspace = true }
-
-# Optional workspace dependencies
-tsify = { workspace = true, optional = true }
-wasm-bindgen = { workspace = true, optional = true }

node-graph/nodes/path-bool/src/lib.rs

@@ -1,6 +1,5 @@
 use core_types::table::{Table, TableRow, TableRowRef};
 use core_types::{Color, Ctx};
-use dyn_any::DynAny;
 use glam::{DAffine2, DVec2};
 use graphic_types::vector_types::subpath::{ManipulatorGroup, Subpath};
 use graphic_types::vector_types::vector::PointId;
@@ -11,28 +10,12 @@ use linesweeper::topology::Topology;
 use linesweeper::{BinaryOp, FillRule, binary_op};
 use smallvec::SmallVec;
 use vector_types::kurbo::{Affine, BezPath, CubicBez, Line, ParamCurve, PathSeg, Point, QuadBez};
+pub use vector_types::vector::misc::BooleanOperation;
 
 // TODO: Fix boolean ops to work by removing .transform() and .one_instance_*() calls,
 // TODO: since before we used a Vec of single-row tables and now we use a single table
 // TODO: with multiple rows while still assuming a single row for the boolean operations.
 
-#[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash, DynAny, node_macro::ChoiceType)]
-#[widget(Radio)]
-pub enum BooleanOperation {
-	#[default]
-	#[icon("BooleanUnion")]
-	Union,
-	#[icon("BooleanSubtractFront")]
-	SubtractFront,
-	#[icon("BooleanSubtractBack")]
-	SubtractBack,
-	#[icon("BooleanIntersect")]
-	Intersect,
-	#[icon("BooleanDifference")]
-	Difference,
-}
-
 /// Combines the geometric forms of one or more closed paths into a new vector path that results from cutting or joining the paths by the chosen method.
 #[node_macro::node(category(""))]
 async fn boolean_operation<I: graphic_types::IntoGraphicTable + 'n + Send + Clone>(