Merge branch 'master' into node-network-interface

Author: adamgerhant

Cargo.lock

@@ -19,6 +19,7 @@ members = [
 	"libraries/dyn-any",
 	"libraries/bezier-rs",
 	"libraries/raw-rs",
+	"libraries/raw-rs/tag-derive",
 	"website/other/bezier-rs-demos/wasm",
 ]
 resolver = "2"
@@ -48,7 +49,7 @@ tempfile = "3"
 thiserror = "1.0"
 anyhow = "1.0.66"
 proc-macro2 = "1"
-syn = { version = "2.0", default-features = false, features = ["full"] }
+syn = { version = "2.0", default-features = false, features = ["full", "derive"] }
 quote = "1.0"
 axum = "0.6"
 chrono = "^0.4.23"

Cargo.toml

@@ -64,3 +64,10 @@ web-sys = { workspace = true, features = [
 [dev-dependencies]
 env_logger = "0.10"
 futures = { workspace = true }
+tokio = { workspace = true, features = ["rt", "macros"] }
+
+[lints.rust]
+# TODO: figure out why we check these features when they do not exist
+unexpected_cfgs = { level = "warn", check-cfg = [
+	'cfg(feature, values("resvg", "vello"))',
+] }

demo-artwork/isometric-fountain.graphite

@@ -21,8 +21,8 @@ impl Editor {
 		std::mem::take(&mut self.dispatcher.responses)
 	}
 
-	pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) {
-		self.dispatcher.poll_node_graph_evaluation(responses);
+	pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) -> Result<(), String> {
+		self.dispatcher.poll_node_graph_evaluation(responses)
 	}
 }
 

demo-artwork/just-a-potted-cactus.graphite

@@ -49,7 +49,6 @@ pub const MANIPULATOR_GROUP_MARKER_SIZE: f64 = 6.;
 pub const SELECTION_THRESHOLD: f64 = 10.;
 pub const HIDE_HANDLE_DISTANCE: f64 = 3.;
 pub const INSERT_POINT_ON_SEGMENT_TOO_FAR_DISTANCE: f64 = 50.;
-pub const INSERT_POINT_ON_SEGMENT_TOO_CLOSE_DISTANCE: f64 = 5.;
 
 // Pen tool
 pub const CREATE_CURVE_THRESHOLD: f64 = 5.;

demo-artwork/procedural-string-lights.graphite

@@ -36,6 +36,7 @@ const SIDE_EFFECT_FREE_MESSAGES: &[MessageDiscriminant] = &[
 	))),
 	MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::DocumentStructureChanged)),
 	MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::Overlays(OverlaysMessageDiscriminant::Draw))),
+	MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::RenderRulers)),
 	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::UpdateDocumentLayerStructure),
 	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::TriggerFontLoad),
 ];
@@ -205,8 +206,8 @@ impl Dispatcher {
 		list
 	}
 
-	pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) {
-		self.message_handlers.portfolio_message_handler.poll_node_graph_evaluation(responses);
+	pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) -> Result<(), String> {
+		self.message_handlers.portfolio_message_handler.poll_node_graph_evaluation(responses)
 	}
 
 	/// Create the tree structure for logging the messages as a tree
@@ -262,10 +263,7 @@ mod test {
 	use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;
 	use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 	use crate::messages::prelude::*;
-	use crate::messages::tool::tool_messages::tool_prelude::ToolType;
 	use crate::test_utils::EditorTestUtils;
-
-	use graph_craft::document::NodeId;
 	use graphene_core::raster::color::Color;
 
 	fn init_logger() {
@@ -412,11 +410,9 @@ mod test {
 		assert_eq!(layers_after_copy[5], shape_id);
 	}
 
-	// TODO: Fix text
-	#[ignore]
-	#[test]
+	#[tokio::test]
 	/// This test will fail when you make changes to the underlying serialization format for a document.
-	fn check_if_demo_art_opens() {
+	async fn check_if_demo_art_opens() {
 		use crate::messages::layout::utility_types::widget_prelude::*;
 
 		let print_problem_to_terminal_on_failure = |value: &String| {
@@ -449,6 +445,16 @@ mod test {
 				document_name: document_name.into(),
 				document_serialized_content,
 			});
+			println!("Responses:\n{responses:#?}");
+
+			// Check if the graph renders
+			let portfolio = &mut editor.dispatcher.message_handlers.portfolio_message_handler;
+			portfolio
+				.executor
+				.submit_node_graph_evaluation(portfolio.documents.get_mut(&portfolio.active_document_id.unwrap()).unwrap(), glam::UVec2::ONE);
+			crate::node_graph_executor::run_node_graph().await;
+			let mut messages = VecDeque::new();
+			editor.poll_node_graph_evaluation(&mut messages).expect("Graph should render");
 
 			for response in responses {
 				// Check for the existence of the file format incompatibility warning dialog after opening the test file

demo-artwork/red-dress.graphite

@@ -99,6 +99,19 @@ pub enum FrontendMessage {
 		#[serde(rename = "copyText")]
 		copy_text: String,
 	},
+	// TODO: Eventually remove this (probably starting late 2024)
+	TriggerUpgradeDocumentToVectorManipulationFormat {
+		#[serde(rename = "documentId")]
+		document_id: DocumentId,
+		#[serde(rename = "documentName")]
+		document_name: String,
+		#[serde(rename = "documentIsAutoSaved")]
+		document_is_auto_saved: bool,
+		#[serde(rename = "documentIsSaved")]
+		document_is_saved: bool,
+		#[serde(rename = "documentSerializedContent")]
+		document_serialized_content: String,
+	},
 	TriggerViewportResize,
 	TriggerVisitLink {
 		url: String,

demo-artwork/valley-of-spires.graphite

@@ -1145,12 +1145,12 @@ impl DocumentMessageHandler {
 	}
 
 	/// Find the deepest layer given in the sorted array (by returning the one which is not a folder from the list of layers under the click location).
-	pub fn find_deepest(&self, node_list: &[LayerNodeIdentifier], metadata: &DocumentMetadata) -> Option<LayerNodeIdentifier> {
+	pub fn find_deepest(&self, node_list: &[LayerNodeIdentifier]) -> Option<LayerNodeIdentifier> {
 		node_list
 			.iter()
 			.find(|&&layer| {
 				if layer != LayerNodeIdentifier::ROOT_PARENT {
-					layer.has_children(metadata)
+					layer.has_children(self.network_interface.document_metadata())
 				} else {
 					log::error!("ROOT_PARENT should not exist in find_deepest");
 					false
@@ -1160,35 +1160,27 @@ impl DocumentMessageHandler {
 	}
 
 	/// Find any layers sorted by index that are under the given location in viewport space.
-	pub fn click_list_any(&self, viewport_location: DVec2) -> Vec<LayerNodeIdentifier> {
-		self.click_xray(viewport_location)
-			.filter(|&layer| !self.network_interface.is_artboard(&layer.to_node()))
-			.collect::<Vec<_>>()
+	pub fn click_xray_no_artboards<'a>(&'a self, viewport_location: DVec2) -> impl Iterator<Item = LayerNodeIdentifier> + 'a {
+		self.click_xray(viewport_location).filter(move |&layer| !self.network_interface.is_artboard(&layer.to_node()))
 	}
 
 	/// Find layers under the location in viewport space that was clicked, listed by their depth in the layer tree hierarchy.
-	pub fn click_list(&self, viewport_location: DVec2, metadata: &DocumentMetadata) -> Vec<LayerNodeIdentifier> {
-		let mut node_list = self.click_list_any(viewport_location);
-		node_list.truncate(
-			node_list
-				.iter()
-				.position(|&layer| {
-					if layer != LayerNodeIdentifier::ROOT_PARENT {
-						layer.has_children(metadata)
-					} else {
-						log::error!("ROOT_PARENT should not exist in click_list_any");
-						false
-					}
-				})
-				.unwrap_or(0)
-				+ 1,
-		);
-		node_list
+	pub fn click_list<'a>(&'a self, viewport_location: DVec2) -> impl Iterator<Item = LayerNodeIdentifier> + 'a {
+		self.click_xray_no_artboards(viewport_location)
+			.skip_while(|&layer| layer == LayerNodeIdentifier::ROOT_PARENT)
+			.scan(true, |last_had_children, layer| {
+				if *last_had_children {
+					*last_had_children = layer.has_children(self.network_interface.document_metadata());
+					Some(layer)
+				} else {
+					None
+				}
+			})
 	}
 
 	/// Find the deepest layer that has been clicked on from a location in viewport space.
-	pub fn click(&self, viewport_location: DVec2, metadata: &DocumentMetadata) -> Option<LayerNodeIdentifier> {
-		self.click_list(viewport_location, metadata).last().copied()
+	pub fn click(&self, viewport_location: DVec2) -> Option<LayerNodeIdentifier> {
+		self.click_list(viewport_location).last()
 	}
 
 	/// Get the combined bounding box of the click targets of the selected visible layers in viewport space

editor/Cargo.toml

@@ -1,5 +1,4 @@
 use super::utility_types::TransformIn;
-use super::utility_types::VectorDataModification;
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::portfolio::document::utility_types::network_interface::NodeTemplate;
 use crate::messages::prelude::*;
@@ -8,9 +7,10 @@ use bezier_rs::Subpath;
 use graph_craft::document::{DocumentNode, NodeId, NodeInput};
 use graphene_core::raster::{BlendMode, ImageFrame};
 use graphene_core::text::Font;
-use graphene_core::uuid::ManipulatorGroupId;
 use graphene_core::vector::brush_stroke::BrushStroke;
 use graphene_core::vector::style::{Fill, Stroke};
+use graphene_core::vector::PointId;
+use graphene_core::vector::VectorModificationType;
 use graphene_core::{Artboard, Color};
 use graphene_std::vector::misc::BooleanOperation;
 
@@ -46,11 +46,6 @@ pub enum GraphOperationMessage {
 		layer: LayerNodeIdentifier,
 		blend_mode: BlendMode,
 	},
-	UpdateBounds {
-		layer: LayerNodeIdentifier,
-		old_bounds: [DVec2; 2],
-		new_bounds: [DVec2; 2],
-	},
 	StrokeSet {
 		layer: LayerNodeIdentifier,
 		stroke: Stroke,
@@ -73,7 +68,7 @@ pub enum GraphOperationMessage {
 	},
 	Vector {
 		layer: LayerNodeIdentifier,
-		modification: VectorDataModification,
+		modification_type: VectorModificationType,
 	},
 	Brush {
 		layer: LayerNodeIdentifier,
@@ -97,7 +92,7 @@ pub enum GraphOperationMessage {
 	},
 	NewVectorLayer {
 		id: NodeId,
-		subpaths: Vec<Subpath<ManipulatorGroupId>>,
+		subpaths: Vec<Subpath<PointId>>,
 		parent: LayerNodeIdentifier,
 		insert_index: isize,
 	},