Store cached transforms upon the document

Author: 0HyperCube

document-legacy/src/document_metadata.rs

@@ -6,7 +6,7 @@ use graph_craft::document::{NodeId, NodeNetwork};
 
 #[derive(Debug, Clone)]
 pub struct DocumentMetadata {
-	transforms: HashMap<NodeId, DAffine2>,
+	transforms: HashMap<LayerNodeIdentifier, DAffine2>,
 	structure: HashMap<LayerNodeIdentifier, NodeRelations>,
 }
 
@@ -29,13 +29,16 @@ impl DocumentMetadata {
 	fn get_structure_mut(&mut self, node_identifier: LayerNodeIdentifier) -> &mut NodeRelations {
 		self.structure.entry(node_identifier).or_default()
 	}
+	pub fn update_transforms(&mut self, new_transforms: HashMap<LayerNodeIdentifier, DAffine2>) {
+		self.transforms = new_transforms;
+	}
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct LayerNodeIdentifier(NonZeroU64);
 impl LayerNodeIdentifier {
 	const ROOT: Self = LayerNodeIdentifier::new_unchecked(0);
-	const fn new_unchecked(node_id: NodeId) -> Self {
+	pub const fn new_unchecked(node_id: NodeId) -> Self {
 		// Safety: will always be >=1
 		Self(unsafe { NonZeroU64::new_unchecked(node_id + 1) })
 	}

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -667,8 +667,12 @@ impl PortfolioMessageHandler {
 	}
 
 	pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) {
-		let transform = self.active_document().map(|document| document.document_legacy.root.transform).unwrap_or(DAffine2::IDENTITY);
-		self.executor.poll_node_graph_evaluation(transform, responses).unwrap_or_else(|e| {
+		let Some(active_document) = 	self.active_document_id.and_then(|id| self.documents.get_mut(&id)) else {
+			warn!("Polling node graph with no document");
+			return;
+		};
+
+		self.executor.poll_node_graph_evaluation(&mut active_document.document_legacy, responses).unwrap_or_else(|e| {
 			log::error!("Error while evaluating node graph: {}", e);
 		});
 	}

editor/src/node_graph_executor.rs

@@ -1,9 +1,11 @@
 use crate::messages::frontend::utility_types::FrontendImageData;
-use crate::messages::portfolio::document::node_graph::wrap_network_in_scope;
+use crate::messages::portfolio::document::node_graph::{wrap_network_in_scope, LayerIdentifier};
 use crate::messages::portfolio::document::utility_types::misc::{LayerMetadata, LayerPanelEntry};
 use crate::messages::portfolio::utility_types::PersistentData;
 use crate::messages::prelude::*;
 
+use document_legacy::document::Document as DocumentLegacy;
+use document_legacy::document_metadata::LayerNodeIdentifier;
 use document_legacy::layers::layer_info::{LayerDataType, LayerDataTypeDiscriminant};
 use document_legacy::{LayerId, Operation};
 
@@ -19,7 +21,7 @@ use graphene_core::text::FontCache;
 use graphene_core::transform::Transform;
 use graphene_core::vector::style::ViewMode;
 
-use graphene_core::{Color, SurfaceFrame, SurfaceId};
+use graphene_core::{Color, NodeIdentifier, SurfaceFrame, SurfaceId};
 use graphene_std::wasm_application_io::{WasmApplicationIo, WasmEditorApi};
 use interpreted_executor::dynamic_executor::DynamicExecutor;
 
@@ -77,8 +79,8 @@ pub(crate) struct GenerationResponse {
 	result: Result<TaggedValue, String>,
 	updates: VecDeque<Message>,
 	new_thumbnails: HashMap<NodeId, SvgSegmentList>,
-	new_click_targets: HashMap<NodeId, Vec<ClickTarget>>,
-	new_transforms: HashMap<NodeId, DAffine2>,
+	new_click_targets: HashMap<LayerNodeIdentifier, Vec<ClickTarget>>,
+	new_transforms: HashMap<LayerNodeIdentifier, DAffine2>,
 }
 
 enum NodeGraphUpdate {
@@ -157,8 +159,8 @@ impl NodeRuntime {
 						result,
 						updates: responses,
 						new_thumbnails: self.thumbnails.clone(),
-						new_click_targets: self.click_targets.clone(),
-						new_transforms: self.transforms.clone(),
+						new_click_targets: self.click_targets.clone().into_iter().map(|(id, targets)| (LayerNodeIdentifier::new_unchecked(id), targets)).collect(),
+						new_transforms: self.transforms.clone().into_iter().map(|(id, transform)| (LayerNodeIdentifier::new_unchecked(id), transform)).collect(),
 					};
 					self.sender.send_generation_response(response);
 				}
@@ -460,7 +462,7 @@ impl NodeGraphExecutor {
 		Ok(())
 	}
 
-	pub fn poll_node_graph_evaluation(&mut self, transform: DAffine2, responses: &mut VecDeque<Message>) -> Result<(), String> {
+	pub fn poll_node_graph_evaluation(&mut self, document: &mut DocumentLegacy, responses: &mut VecDeque<Message>) -> Result<(), String> {
 		let results = self.receiver.try_iter().collect::<Vec<_>>();
 		for response in results {
 			match response {
@@ -473,10 +475,11 @@ impl NodeGraphExecutor {
 					new_transforms,
 				}) => {
 					self.thumbnails = new_thumbnails;
+					document.metadata.update_transforms(new_transforms);
 					let node_graph_output = result.map_err(|e| format!("Node graph evaluation failed: {:?}", e))?;
 					let execution_context = self.futures.remove(&generation_id).ok_or_else(|| "Invalid generation ID".to_string())?;
 					responses.extend(updates);
-					self.process_node_graph_output(node_graph_output, execution_context.layer_path.clone(), transform, responses, execution_context.document_id)?;
+					self.process_node_graph_output(node_graph_output, execution_context.layer_path.clone(), responses, execution_context.document_id)?;
 					responses.add(DocumentMessage::LayerChanged {
 						affected_layer_path: execution_context.layer_path,
 					});
@@ -495,7 +498,7 @@ impl NodeGraphExecutor {
 		Ok(())
 	}
 
-	fn process_node_graph_output(&mut self, node_graph_output: TaggedValue, layer_path: Vec<LayerId>, _transform: DAffine2, responses: &mut VecDeque<Message>, document_id: u64) -> Result<(), String> {
+	fn process_node_graph_output(&mut self, node_graph_output: TaggedValue, layer_path: Vec<LayerId>, responses: &mut VecDeque<Message>, document_id: u64) -> Result<(), String> {
 		self.last_output_type.insert(layer_path.clone(), Some(node_graph_output.ty()));
 		match node_graph_output {
 			TaggedValue::VectorData(vector_data) => {