Reduce rendered nodes

Author: adamgerhant

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

@@ -1321,21 +1321,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 				responses.add(FrontendMessage::UpdateNodeGraphWires { wires });
 			}
 			NodeGraphMessage::UpdateVisibleNodes => {
-				let Some(network_metadata) = network_interface.network_metadata(breadcrumb_network_path) else {
-					return;
-				};
-				let document_bbox = ipp.document_bounds(network_metadata.persistent_metadata.navigation_metadata.node_graph_to_viewport.inverse());
-				let mut nodes = Vec::new();
-				for node_id in &self.frontend_nodes {
-					let Some(node_bbox) = network_interface.node_bounding_box(node_id, breadcrumb_network_path) else {
-						log::error!("Could not get bbox for node: {:?}", node_id);
-						continue;
-					};
-					if node_bbox[1].x >= document_bbox[0].x && node_bbox[0].x <= document_bbox[1].x && node_bbox[1].y >= document_bbox[0].y && node_bbox[0].y <= document_bbox[1].y {
-						nodes.push(*node_id);
-					}
-				}
-
+				let nodes = self.visible_nodes(network_interface, breadcrumb_network_path, ipp);
 				responses.add(FrontendMessage::UpdateVisibleNodes { nodes });
 			}
 			NodeGraphMessage::SendGraph => {
@@ -2367,6 +2353,24 @@ impl NodeGraphMessageHandler {
 		nodes
 	}
 
+	pub fn visible_nodes(&self, network_interface: &mut NodeNetworkInterface, breadcrumb_network_path: &[NodeId], ipp: &InputPreprocessorMessageHandler) -> Vec<NodeId> {
+		let Some(network_metadata) = network_interface.network_metadata(breadcrumb_network_path) else {
+			return Vec::new();
+		};
+		let document_bbox = ipp.document_bounds(network_metadata.persistent_metadata.navigation_metadata.node_graph_to_viewport.inverse());
+		let mut nodes = Vec::new();
+		for node_id in &self.frontend_nodes {
+			let Some(node_bbox) = network_interface.node_bounding_box(node_id, breadcrumb_network_path) else {
+				log::error!("Could not get bbox for node: {:?}", node_id);
+				continue;
+			};
+			if node_bbox[1].x >= document_bbox[0].x && node_bbox[0].x <= document_bbox[1].x && node_bbox[1].y >= document_bbox[0].y && node_bbox[0].y <= document_bbox[1].y {
+				nodes.push(*node_id);
+			}
+		}
+		nodes
+	}
+
 	fn collect_subgraph_names(network_interface: &mut NodeNetworkInterface, breadcrumb_network_path: &[NodeId]) -> Option<Vec<String>> {
 		let mut current_network_path = vec![];
 		let mut current_network = network_interface.nested_network(&current_network_path).unwrap();

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -819,7 +819,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 			}
 			PortfolioMessage::EvaluateActiveDocumentWithThumbnails => {
 				responses.add(PortfolioMessage::EvaluateActiveDocument {
-					nodes_to_introspect: self.nodes_to_try_render(ipp.viewport_bounds()[1], &preferences.graph_wire_style),
+					nodes_to_introspect: self.visible_nodes_to_try_render(ipp, &preferences.graph_wire_style),
 				});
 				responses.add(Message::StartEvaluationQueue);
 				responses.add(PortfolioMessage::ProcessThumbnails);
@@ -847,7 +847,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 				context.real_time = Some(ipp.time);
 				context.downstream_transform = Some(DAffine2::IDENTITY);
 
-				let nodes_to_try_render = self.nodes_to_try_render(ipp.viewport_bounds()[1], &preferences.graph_wire_style);
+				let nodes_to_try_render = self.visible_nodes_to_try_render(ipp, &preferences.graph_wire_style);
 
 				self.executor.submit_node_graph_evaluation(context, None, None, nodes_to_try_render);
 			}
@@ -1242,7 +1242,7 @@ impl PortfolioMessageHandler {
 		result
 	}
 
-	pub fn nodes_to_try_render(&mut self, viewport_size: DVec2, graph_wire_style: &GraphWireStyle) -> HashSet<SNI> {
+	pub fn visible_nodes_to_try_render(&mut self, ipp: &InputPreprocessorMessageHandler, graph_wire_style: &GraphWireStyle) -> HashSet<SNI> {
 		let Some(document) = self.active_document_id.and_then(|document_id| self.documents.get_mut(&document_id)) else {
 			log::error!("Tried to render non-existent document: {:?}", self.active_document_id);
 			return HashSet::new();
@@ -1284,7 +1284,8 @@ impl PortfolioMessageHandler {
 					.viewport_loaded_thumbnail_position(&input_connector, graph_wire_style, &document.breadcrumb_network_path)
 				{
 					log::debug!("viewport position: {:?}, input: {:?}", viewport_position, input_connector);
-					let in_view = viewport_position.x < 0.0 || viewport_position.y < 0.0 || viewport_position.x > viewport_size.x || viewport_position.y > viewport_size.y;
+
+					let in_view = viewport_position.x > 0.0 && viewport_position.y > 0.0 && viewport_position.x < ipp.viewport_bounds()[1].x && viewport_position.y < ipp.viewport_bounds()[1].y;
 					if in_view {
 						let Some(protonode) = document.network_interface.protonode_from_input(&input_connector, &document.breadcrumb_network_path) else {
 							// The input is not connected to the export, which occurs if inside a disconnected node
@@ -1299,21 +1300,27 @@ impl PortfolioMessageHandler {
 		};
 
 		// Get thumbnails for all visible layer
-		for visible_node in &document.node_graph_handler.frontend_nodes {
+		for visible_node in &document.node_graph_handler.visible_nodes(&mut document.network_interface, &document.breadcrumb_network_path, ipp) {
 			if document.network_interface.is_layer(&visible_node, &document.breadcrumb_network_path) {
-				log::debug!("visible_node: {:?}", visible_node);
 				let Some(protonode) = document
 					.network_interface
-					.protonode_from_output(&OutputConnector::node(*visible_node, 1), &document.breadcrumb_network_path)
+					.protonode_from_output(&OutputConnector::node(*visible_node, 0), &document.breadcrumb_network_path)
 				else {
 					continue;
 				};
 				nodes_to_render.insert(protonode);
 			}
 		}
 
-		// Get all protonodes for all connected side layer inputs connected to the export in the document network
+		// Get all protonodes for all connected side layer inputs visible in the layer panel
 		for layer in document.network_interface.document_metadata().all_layers() {
+			if layer
+				.ancestors(document.network_interface.document_metadata())
+				.skip(1)
+				.any(|ancestor| document.collapsed.0.contains(&ancestor))
+			{
+				continue;
+			};
 			let connector = InputConnector::Node {
 				node_id: layer.to_node(),
 				input_index: 1,

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

@@ -419,7 +419,8 @@ impl BorrowTree {
 				let nullify_when_calling = node_construction_args.context_dependencies.inverse();
 
 				let cached_protonode = if let Some(cache_constructor) = typing_context.cache_constructor(&types.return_value.nested_type()) {
-					let cache = cache_constructor(protonode, MonitorMemoNodeState::Disabled);
+					// Every cache stores its first evaluation, because if it acts as a pass through on the first evaluation, it can become cached and it wont be possible to know its value for its thumbnail
+					let cache = cache_constructor(protonode, MonitorMemoNodeState::StoreFirstEvaluation);
 					let cache_node_container = NodeContainer::new(cache);
 					if node_construction_args.cache_output {
 						cache_node_container.permanently_enable_cache();