Node positions backend

Author: 0HyperCube

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

@@ -21,6 +21,10 @@ pub enum NodeGraphMessage {
 	DeleteNode {
 		node_id: NodeId,
 	},
+	MoveSelectedNodes {
+		displacement_x: i32,
+		displacement_y: i32,
+	},
 	OpenNodeGraph {
 		layer_path: Vec<graphene::LayerId>,
 	},

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

@@ -1,18 +1,27 @@
 use crate::messages::layout::utility_types::layout_widget::LayoutGroup;
 use crate::messages::prelude::*;
-use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeInput, NodeNetwork};
+use graph_craft::document::{DocumentNode, DocumentNodeImplementation, DocumentNodeMetadata, NodeInput, NodeNetwork};
 use graphene::document::Document;
 use graphene::layers::layer_info::LayerDataType;
 use graphene::layers::nodegraph_layer::NodeGraphFrameLayer;
 
 mod document_node_types;
 mod node_properties;
 
+#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize)]
+pub enum DataType {
+	Raster,
+}
+
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct FrontendNode {
 	pub id: graph_craft::document::NodeId,
 	#[serde(rename = "displayName")]
 	pub display_name: String,
+	#[serde(rename = "exposedInputs")]
+	pub exposed_inputs: Vec<DataType>,
+	pub outputs: Vec<DataType>,
+	pub position: (i32, i32),
 }
 
 // (link_start, link_end, link_end_input_index)
@@ -92,6 +101,9 @@ impl NodeGraphMessageHandler {
 			nodes.push(FrontendNode {
 				id: *id,
 				display_name: node.name.clone(),
+				exposed_inputs: node.inputs.iter().filter(|input| input.is_exposed()).map(|_| DataType::Raster).collect(),
+				outputs: vec![DataType::Raster],
+				position: node.metadata.position,
 			})
 		}
 		log::debug!("Nodes:\n{:#?}\n\nFrontend Nodes:\n{:#?}\n\nLinks:\n{:#?}", network.nodes, nodes, links);
@@ -159,6 +171,7 @@ impl MessageHandler<NodeGraphMessage, (&mut Document, &InputPreprocessorMessageH
 							// TODO: Allow inserting nodes that contain other nodes.
 							implementation: DocumentNodeImplementation::Unresolved(document_node_type.identifier.clone()),
 							inputs: (0..num_inputs).map(|_| NodeInput::Network).collect(),
+							metadata: DocumentNodeMetadata::default(),
 						},
 					)]
 					.into_iter()
@@ -171,6 +184,10 @@ impl MessageHandler<NodeGraphMessage, (&mut Document, &InputPreprocessorMessageH
 						inputs: document_node_type.default_inputs.to_vec(),
 						// TODO: Allow inserting nodes that contain other nodes.
 						implementation: DocumentNodeImplementation::Network(inner_network),
+						metadata: graph_craft::document::DocumentNodeMetadata {
+							// TODO: Better position default
+							position: (node_id as i32 * 7 - 41, node_id as i32 * 2 - 10),
+						},
 					},
 				);
 				Self::send_graph(network, responses);
@@ -181,6 +198,19 @@ impl MessageHandler<NodeGraphMessage, (&mut Document, &InputPreprocessorMessageH
 					Self::send_graph(network, responses);
 				}
 			}
+			NodeGraphMessage::MoveSelectedNodes { displacement_x, displacement_y } => {
+				let Some(network) = self.get_active_network_mut(document) else{
+					warn!("No network");
+					return;
+				};
+
+				for node_id in &self.selected_nodes {
+					if let Some(node) = network.nodes.get_mut(node_id) {
+						node.metadata.position.0 += displacement_x;
+						node.metadata.position.1 += displacement_y;
+					}
+				}
+			}
 			NodeGraphMessage::OpenNodeGraph { layer_path } => {
 				if let Some(_old_layer_path) = self.layer_path.replace(layer_path) {
 					// TODO: Necessary cleanup of old node graph

frontend/src/components/panels/NodeGraph.vue

@@ -35,8 +35,8 @@
 					class="node"
 					:class="{ selected: selected.includes(node.id) }"
 					:style="{
-						'--offset-left': 8 + Number(node.id < 9n ? node.id : node.id - 7n) * 7,
-						'--offset-top': 4 + Number(node.id < 9n ? node.id : node.id - 7n) * 2,
+						'--offset-left': node.position?.x || 0,
+						'--offset-top': node.position?.y || 0,
 						'--data-color': 'var(--color-data-raster)',
 						'--data-color-dim': 'var(--color-data-raster-dim)',
 					}"

frontend/src/wasm-communication/messages.ts

@@ -12,6 +12,11 @@ export class JsMessage {
 	static readonly jsMessageMarker = true;
 }
 
+const TupleToVec2 = Transform(({ value }: { value: [number, number] | undefined }) => (value === undefined ? undefined : { x: value[0], y: value[1] }));
+const BigIntTupleToVec2 = Transform(({ value }: { value: [bigint, bigint] | undefined }) => (value === undefined ? undefined : { x: Number(value[0]), y: Number(value[1]) }));
+
+export type XY = { x: number; y: number };
+
 // ============================================================================
 // Add additional classes below to replicate Rust's `FrontendMessage`s and data structures.
 //
@@ -64,10 +69,19 @@ export class FrontendDocumentDetails extends DocumentDetails {
 	readonly id!: bigint;
 }
 
+export type DataType = "Raster" | "Color" | "Image" | "F32";
+
 export class FrontendNode {
 	readonly id!: bigint;
 
 	readonly displayName!: string;
+
+	readonly exposedInputs!: DataType[];
+
+	readonly outputs!: DataType[];
+
+	@TupleToVec2
+	readonly position!: XY | undefined;
 }
 
 export class FrontendNodeLink {
@@ -403,11 +417,6 @@ export class UpdateDocumentArtboards extends JsMessage {
 	readonly svg!: string;
 }
 
-const TupleToVec2 = Transform(({ value }: { value: [number, number] | undefined }) => (value === undefined ? undefined : { x: value[0], y: value[1] }));
-const BigIntTupleToVec2 = Transform(({ value }: { value: [bigint, bigint] | undefined }) => (value === undefined ? undefined : { x: Number(value[0]), y: Number(value[1]) }));
-
-export type XY = { x: number; y: number };
-
 export class UpdateDocumentScrollbars extends JsMessage {
 	@TupleToVec2
 	readonly position!: XY;

frontend/wasm/src/editor_api.rs

@@ -575,6 +575,13 @@ impl JsEditorHandle {
 		self.dispatch(message);
 	}
 
+	/// Notifies the backend that the selected nodes have been moved
+	#[wasm_bindgen(js_name = moveSelectedNodes)]
+	pub fn move_selected_nodes(&self, displacement_x: i32, displacement_y: i32) {
+		let message = NodeGraphMessage::MoveSelectedNodes { displacement_x, displacement_y };
+		self.dispatch(message);
+	}
+
 	/// Pastes an image
 	#[wasm_bindgen(js_name = pasteImage)]
 	pub fn paste_image(&self, mime: String, image_data: Vec<u8>, mouse_x: Option<f64>, mouse_y: Option<f64>) {

graphene/src/layers/nodegraph_layer.rs

@@ -131,6 +131,7 @@ impl Default for NodeGraphFrameLayer {
 						"graphene_std::raster::BrightenImageNode",
 						&[graph_craft::proto::Type::Concrete(std::borrow::Cow::Borrowed("&TypeErasedNode"))],
 					)),
+					metadata: DocumentNodeMetadata::default(),
 				},
 			)]
 			.into_iter()
@@ -149,6 +150,7 @@ impl Default for NodeGraphFrameLayer {
 						"graphene_std::raster::HueShiftImage",
 						&[graph_craft::proto::Type::Concrete(std::borrow::Cow::Borrowed("&TypeErasedNode"))],
 					)),
+					metadata: DocumentNodeMetadata::default(),
 				},
 			)]
 			.into_iter()
@@ -167,6 +169,7 @@ impl Default for NodeGraphFrameLayer {
 							name: "Input".into(),
 							inputs: vec![NodeInput::Network],
 							implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::ops::IdNode", &[Type::Generic])),
+							metadata: DocumentNodeMetadata { position: (8, 4) },
 						},
 					),
 					(
@@ -181,6 +184,7 @@ impl Default for NodeGraphFrameLayer {
 								},
 							],
 							implementation: DocumentNodeImplementation::Network(hue_shift_network),
+							metadata: DocumentNodeMetadata { position: (8 + 7, 4 + 2) },
 						},
 					),
 					(
@@ -195,6 +199,7 @@ impl Default for NodeGraphFrameLayer {
 								},
 							],
 							implementation: DocumentNodeImplementation::Network(brighten_network),
+							metadata: DocumentNodeMetadata { position: (8 + 7 * 2, 4 + 2 * 2) },
 						},
 					),
 					(
@@ -203,6 +208,7 @@ impl Default for NodeGraphFrameLayer {
 							name: "Output".into(),
 							inputs: vec![NodeInput::Node(2)],
 							implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::ops::IdNode", &[Type::Generic])),
+							metadata: DocumentNodeMetadata { position: (8 + 7 * 3, 4) },
 						},
 					),
 				]

node-graph/graph-craft/src/document.rs

@@ -28,12 +28,19 @@ fn merge_ids(a: u64, b: u64) -> u64 {
 	hasher.finish()
 }
 
+#[derive(Clone, Debug, PartialEq, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub struct DocumentNodeMetadata {
+	pub position: (i32, i32),
+}
+
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct DocumentNode {
 	pub name: String,
 	pub inputs: Vec<NodeInput>,
 	pub implementation: DocumentNodeImplementation,
+	pub metadata: DocumentNodeMetadata,
 }
 
 impl DocumentNode {
@@ -183,6 +190,7 @@ impl NodeNetwork {
 								name: name.clone(),
 								inputs: vec![NodeInput::Value { tagged_value, exposed }],
 								implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::value::ValueNode", &[Type::Generic])),
+								metadata: DocumentNodeMetadata::default(),
 							};
 							assert!(!self.nodes.contains_key(&new_id));
 							self.nodes.insert(new_id, value_node);
@@ -245,6 +253,7 @@ mod test {
 						name: "Cons".into(),
 						inputs: vec![NodeInput::Network, NodeInput::Network],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::structural::ConsNode", &[Type::Generic, Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 				(
@@ -253,6 +262,7 @@ mod test {
 						name: "Add".into(),
 						inputs: vec![NodeInput::Node(0)],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::ops::AddNode", &[Type::Generic, Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 			]
@@ -275,6 +285,7 @@ mod test {
 						name: "Cons".into(),
 						inputs: vec![NodeInput::Network, NodeInput::Network],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::structural::ConsNode", &[Type::Generic, Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 				(
@@ -283,6 +294,7 @@ mod test {
 						name: "Add".into(),
 						inputs: vec![NodeInput::Node(1)],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::ops::AddNode", &[Type::Generic, Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 			]
@@ -309,6 +321,7 @@ mod test {
 						},
 					],
 					implementation: DocumentNodeImplementation::Network(add_network()),
+					metadata: DocumentNodeMetadata::default(),
 				},
 			)]
 			.into_iter()
@@ -328,6 +341,7 @@ mod test {
 			name: "Cons".into(),
 			inputs: vec![NodeInput::Network, NodeInput::Node(0)],
 			implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::structural::ConsNode", &[Type::Generic, Type::Generic])),
+			metadata: DocumentNodeMetadata::default(),
 		};
 
 		let proto_node = document_node.resolve_proto_node();
@@ -393,6 +407,7 @@ mod test {
 						name: "Inc".into(),
 						inputs: vec![NodeInput::Node(11)],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::ops::IdNode", &[Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 				(
@@ -401,6 +416,7 @@ mod test {
 						name: "Cons".into(),
 						inputs: vec![NodeInput::Network, NodeInput::Node(14)],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::structural::ConsNode", &[Type::Generic, Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 				(
@@ -412,6 +428,7 @@ mod test {
 							exposed: false,
 						}],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::value::ValueNode", &[Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 				(
@@ -420,6 +437,7 @@ mod test {
 						name: "Add".into(),
 						inputs: vec![NodeInput::Node(10)],
 						implementation: DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::ops::AddNode", &[Type::Generic, Type::Generic])),
+						metadata: DocumentNodeMetadata::default(),
 					},
 				),
 			]