Native background render node

editor/src/application.rs

@@ -1,5 +1,8 @@
 use crate::dispatcher::Dispatcher;
+use crate::messages::portfolio::document::node_graph::generate_node_graph_overlay::generate_node_graph_overlay;
 use crate::messages::prelude::*;
+use graph_craft::document::{NodeInput, NodeNetwork};
+use graphene_std::node_graph_overlay::types::NodeGraphOverlayData;
 pub use graphene_std::uuid::*;
 
 // TODO: serialize with serde to save the current editor state
@@ -30,6 +33,32 @@ impl Editor {
 	pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) -> Result<(), String> {
 		self.dispatcher.poll_node_graph_evaluation(responses)
 	}
+
+	pub fn generate_node_graph_overlay_network(&mut self) -> Option<NodeNetwork> {
+		let Some(active_document) = self.dispatcher.message_handlers.portfolio_message_handler.active_document_mut() else {
+			return None;
+		};
+		let breadcrumb_network_path = &active_document.breadcrumb_network_path;
+		let nodes_to_render = active_document.network_interface.collect_nodes(
+			&active_document.node_graph_handler.node_graph_errors,
+			self.dispatcher.message_handlers.preferences_message_handler.graph_wire_style,
+			breadcrumb_network_path,
+		);
+		let previewed_node = active_document.network_interface.previewed_node(breadcrumb_network_path);
+		let node_graph_render_data = NodeGraphOverlayData {
+			nodes_to_render,
+			open: active_document.graph_view_overlay_open,
+			in_selected_network: &active_document.selection_network_path == breadcrumb_network_path,
+			previewed_node,
+		};
+		let opacity = active_document.graph_fade_artwork_percentage;
+		let node_graph_overlay_node = generate_node_graph_overlay(node_graph_render_data, opacity);
+		Some(NodeNetwork {
+			exports: vec![NodeInput::node(NodeId(0), 0)],
+			nodes: vec![(NodeId(0), node_graph_overlay_node)].into_iter().collect(),
+			..Default::default()
+		})
+	}
 }
 
 impl Default for Editor {

editor/src/dispatcher.rs

@@ -20,11 +20,11 @@ pub struct DispatcherMessageHandlers {
 	defer_message_handler: DeferMessageHandler,
 	dialog_message_handler: DialogMessageHandler,
 	globals_message_handler: GlobalsMessageHandler,
-	input_preprocessor_message_handler: InputPreprocessorMessageHandler,
+	pub input_preprocessor_message_handler: InputPreprocessorMessageHandler,
 	key_mapping_message_handler: KeyMappingMessageHandler,
 	layout_message_handler: LayoutMessageHandler,
 	pub portfolio_message_handler: PortfolioMessageHandler,
-	preferences_message_handler: PreferencesMessageHandler,
+	pub preferences_message_handler: PreferencesMessageHandler,
 	tool_message_handler: ToolMessageHandler,
 }
 
@@ -41,6 +41,7 @@ impl DispatcherMessageHandlers {
 /// The last occurrence of the message in the message queue is sufficient to ensure correct behavior.
 /// In addition, these messages do not change any state in the backend (aside from caches).
 const SIDE_EFFECT_FREE_MESSAGES: &[MessageDiscriminant] = &[
+	MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::NodeGraph(NodeGraphMessageDiscriminant::SendGraph))),
 	MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::PropertiesPanel(
 		PropertiesPanelMessageDiscriminant::Refresh,
 	))),

editor/src/messages/frontend/frontend_message.rs

@@ -1,15 +1,13 @@
 use super::utility_types::{DocumentDetails, MouseCursorIcon, OpenDocument};
 use crate::messages::app_window::app_window_message_handler::AppWindowPlatform;
 use crate::messages::layout::utility_types::widget_prelude::*;
-use crate::messages::portfolio::document::node_graph::utility_types::{
-	BoxSelection, ContextMenuInformation, FrontendClickTargets, FrontendGraphInput, FrontendGraphOutput, FrontendNode, FrontendNodeType, Transform,
-};
+use crate::messages::portfolio::document::node_graph::utility_types::{BoxSelection, ContextMenuInformation, FrontendClickTargets, FrontendNodeType};
 use crate::messages::portfolio::document::utility_types::nodes::{JsRawBuffer, LayerPanelEntry, RawBuffer};
-use crate::messages::portfolio::document::utility_types::wires::{WirePath, WirePathUpdate};
+use crate::messages::portfolio::document::utility_types::wires::WirePathInProgress;
 use crate::messages::prelude::*;
 use crate::messages::tool::utility_types::HintData;
-use glam::IVec2;
 use graph_craft::document::NodeId;
+use graphene_std::node_graph_overlay::types::{FrontendExports, FrontendImport, FrontendXY, NodeGraphTransform};
 use graphene_std::raster::Image;
 use graphene_std::raster::color::Color;
 use graphene_std::text::{Font, TextAlign};
@@ -128,24 +126,19 @@ pub enum FrontendMessage {
 	},
 	UpdateImportsExports {
 		/// If the primary import is not visible, then it is None.
-		imports: Vec<Option<FrontendGraphOutput>>,
-		/// If the primary export is not visible, then it is None.
-		exports: Vec<Option<FrontendGraphInput>>,
+		imports: Vec<Option<FrontendImport>>,
+		exports: FrontendExports,
 		/// The primary import location.
 		#[serde(rename = "importPosition")]
-		import_position: IVec2,
+		import_position: FrontendXY,
 		/// The primary export location.
 		#[serde(rename = "exportPosition")]
-		export_position: IVec2,
+		export_position: FrontendXY,
 		/// The document network does not have an add import or export button.
 		#[serde(rename = "addImportExport")]
 		add_import_export: bool,
 	},
-	UpdateInSelectedNetwork {
-		#[serde(rename = "inSelectedNetwork")]
-		in_selected_network: bool,
-	},
-	UpdateBox {
+	UpdateNodeGraphSelectionBox {
 		#[serde(rename = "box")]
 		box_selection: Option<BoxSelection>,
 	},
@@ -185,10 +178,6 @@ pub enum FrontendMessage {
 	UpdateLayerWidths {
 		#[serde(rename = "layerWidths")]
 		layer_widths: HashMap<NodeId, u32>,
-		#[serde(rename = "chainWidths")]
-		chain_widths: HashMap<NodeId, u32>,
-		#[serde(rename = "hasLeftInputWire")]
-		has_left_input_wire: HashMap<NodeId, bool>,
 	},
 	UpdateDialogButtons {
 		#[serde(rename = "layoutTarget")]
@@ -253,9 +242,6 @@ pub enum FrontendMessage {
 		#[serde(rename = "setColorChoice")]
 		set_color_choice: Option<String>,
 	},
-	UpdateGraphFadeArtwork {
-		percentage: f64,
-	},
 	UpdateInputHints {
 		#[serde(rename = "hintData")]
 		hint_data: HintData,
@@ -283,26 +269,18 @@ pub enum FrontendMessage {
 	UpdateMouseCursor {
 		cursor: MouseCursorIcon,
 	},
-	UpdateNodeGraphNodes {
-		nodes: Vec<FrontendNode>,
-	},
-	UpdateVisibleNodes {
-		nodes: Vec<NodeId>,
+	RequestNativeNodeGraphRender,
+	UpdateNativeNodeGraphSVG {
+		#[serde(rename = "svgString")]
+		svg_string: String,
 	},
-	UpdateNodeGraphWires {
-		wires: Vec<WirePathUpdate>,
-	},
-	ClearAllNodeGraphWires,
 	UpdateNodeGraphControlBarLayout {
 		#[serde(rename = "layoutTarget")]
 		layout_target: LayoutTarget,
 		diff: Vec<WidgetDiff>,
 	},
-	UpdateNodeGraphSelection {
-		selected: Vec<NodeId>,
-	},
 	UpdateNodeGraphTransform {
-		transform: Transform,
+		transform: NodeGraphTransform,
 	},
 	UpdateNodeThumbnail {
 		id: NodeId,
@@ -328,8 +306,8 @@ pub enum FrontendMessage {
 		diff: Vec<WidgetDiff>,
 	},
 	UpdateWirePathInProgress {
-		#[serde(rename = "wirePath")]
-		wire_path: Option<WirePath>,
+		#[serde(rename = "wirePathInProgress")]
+		wire_path_in_progress: Option<WirePathInProgress>,
 	},
 	UpdateWorkingColorsLayout {
 		#[serde(rename = "layoutTarget")]

editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

@@ -34,7 +34,6 @@ impl MessageHandler<InputPreprocessorMessage, InputPreprocessorMessageContext> f
 					self.viewport_bounds = bounds;
 
 					responses.add(NavigationMessage::CanvasPan { delta: DVec2::ZERO });
-					responses.add(NodeGraphMessage::SetGridAlignedEdges);
 				}
 				responses.add(DeferMessage::AfterGraphRun {
 					messages: vec![

editor/src/messages/layout/utility_types/widgets/button_widgets.rs

@@ -1,8 +1,8 @@
 use crate::messages::input_mapper::utility_types::misc::ActionKeys;
 use crate::messages::layout::utility_types::widget_prelude::*;
-use crate::messages::portfolio::document::node_graph::utility_types::FrontendGraphDataType;
 use crate::messages::tool::tool_messages::tool_prelude::WidgetCallback;
 use derivative::*;
+use graphene_std::node_graph_overlay::types::FrontendGraphDataType;
 use graphene_std::vector::style::FillChoice;
 use graphite_proc_macros::WidgetBuilder;
 

editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs

@@ -12,6 +12,7 @@ use graphene_std::gradient::GradientStops;
 use graphene_std::memo::IORecord;
 use graphene_std::raster_types::{CPU, GPU, Raster};
 use graphene_std::table::Table;
+use graphene_std::text::Typography;
 use graphene_std::vector::Vector;
 use graphene_std::vector::style::{Fill, FillChoice};
 use graphene_std::{Artboard, Graphic};
@@ -266,6 +267,7 @@ impl TableRowLayout for Graphic {
 			Self::RasterGPU(table) => table.identifier(),
 			Self::Color(table) => table.identifier(),
 			Self::Gradient(table) => table.identifier(),
+			Self::Typography(table) => table.identifier(),
 		}
 	}
 	// Don't put a breadcrumb for Graphic
@@ -280,6 +282,7 @@ impl TableRowLayout for Graphic {
 			Self::RasterGPU(table) => table.layout_with_breadcrumb(data),
 			Self::Color(table) => table.layout_with_breadcrumb(data),
 			Self::Gradient(table) => table.layout_with_breadcrumb(data),
+			Self::Typography(table) => table.layout_with_breadcrumb(data),
 		}
 	}
 }
@@ -504,6 +507,21 @@ impl TableRowLayout for GradientStops {
 	}
 }
 
+impl TableRowLayout for Typography {
+	fn type_name() -> &'static str {
+		"Typography"
+	}
+	fn identifier(&self) -> String {
+		"Typography".to_string()
+	}
+	fn element_widget(&self, _index: usize) -> WidgetHolder {
+		TextLabel::new("Not supported").widget_holder()
+	}
+	fn element_page(&self, _data: &mut LayoutData) -> Vec<LayoutGroup> {
+		vec![LayoutGroup::Row { widgets: Vec::new() }]
+	}
+}
+
 impl TableRowLayout for f64 {
 	fn type_name() -> &'static str {
 		"Number (f64)"