Simplify layer node further

Author: TrueDoctor

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

@@ -239,28 +239,21 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 			node_template: NodeTemplate {
 				document_node: DocumentNode {
 					implementation: DocumentNodeImplementation::Network(NodeNetwork {
-						exports: vec![NodeInput::node(NodeId(2), 0)],
+						exports: vec![NodeInput::node(NodeId(1), 0)],
 						nodes: [
-							// Primary (bottom) input type coercion
-							DocumentNode {
-								inputs: vec![NodeInput::network(generic!(T), 0)],
-								implementation: DocumentNodeImplementation::proto("graphene_core::graphic_element::ToGroupNode"),
-								manual_composition: Some(generic!(T)),
-								..Default::default()
-							},
 							// The monitor node is used to display a thumbnail in the UI
 							DocumentNode {
-								inputs: vec![NodeInput::network(generic!(T), 1)],
+								inputs: vec![NodeInput::network(concrete!(GraphicElement), 1)],
 								implementation: DocumentNodeImplementation::proto("graphene_core::memo::MonitorNode"),
-								manual_composition: Some(generic!(T)),
+								manual_composition: Some(concrete!(Context)),
 								skip_deduplication: true,
 								..Default::default()
 							},
 							DocumentNode {
 								manual_composition: Some(generic!(T)),
 								inputs: vec![
+									NodeInput::network(concrete!(GraphicGroupTable), 0),
 									NodeInput::node(NodeId(0), 0),
-									NodeInput::node(NodeId(1), 0),
 									NodeInput::Reflection(graph_craft::document::DocumentNodeMetadata::DocumentNodePath),
 								],
 								implementation: DocumentNodeImplementation::proto("graphene_core::graphic_element::LayerNode"),
@@ -286,22 +279,6 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 					network_metadata: Some(NodeNetworkMetadata {
 						persistent_metadata: NodeNetworkPersistentMetadata {
 							node_metadata: [
-								DocumentNodeMetadata {
-									persistent_metadata: DocumentNodePersistentMetadata {
-										display_name: "To Element".to_string(),
-										node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(-14, -1)),
-										..Default::default()
-									},
-									..Default::default()
-								},
-								DocumentNodeMetadata {
-									persistent_metadata: DocumentNodePersistentMetadata {
-										display_name: "To Group".to_string(),
-										node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(-14, -3)),
-										..Default::default()
-									},
-									..Default::default()
-								},
 								DocumentNodeMetadata {
 									persistent_metadata: DocumentNodePersistentMetadata {
 										display_name: "Monitor".to_string(),

node-graph/preprocessor/src/lib.rs

@@ -50,6 +50,7 @@ pub fn generate_node_substitutions() -> HashMap<String, DocumentNode> {
 
 		let into_node_registry = &interpreted_executor::node_registry::NODE_REGISTRY;
 
+		let mut generated_nodes = 0;
 		let mut nodes: HashMap<_, _, _> = node_io_types
 			.iter()
 			.enumerate()
@@ -70,11 +71,13 @@ pub fn generate_node_substitutions() -> HashMap<String, DocumentNode> {
 								let ident = ident.name.as_ref();
 								ident == into_node_identifier.name.as_ref()
 							}) {
+								generated_nodes += 1;
 								into_node_identifier
 							} else if into_node_registry.iter().any(|(ident, _)| {
 								let ident = ident.name.as_ref();
 								ident == convert_node_identifier.name.as_ref()
 							}) {
+								generated_nodes += 1;
 								convert_node_identifier
 							} else {
 								identity_node.clone()
@@ -98,6 +101,11 @@ pub fn generate_node_substitutions() -> HashMap<String, DocumentNode> {
 			})
 			.collect();
 
+		if generated_nodes == 0 {
+			log::debug!("skipping {}", id);
+			continue;
+		}
+
 		let document_node = DocumentNode {
 			inputs: network_inputs,
 			manual_composition: Some(input_type.clone()),
@@ -127,6 +135,7 @@ pub fn generate_node_substitutions() -> HashMap<String, DocumentNode> {
 
 		custom.insert(id.clone(), node);
 	}
+
 	custom
 }