From 100df9a81d0205e5496750c50525a3c6907be1d1 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Sat, 12 Apr 2025 05:15:05 -0700 Subject: [PATCH] Remove 'Memoize Impure' from document node definitions --- .../node_graph/document_node_definitions.rs | 69 ++++++++++++++++--- 1 file changed, 58 insertions(+), 11 deletions(-) diff --git a/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs b/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs index caa217c0..58ad50c6 100644 --- a/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs +++ b/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs @@ -2270,7 +2270,7 @@ fn static_nodes() -> Vec { node_template: NodeTemplate { document_node: DocumentNode { implementation: DocumentNodeImplementation::Network(NodeNetwork { - exports: vec![NodeInput::node(NodeId(1), 0)], + exports: vec![NodeInput::node(NodeId(2), 0)], nodes: vec![ DocumentNode { inputs: vec![NodeInput::network(concrete!(VectorDataTable), 0), NodeInput::network(concrete!(vector::style::Fill), 1)], @@ -2280,7 +2280,13 @@ fn static_nodes() -> Vec { }, DocumentNode { inputs: vec![NodeInput::node(NodeId(0), 0)], - implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::memo::ImpureMemoNode")), + implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::FreezeRealTimeNode")), + manual_composition: Some(generic!(T)), + ..Default::default() + }, + DocumentNode { + inputs: vec![NodeInput::node(NodeId(1), 0)], + implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::BoundlessFootprintNode")), manual_composition: Some(generic!(T)), ..Default::default() }, @@ -2304,15 +2310,23 @@ fn static_nodes() -> Vec { DocumentNodeMetadata { persistent_metadata: DocumentNodePersistentMetadata { display_name: "Boolean Operation".to_string(), - node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(-7, 0)), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(0, 0)), ..Default::default() }, ..Default::default() }, DocumentNodeMetadata { persistent_metadata: DocumentNodePersistentMetadata { - display_name: "Cache".to_string(), - node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(0, 0)), + display_name: "Freeze Real Time".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(7, 0)), + ..Default::default() + }, + ..Default::default() + }, + DocumentNodeMetadata { + persistent_metadata: DocumentNodePersistentMetadata { + display_name: "Boundless Footprint".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(14, 0)), ..Default::default() }, ..Default::default() @@ -2437,7 +2451,7 @@ fn static_nodes() -> Vec { node_template: NodeTemplate { document_node: DocumentNode { implementation: DocumentNodeImplementation::Network(NodeNetwork { - exports: vec![NodeInput::node(NodeId(2), 0)], // Taken from output 0 of Sample Points + exports: vec![NodeInput::node(NodeId(3), 0)], // Taken from output 0 of Sample Points nodes: [ DocumentNode { inputs: vec![NodeInput::network(concrete!(graphene_core::vector::VectorDataTable), 0)], @@ -2460,7 +2474,13 @@ fn static_nodes() -> Vec { }, DocumentNode { inputs: vec![NodeInput::node(NodeId(1), 0)], - implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::memo::ImpureMemoNode")), + implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::FreezeRealTimeNode")), + manual_composition: Some(generic!(T)), + ..Default::default() + }, + DocumentNode { + inputs: vec![NodeInput::node(NodeId(2), 0)], + implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::BoundlessFootprintNode")), manual_composition: Some(generic!(T)), ..Default::default() }, @@ -2487,6 +2507,7 @@ fn static_nodes() -> Vec { DocumentNodeMetadata { persistent_metadata: DocumentNodePersistentMetadata { display_name: "Subpath Segment Lengths".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(0, 5)), ..Default::default() }, ..Default::default() @@ -2494,13 +2515,23 @@ fn static_nodes() -> Vec { DocumentNodeMetadata { persistent_metadata: DocumentNodePersistentMetadata { display_name: "Sample Points".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(7, 0)), ..Default::default() }, ..Default::default() }, DocumentNodeMetadata { persistent_metadata: DocumentNodePersistentMetadata { - display_name: "Memoize Impure".to_string(), + display_name: "Freeze Real Time".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(14, 0)), + ..Default::default() + }, + ..Default::default() + }, + DocumentNodeMetadata { + persistent_metadata: DocumentNodePersistentMetadata { + display_name: "Boundless Footprint".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(21, 0)), ..Default::default() }, ..Default::default() @@ -2559,7 +2590,7 @@ fn static_nodes() -> Vec { node_template: NodeTemplate { document_node: DocumentNode { implementation: DocumentNodeImplementation::Network(NodeNetwork { - exports: vec![NodeInput::node(NodeId(1), 0)], + exports: vec![NodeInput::node(NodeId(2), 0)], nodes: [ DocumentNode { inputs: vec![ @@ -2573,7 +2604,13 @@ fn static_nodes() -> Vec { }, DocumentNode { inputs: vec![NodeInput::node(NodeId(0), 0)], - implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::memo::ImpureMemoNode")), + implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::FreezeRealTimeNode")), + manual_composition: Some(generic!(T)), + ..Default::default() + }, + DocumentNode { + inputs: vec![NodeInput::node(NodeId(1), 0)], + implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::transform::BoundlessFootprintNode")), manual_composition: Some(generic!(T)), ..Default::default() }, @@ -2598,13 +2635,23 @@ fn static_nodes() -> Vec { DocumentNodeMetadata { persistent_metadata: DocumentNodePersistentMetadata { display_name: "Poisson-Disk Points".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(0, 0)), ..Default::default() }, ..Default::default() }, DocumentNodeMetadata { persistent_metadata: DocumentNodePersistentMetadata { - display_name: "Memoize Impure".to_string(), + display_name: "Freeze Real Time".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(7, 0)), + ..Default::default() + }, + ..Default::default() + }, + DocumentNodeMetadata { + persistent_metadata: DocumentNodePersistentMetadata { + display_name: "Boundless Footprint".to_string(), + node_type_metadata: NodeTypePersistentMetadata::node(IVec2::new(14, 0)), ..Default::default() }, ..Default::default()