Node network subgraph editing (#1750)

* Breadcrumb visualization, nested network consistency, create definitions for Merge internal nodes

* Add index to network inputs, remove imports usage from flatten network

* Replace NodeOutput with NodeInput::Node

* Fully remove imports field, remove unnecessary identity nodes, move Output node to encapsulating network

* Replace previous_outputs with root_node, fix adding artboard/layer to empty network

* Import/Export UI nodes

* Display input/output types dynamically from compiled network

* Add LayerNodeIdentifer::ROOT_PARENT

* Prevent .to_node() on ROOT_PARENT

* Separate NodeGraphMessage and GraphOperationMessage

* General bug fixes with nested networks

* Change layer color, various bug fixes and improvements

* Fix disconnect and set node input for proto nodes and UI export node

* Dashed line to export for previewed node

* Fix deleting proto nodes and nodes that feed into export

* Allow modifications to nodes outside of nested network

* Get network from Node Id parameter

* Change root_node to previous_root_node

* Get TaggedValue from proto node implementation type when disconnecting

* Improve preview functionality and state

* Artboard position and delete children fix

* Name inputs/outputs based on DocumentNodeDefinition or type, fix new artboard/layer insertion

* replace "Link" with "Wire", adjust previewing

* Various bug fixes and improvements

* Modify Sample and Poisson-Disk points, fix incorrect input index and deleting currently viewed node

* Open demo artwork

* Fix opening already upgraded documents and refactor FrontendGraphDataType usages

* Fix deleting within network and other bugs

* Get default node input from compiled network when copying, fix previews, tests, demo artwork

* Code cleanup

* Hide EditorApi and add a comment describing unresolved Import node input types

* Code review

* Replace placeholder ROOT_PARENT NodeId with std::u64::MAX

* Breadcrumb padding

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>

Author: adamgerhant

Cargo.lock

@@ -88,11 +88,8 @@ mod test {
 			block_on(crate::node_graph_executor::run_node_graph());
 			let mut res = VecDeque::new();
 			editor.poll_node_graph_evaluation(&mut res);
-			//println!("node_graph_poll: {res:#?}");
 
-			//println!("in: {message:#?}");
 			let res = editor.handle_message(message);
-			//println!("out: {res:#?}");
 			responses.push(res);
 		}
 		let responses = responses.pop().unwrap();

demo-artwork/isometric-fountain.graphite

@@ -71,10 +71,6 @@ pub const COLOR_OVERLAY_YELLOW: &str = "#ffc848";
 pub const COLOR_OVERLAY_WHITE: &str = "#ffffff";
 pub const COLOR_OVERLAY_GRAY: &str = "#cccccc";
 
-// Fonts
-pub const DEFAULT_FONT_FAMILY: &str = "Cabin";
-pub const DEFAULT_FONT_STYLE: &str = "Normal (400)";
-
 // Document
 pub const DEFAULT_DOCUMENT_NAME: &str = "Untitled Document";
 pub const FILE_SAVE_SUFFIX: &str = ".graphite";

demo-artwork/just-a-potted-cactus.graphite

@@ -1,4 +1,3 @@
-use crate::consts::{DEFAULT_FONT_FAMILY, DEFAULT_FONT_STYLE};
 use crate::messages::debug::utility_types::MessageLoggingVerbosity;
 use crate::messages::dialog::DialogMessageData;
 use crate::messages::prelude::*;
@@ -99,7 +98,7 @@ impl Dispatcher {
 					queue.add(MenuBarMessage::SendLayout);
 
 					// Load the default font
-					let font = Font::new(DEFAULT_FONT_FAMILY.into(), DEFAULT_FONT_STYLE.into());
+					let font = Font::new(graphene_core::consts::DEFAULT_FONT_FAMILY.into(), graphene_core::consts::DEFAULT_FONT_STYLE.into());
 					queue.add(FrontendMessage::TriggerFontLoad { font, is_default: true });
 				}
 				Message::Batched(messages) => {
@@ -307,7 +306,7 @@ mod test {
 		editor.handle_message(PortfolioMessage::Copy { clipboard: Clipboard::Internal });
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::Internal,
-			parent: LayerNodeIdentifier::ROOT,
+			parent: LayerNodeIdentifier::ROOT_PARENT,
 			insert_index: -1,
 		});
 		let document_after_copy = editor.dispatcher.message_handlers.portfolio_message_handler.active_document().unwrap().clone();
@@ -341,7 +340,7 @@ mod test {
 		editor.handle_message(PortfolioMessage::Copy { clipboard: Clipboard::Internal });
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::Internal,
-			parent: LayerNodeIdentifier::ROOT,
+			parent: LayerNodeIdentifier::ROOT_PARENT,
 			insert_index: -1,
 		});
 
@@ -385,12 +384,12 @@ mod test {
 		editor.draw_rect(0., 800., 12., 200.);
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::Internal,
-			parent: LayerNodeIdentifier::ROOT,
+			parent: LayerNodeIdentifier::ROOT_PARENT,
 			insert_index: -1,
 		});
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::Internal,
-			parent: LayerNodeIdentifier::ROOT,
+			parent: LayerNodeIdentifier::ROOT_PARENT,
 			insert_index: -1,
 		});
 

demo-artwork/procedural-string-lights.graphite

@@ -26,7 +26,7 @@ pub enum DialogMessage {
 		localized_commit_year: String,
 	},
 	RequestComingSoonDialog {
-		issue: Option<i32>,
+		issue: Option<u32>,
 	},
 	RequestDemoArtworkDialog,
 	RequestExportDialog,

demo-artwork/red-dress.graphite

@@ -3,7 +3,7 @@ use crate::messages::prelude::*;
 
 /// A dialog to notify users of an unfinished issue, optionally with an issue number.
 pub struct ComingSoonDialog {
-	pub issue: Option<i32>,
+	pub issue: Option<u32>,
 }
 
 impl DialogLayoutHolder for ComingSoonDialog {

demo-artwork/valley-of-spires.graphite

@@ -1,6 +1,6 @@
 use super::utility_types::{FrontendDocumentDetails, MouseCursorIcon};
 use crate::messages::layout::utility_types::widget_prelude::*;
-use crate::messages::portfolio::document::node_graph::utility_types::{FrontendNode, FrontendNodeLink, FrontendNodeType};
+use crate::messages::portfolio::document::node_graph::utility_types::{FrontendNode, FrontendNodeType, FrontendNodeWire};
 use crate::messages::portfolio::document::utility_types::nodes::{JsRawBuffer, LayerPanelEntry, RawBuffer};
 use crate::messages::prelude::*;
 use crate::messages::tool::utility_types::HintData;
@@ -188,7 +188,7 @@ pub enum FrontendMessage {
 	},
 	UpdateNodeGraph {
 		nodes: Vec<FrontendNode>,
-		links: Vec<FrontendNodeLink>,
+		wires: Vec<FrontendNodeWire>,
 	},
 	UpdateNodeGraphBarLayout {
 		#[serde(rename = "layoutTarget")]
@@ -220,6 +220,10 @@ pub enum FrontendMessage {
 		layout_target: LayoutTarget,
 		diff: Vec<WidgetDiff>,
 	},
+	UpdateSubgraphPath {
+		#[serde(rename = "subgraphPath")]
+		subgraph_path: Vec<String>,
+	},
 	UpdateToolOptionsLayout {
 		#[serde(rename = "layoutTarget")]
 		layout_target: LayoutTarget,

editor/src/application.rs

@@ -62,6 +62,7 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(KeyH); modifiers=[Accel], action_dispatch=NodeGraphMessage::ToggleSelectedVisibility),
 		entry!(KeyDown(KeyL); modifiers=[Accel], action_dispatch=NodeGraphMessage::ToggleSelectedLocked),
 		entry!(KeyDown(KeyL); modifiers=[Alt], action_dispatch=NodeGraphMessage::ToggleSelectedAsLayersOrNodes),
+		entry!(KeyDown(KeyC); modifiers=[Shift], action_dispatch=NodeGraphMessage::PrintSelectedNodeCoordinates),
 		//
 		// TransformLayerMessage
 		entry!(KeyDown(Enter); action_dispatch=TransformLayerMessage::ApplyTransformOperation),

editor/src/consts.rs

@@ -186,6 +186,7 @@ impl LayoutMessageHandler {
 						let callback_message = (number_input.on_update.callback)(number_input);
 						responses.add(callback_message);
 					}
+					// TODO: This crashes when the cursor is in a text box, such as in the Text node, and the transform node is clicked (https://github.com/GraphiteEditor/Graphite/issues/1761)
 					Value::String(str) => match str.as_str() {
 						"Increment" => responses.add((number_input.increment_callback_increase.callback)(number_input)),
 						"Decrement" => responses.add((number_input.increment_callback_decrease.callback)(number_input)),

editor/src/dispatcher.rs

@@ -45,7 +45,7 @@ pub enum DocumentMessage {
 	CreateEmptyFolder,
 	DebugPrintDocument,
 	DeleteLayer {
-		id: NodeId,
+		layer: LayerNodeIdentifier,
 	},
 	DeleteSelectedLayers,
 	DeselectAllLayers,