Remove the path-bool library (#3882)

Author: TrueDoctor

Cargo.lock

@@ -10,7 +10,6 @@ members = [
 	"editor",
 	"frontend/wasm",
 	"libraries/dyn-any",
-	"libraries/path-bool",
 	"libraries/math-parser",
 	"node-graph/libraries/*",
 	"node-graph/nodes/*",
@@ -33,7 +32,6 @@ default-members = [
 	"editor",
 	"frontend/wasm",
 	"libraries/dyn-any",
-	"libraries/path-bool",
 	"libraries/math-parser",
 	"node-graph/graph-craft",
 	"node-graph/interpreted-executor",
@@ -67,7 +65,6 @@ dyn-any = { path = "libraries/dyn-any", features = [
 ] }
 preprocessor = { path = "node-graph/preprocessor" }
 math-parser = { path = "libraries/math-parser" }
-path-bool = { path = "libraries/path-bool" }
 graphene-application-io = { path = "node-graph/libraries/application-io" }
 core-types = { path = "node-graph/libraries/core-types" }
 no-std-types = { path = "node-graph/libraries/no-std-types" }

Cargo.toml

@@ -3,7 +3,7 @@ use crate::messages::input_mapper::utility_types::macros::action_shortcut;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, FlipAxis, GroupFolderType};
 use crate::messages::prelude::*;
-use graphene_std::path_bool::BooleanOperation;
+use graphene_std::vector::misc::BooleanOperation;
 
 #[derive(Debug, Clone, Default, ExtractField)]
 pub struct MenuBarMessageHandler {

editor/src/messages/menu_bar/menu_bar_message_handler.rs

@@ -29,7 +29,7 @@ use glam::{DAffine2, DVec2, IVec2};
 use graph_craft::document::value::TaggedValue;
 use graph_craft::document::{NodeId, NodeInput, NodeNetwork, OldNodeNetwork};
 use graphene_std::math::quad::Quad;
-use graphene_std::path_bool::boolean_intersect;
+use graphene_std::path_bool_nodes::boolean_intersect;
 use graphene_std::raster::BlendMode;
 use graphene_std::raster_types::Raster;
 use graphene_std::render_node::wgpu_available;

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -76,7 +76,7 @@ pub enum GraphOperationMessage {
 	},
 	NewBooleanOperationLayer {
 		id: NodeId,
-		operation: graphene_std::path_bool::BooleanOperation,
+		operation: graphene_std::vector::misc::BooleanOperation,
 		parent: LayerNodeIdentifier,
 		insert_index: usize,
 	},

editor/src/messages/portfolio/document/graph_operation/graph_operation_message.rs

@@ -142,7 +142,7 @@ impl<'a> ModifyInputsContext<'a> {
 		LayerNodeIdentifier::new(new_id, self.network_interface)
 	}
 
-	pub fn insert_boolean_data(&mut self, operation: graphene_std::path_bool::BooleanOperation, layer: LayerNodeIdentifier) {
+	pub fn insert_boolean_data(&mut self, operation: graphene_std::vector::misc::BooleanOperation, layer: LayerNodeIdentifier) {
 		let boolean = resolve_network_node_type("Boolean Operation").expect("Boolean node does not exist").node_template_input_override([
 			Some(NodeInput::value(TaggedValue::Graphic(Default::default()), true)),
 			Some(NodeInput::value(TaggedValue::BooleanOperation(operation), false)),

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

@@ -1783,7 +1783,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 						nodes: vec![
 							DocumentNode {
 								inputs: vec![NodeInput::import(concrete!(Table<Vector>), 0), NodeInput::import(concrete!(vector::style::Fill), 1)],
-								implementation: DocumentNodeImplementation::ProtoNode(path_bool::boolean_operation::IDENTIFIER),
+								implementation: DocumentNodeImplementation::ProtoNode(path_bool_nodes::boolean_operation::IDENTIFIER),
 								call_argument: generic!(T),
 								..Default::default()
 							},
@@ -1802,7 +1802,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
 					}),
 					inputs: vec![
 						NodeInput::value(TaggedValue::Graphic(Default::default()), true),
-						NodeInput::value(TaggedValue::BooleanOperation(path_bool::BooleanOperation::Union), false),
+						NodeInput::value(TaggedValue::BooleanOperation(vector::misc::BooleanOperation::Union), false),
 					],
 					..Default::default()
 				},

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

@@ -16,7 +16,6 @@ use graph_craft::{Type, concrete};
 use graphene_std::NodeInputDecleration;
 use graphene_std::animation::RealTimeMode;
 use graphene_std::extract_xy::XY;
-use graphene_std::path_bool::BooleanOperation;
 use graphene_std::raster::curve::Curve;
 use graphene_std::raster::{
 	BlendMode, CellularDistanceFunction, CellularReturnType, Color, DomainWarpType, FractalType, LuminanceCalculation, NoiseType, RedGreenBlue, RedGreenBlueAlpha, RelativeAbsolute,
@@ -26,6 +25,7 @@ use graphene_std::table::{Table, TableRow};
 use graphene_std::text::{Font, TextAlign};
 use graphene_std::transform::{Footprint, ReferencePoint, Transform};
 use graphene_std::vector::QRCodeErrorCorrectionLevel;
+use graphene_std::vector::misc::BooleanOperation;
 use graphene_std::vector::misc::{ArcType, CentroidType, ExtrudeJoiningAlgorithm, GridType, MergeByDistanceAlgorithm, PointSpacingType, RowsOrColumns, SpiralType};
 use graphene_std::vector::style::{Fill, FillChoice, FillType, GradientStops, GradientType, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin};
 

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

@@ -710,5 +710,5 @@ impl PTZ {
 #[derive(Clone, Copy, Debug, PartialEq, serde::Serialize, serde::Deserialize)]
 pub enum GroupFolderType {
 	Layer,
-	BooleanOperation(graphene_std::path_bool::BooleanOperation),
+	BooleanOperation(graphene_std::vector::misc::BooleanOperation),
 }

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

@@ -28,6 +28,7 @@ const TEXT_REPLACEMENTS: &[(&str, &str)] = &[
 	),
 	("graphene_core::transform::Footprint", "graphene_core::transform::Footprint"),
 	("\"OptionalF64\":", "\"F64\":"),
+	("\"path_bool_nodes::BooleanOperation\"", "\"vector_types::vector::misc::BooleanOperation\""),
 ];
 
 pub struct NodeReplacement<'a> {
@@ -454,10 +455,10 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 		],
 	},
 	// ================================
-	// path-bool
+	// path bool
 	// ================================
 	NodeReplacement {
-		node: graphene_std::path_bool::boolean_operation::IDENTIFIER,
+		node: graphene_std::path_bool_nodes::boolean_operation::IDENTIFIER,
 		aliases: &["graphene_path_bool::BooleanOperationNode", "graphene_std::vector::BooleanOperationNode"],
 	},
 	// ================================