Fix pen tool (except overlays)

Author: 0HyperCube

editor/src/messages/tool/common_functionality/graph_modification_utils.rs

@@ -4,7 +4,7 @@ use crate::messages::prelude::*;
 
 use bezier_rs::{ManipulatorGroup, Subpath};
 use document_legacy::{LayerId, Operation};
-use graph_craft::document::NodeNetwork;
+use graph_craft::document::{value::TaggedValue, DocumentNode, NodeId, NodeInput, NodeNetwork};
 use graphene_core::uuid::ManipulatorGroupId;
 
 use glam::DAffine2;
@@ -43,3 +43,55 @@ pub fn set_manipulator_mirror_angle(manipulator_groups: &Vec<ManipulatorGroup<Ma
 		});
 	}
 }
+
+/// An immutable reference to a layer within the document node graph for easy access.
+pub struct NodeGraphLayer<'a> {
+	node_graph: &'a NodeNetwork,
+	outwards_links: HashMap<NodeId, Vec<NodeId>>,
+	layer_node: NodeId,
+}
+
+impl<'a> NodeGraphLayer<'a> {
+	/// Get the layer node from the document
+	pub fn new(layer: &[LayerId], document: &'a document_legacy::document::Document) -> Option<Self> {
+		let node_graph = &document.document_network;
+		let outwards_links = document.document_network.collect_outwards_links();
+
+		let Some(mut layer_node) = layer.last().copied() else {
+			error!("Tried to modify root layer");
+			return None;
+		};
+		while node_graph.nodes.get(&layer_node)?.name != "Layer" {
+			layer_node = outwards_links.get(&layer_node)?.first().copied()?;
+		}
+		Some(Self {
+			node_graph,
+			outwards_links,
+			layer_node,
+		})
+	}
+
+	/// Return an iterator up the primary flow of the layer
+	pub fn primary_layer_flow(&self) -> impl Iterator<Item = (&'a DocumentNode, u64)> {
+		self.node_graph.primary_flow_from_opt(Some(self.layer_node))
+	}
+
+	/// Find a specific input of a node within the layer's primary flow
+	pub fn find_input(&self, node_name: &str, index: usize) -> Option<&'a TaggedValue> {
+		for (node, _id) in self.primary_layer_flow() {
+			if node.name == node_name {
+				let subpaths_input = node.inputs.get(index)?;
+				let NodeInput::Value {
+					tagged_value,
+					..
+				} = subpaths_input
+				else {
+					continue;
+				};
+
+				return Some(&tagged_value);
+			}
+		}
+		None
+	}
+}

editor/src/messages/tool/common_functionality/overlay_renderer.rs

@@ -50,6 +50,7 @@ impl OverlayRenderer {
 			let layer_id = layer_path.last().unwrap();
 			self.layer_overlay_visibility(document, layer_path.clone(), true, responses);
 
+			// How we get vector data from graph?
 			if let Some(vector_data) = layer.as_vector_data() {
 				let outline_cache = self.shape_overlay_cache.get(layer_id);
 				trace!("Overlay: Outline cache {:?}", &outline_cache);

editor/src/messages/tool/tool_messages/pen_tool.rs

@@ -10,6 +10,7 @@ use crate::messages::prelude::*;
 use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType};
 use crate::messages::tool::common_functionality::graph_modification_utils;
 use crate::messages::tool::common_functionality::overlay_renderer::OverlayRenderer;
+use crate::messages::tool::tool_messages::pen_tool::graph_modification_utils::NodeGraphLayer;
 
 use crate::messages::tool::common_functionality::snapping::SnapManager;
 use crate::messages::tool::utility_types::{EventToMessageMap, Fsm, ToolActionHandlerData, ToolMetadata, ToolTransition, ToolType};
@@ -18,7 +19,6 @@ use crate::messages::tool::utility_types::{HintData, HintGroup, HintInfo};
 use bezier_rs::Subpath;
 use document_legacy::LayerId;
 use graph_craft::document::value::TaggedValue;
-use graph_craft::document::NodeInput;
 use graphene_core::uuid::ManipulatorGroupId;
 use graphene_core::vector::style::{Fill, Stroke};
 use graphene_core::vector::{ManipulatorPointId, SelectedType};
@@ -794,21 +794,9 @@ fn should_extend(document: &DocumentMessageHandler, pos: DVec2, tolerance: f64)
 }
 
 fn get_subpaths<'a>(layer_path: &[LayerId], document: &'a DocumentMessageHandler) -> Option<&'a Vec<Subpath<ManipulatorGroupId>>> {
-	let layer = document.document_legacy.layer(layer_path).ok().and_then(|layer| layer.as_layer().ok())?;
-	let network = &layer.network;
-	for (node, _node_id) in network.primary_flow() {
-		if node.name == "Path Generator" {
-			let subpaths_input = node.inputs.get(0)?;
-			let NodeInput::Value {
-				tagged_value: TaggedValue::Subpaths(subpaths),
-				..
-			} = subpaths_input
-			else {
-				continue;
-			};
-
-			return Some(subpaths);
-		}
+	if let TaggedValue::Subpaths(subpaths) = NodeGraphLayer::new(layer_path, &document.document_legacy)?.find_input("Path Generator", 0)? {
+		Some(subpaths)
+	} else {
+		None
 	}
-	None
 }