Final frontend network interface file

Author: adamgerhant

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

@@ -1634,12 +1634,9 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 				responses.add(PropertiesPanelMessage::Refresh);
 				responses.add(NodeGraphMessage::UpdateActionButtons);
 				if graph_view_overlay_open {
-					let nodes_to_render = self.collect_nodes(network_interface, breadcrumb_network_path);
+					let nodes_to_render = network_interface.collect_nodes(&self.node_graph_errors, breadcrumb_network_path);
 					self.frontend_nodes = nodes_to_render.keys().copied().collect();
-					let previewed_node = network_interface
-						.upstream_output_connector(&InputConnector::Export(0), breadcrumb_network_path)
-						.and_then(|output_connector| output_connector.node_id())
-						.filter(|output_node| network_interface.root_node(breadcrumb_network_path).is_some_and(|root_node| root_node.node_id != node_id));
+					let previewed_node = network_interface.previewed_node(breadcrumb_network_path);
 
 					responses.add(FrontendMessage::UpdateNodeGraphNodes {
 						nodes_to_render,
@@ -2490,95 +2487,6 @@ impl NodeGraphMessageHandler {
 		added_wires
 	}
 
-	fn collect_nodes(&self, network_interface: &mut NodeNetworkInterface, breadcrumb_network_path: &[NodeId]) -> HashMap<NodeId, FrontendNodeOrLayer> {
-		let Some(network) = network_interface.nested_network(breadcrumb_network_path) else {
-			log::error!("Could not get nested network when collecting nodes");
-			return HashMap::new();
-		};
-		let selected_nodes = network_interface.selected_nodes_in_nested_network(breadcrumb_network_path).unwrap_or_default();
-		let mut nodes = HashMap::new();
-		for (node_id, visible) in network.nodes.iter().map(|(node_id, node)| (*node_id, node.visible)).collect::<Vec<_>>() {
-			let node_id_path = [breadcrumb_network_path, &[node_id]].concat();
-
-			let errors = self
-				.node_graph_errors
-				.iter()
-				.find(|error| error.node_path == node_id_path)
-				.map(|error| format!("{:?}", error.error.clone()))
-				.or_else(|| {
-					if self.node_graph_errors.iter().any(|error| error.node_path.starts_with(&node_id_path)) {
-						Some("Node graph type error within this node".to_string())
-					} else {
-						None
-					}
-				});
-
-			let metadata = FrontendNodeMetadata {
-				can_be_layer: network_interface.is_eligible_to_be_layer(&node_id, breadcrumb_network_path),
-				display_name: network_interface.display_name(&node_id, breadcrumb_network_path),
-				selected: selected_nodes.0.contains(&node_id),
-				reference: network_interface.reference(&node_id, breadcrumb_network_path).cloned().unwrap_or_default(),
-				visible,
-				errors,
-			};
-
-			let frontend_node_or_layer = match network_interface.is_layer(&node_id, network_path) {
-				true => {
-					let Some(position) = network_interface.position(&node_id, breadcrumb_network_path) else {
-						log::error!("Could not get position for node: {node_id}");
-						continue;
-					};
-
-					let position = FrontendXY { x: position.x, y: position.y };
-
-					let inputs = (0..network_interface.number_of_inputs(&node_id, breadcrumb_network_path))
-						.map(|input_index| network_interface.frontend_input_from_connector(&InputConnector::node(node_id, input_index), breadcrumb_network_path))
-						.collect();
-
-					let outputs = (0..network_interface.number_of_outputs(&node_id, breadcrumb_network_path))
-						.map(|output_index| network_interface.frontend_output_from_connector(&OutputConnector::node(node_id, output_index), breadcrumb_network_path))
-						.collect();
-
-					let node = Some(FrontendNode { position, inputs, outputs });
-
-					FrontendNodeOrLayer { metadata, node, layer: None }
-				}
-				false => {
-					let Some(position) = network_interface.position(&node_id, breadcrumb_network_path) else {
-						log::error!("Could not get position for node: {node_id}");
-						continue;
-					};
-					let position = FrontendXY { x: position.x, y: position.y };
-
-					let Some(bottom_input) = network_interface.frontend_input_from_connector(&InputConnector::node(node_id, 0), breadcrumb_network_path) else {
-						log::error!("Layer must have a visible primary input");
-						continue;
-					};
-					let side_input = network_interface.frontend_input_from_connector(&InputConnector::node(node_id, 1), breadcrumb_network_path);
-					let Some(output) = network_interface.frontend_output_from_connector(&OutputConnector::node(node_id, 0), breadcrumb_network_path) else {
-						log::error!("Layer must have a visible primary output");
-						continue;
-					};
-
-					let layer = Some(FrontendLayer {
-						bottom_input,
-						side_input,
-						output,
-						position,
-						locked: network_interface.is_locked(&node_id, breadcrumb_network_path),
-						chain_width: network_interface.chain_width(&node_id, breadcrumb_network_path),
-						layer_has_left_border_gap: network_interface.layer_has_left_border_gap(&node_id, breadcrumb_network_path),
-						primary_input_connected_to_layer: network_interface.primary_output_connected_to_layer(&node_id, breadcrumb_network_path),
-						primary_output_connected_to_layer: network_interface.primary_input_connected_to_layer(&node_id, breadcrumb_network_path),
-					});
-					FrontendNodeOrLayer { metadata, node: None, layer }
-				}
-			};
-			nodes.insert(node_id, frontend_node_or_layer);
-		}
-		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/document/node_graph/utility_types.rs

@@ -125,7 +125,7 @@ pub struct FrontendLayer {
 	#[serde(rename = "chainWidth")]
 	pub chain_width: u32,
 	#[serde(rename = "layerHasLeftBorderGap")]
-	layer_has_left_border_gap: bool,
+	pub layer_has_left_border_gap: bool,
 	#[serde(rename = "primaryInputConnectedToLayer")]
 	pub primary_input_connected_to_layer: bool,
 	#[serde(rename = "primaryOutputConnectedToLayer")]