fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 22:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename NodeNetwork inputs/outputs to imports/exports

Browse Source
This commit is contained in:
Keavon Chambers
2024-03-10 22:45:22 -07:00
parent 137853eb40
commit fd54cda445
17 changed files with 166 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/src/messages/portfolio/document/document_message_handler.rs
View File

@@ -179,8 +179,8 @@ fn root_network() -> NodeNetwork {
name: "Output".into(),
inputs: vec![NodeInput::value(TaggedValue::GraphicGroup(Default::default()), true), NodeInput::Network(concrete!(WasmEditorApi))],
implementation: graph_craft::document::DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(3), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(3), 0)],
imports: vec![NodeId(3), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(3), 0)],
nodes: [
DocumentNode {
name: "EditorApi".to_string(),

6
editor/src/messages/portfolio/document/node_graph/graph_operation_message_handler.rs
View File

@@ -269,7 +269,7 @@ impl<'a> ModifyInputsContext<'a> {
/// Inserts a new node and modifies the inputs
fn modify_new_node(&mut self, name: &'static str, update_input: impl FnOnce(&mut Vec<NodeInput>, NodeId, &DocumentMetadata)) {
let output_node_id = self.layer_node.unwrap_or(self.document_network.outputs[0].node_id);
let output_node_id = self.layer_node.unwrap_or(self.document_network.exports[0].node_id);
let Some(output_node) = self.document_network.nodes.get_mut(&output_node_id) else {
warn!("Output node doesn't exist");
return;
@@ -302,7 +302,7 @@ impl<'a> ModifyInputsContext<'a> {
.document_network
.upstream_flow_back_from_nodes(
self.layer_node
.map_or_else(|| self.document_network.outputs.iter().map(|output| output.node_id).collect(), |id| vec![id]),
.map_or_else(|| self.document_network.exports.iter().map(|output| output.node_id).collect(), |id| vec![id]),
true,
)
.find(|(node, _)| node.name == name)
@@ -327,7 +327,7 @@ impl<'a> ModifyInputsContext<'a> {
.document_network
.upstream_flow_back_from_nodes(
self.layer_node
.map_or_else(|| self.document_network.outputs.iter().map(|output| output.node_id).collect(), |id| vec![id]),
.map_or_else(|| self.document_network.exports.iter().map(|output| output.node_id).collect(), |id| vec![id]),
true,
)
.filter(|(node, _)| node.name == name)

12
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs
View File

@@ -179,7 +179,7 @@ impl NodeGraphMessageHandler {
let mut widgets = Vec::new();
// Don't allow disabling input or output nodes
let mut selection = selected_nodes.selected_nodes().filter(|&&id| !network.inputs.contains(&id) && !network.original_outputs_contain(id));
let mut selection = selected_nodes.selected_nodes().filter(|&&id| !network.imports.contains(&id) && !network.original_outputs_contain(id));
// If there is at least one other selected node then show the hide or show button
if selection.next().is_some() {
@@ -422,7 +422,7 @@ impl NodeGraphMessageHandler {
}
fn remove_references_from_network(network: &mut NodeNetwork, deleting_node_id: NodeId, reconnect: bool) -> bool {
if network.inputs.contains(&deleting_node_id) {
if network.imports.contains(&deleting_node_id) {
warn!("Deleting input node!");
return false;
}
@@ -959,7 +959,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
if let Some(network) = document_network.nested_network_mut(&self.network) {
if !hidden {
network.disabled.retain(|&id| node_id != id);
} else if !network.inputs.contains(&node_id) && !network.original_outputs().iter().any(|output| output.node_id == node_id) {
} else if !network.imports.contains(&node_id) && !network.original_outputs().iter().any(|output| output.node_id == node_id) {
network.disabled.push(node_id);
}
@@ -991,10 +991,10 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
if let Some(network) = document_network.nested_network_mut(&self.network) {
// Check if the node is not already being previewed
if !network.outputs_contain(node_id) {
network.previous_outputs = Some(network.previous_outputs.to_owned().unwrap_or_else(|| network.outputs.clone()));
network.outputs[0] = NodeOutput::new(node_id, 0);
network.previous_outputs = Some(network.previous_outputs.to_owned().unwrap_or_else(|| network.exports.clone()));
network.exports[0] = NodeOutput::new(node_id, 0);
} else if let Some(outputs) = network.previous_outputs.take() {
network.outputs = outputs
network.exports = outputs
} else {
return;
}

138
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs
View File

@@ -197,8 +197,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Layer",
category: "General",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(2)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(0), NodeId(2)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
(
NodeId(0),
@@ -279,8 +279,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Load Image",
category: "Structural",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Load Resource".to_string(),
@@ -331,8 +331,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Create Canvas",
category: "Structural",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: [
DocumentNode {
name: "Create Canvas".to_string(),
@@ -370,8 +370,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Draw Canvas",
category: "Structural",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(2)],
outputs: vec![NodeOutput::new(NodeId(3), 0)],
imports: vec![NodeId(0), NodeId(2)],
exports: vec![NodeOutput::new(NodeId(3), 0)],
nodes: [
DocumentNode {
name: "Convert Image Frame".to_string(),
@@ -429,8 +429,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Begin Scope",
category: "Ignore",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0), NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0), NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "SetNode".to_string(),
@@ -504,8 +504,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Output",
category: "Ignore",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(3), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(4), 0)],
imports: vec![NodeId(3), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(4), 0)],
nodes: [
DocumentNode {
name: "EditorApi".to_string(),
@@ -566,8 +566,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Image Frame",
category: "General",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Image Frame".to_string(),
@@ -601,7 +601,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Noise Pattern",
category: "General",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![
imports: vec![
NodeId(0),
NodeId(0),
NodeId(0),
@@ -619,7 +619,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
NodeId(0),
NodeId(0),
],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Noise Pattern".to_string(),
@@ -896,8 +896,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Split Channels",
category: "Image Adjustments",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0)],
outputs: vec![
imports: vec![NodeId(0)],
exports: vec![
NodeOutput::new(NodeId(1), 0),
NodeOutput::new(NodeId(2), 0),
NodeOutput::new(NodeId(3), 0),
@@ -959,8 +959,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Brush",
category: "Brush",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0), NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0), NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Brush".to_string(),
@@ -1032,8 +1032,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Image",
category: "Ignore",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Identity".to_string(),
@@ -1065,8 +1065,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Uniform",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(1), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -1117,8 +1117,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Storage",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(1), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -1169,8 +1169,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "CreateOutputBuffer",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(1), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(1), NodeId(1), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -1227,8 +1227,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "CreateComputePass",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(0), NodeId(1), NodeId(1)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(1), NodeId(0), NodeId(1), NodeId(1)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -1329,8 +1329,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "ExecuteComputePipeline",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(1), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -1381,8 +1381,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "ReadOutputBuffer",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(1), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -1433,8 +1433,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "CreateGpuSurface",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: [
DocumentNode {
name: "Create Gpu Surface".to_string(),
@@ -1472,8 +1472,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "RenderTexture",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(1), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(1), NodeId(1), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -1526,8 +1526,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "UploadTexture",
category: "Gpu",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(1), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(1), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: [
DocumentNode {
name: "Extract Executor".to_string(),
@@ -2161,8 +2161,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Circle",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Circle Generator".to_string(),
@@ -2193,8 +2193,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Ellipse",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Ellipse Generator".to_string(),
@@ -2229,8 +2229,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Rectangle",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Rectangle Generator".to_string(),
@@ -2265,8 +2265,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Regular Polygon",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Regular Polygon Generator".to_string(),
@@ -2301,8 +2301,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Star",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0), NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0), NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Star Generator".to_string(),
@@ -2343,8 +2343,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Line",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Line Generator".to_string(),
@@ -2379,8 +2379,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Spline",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Spline Generator".to_string(),
@@ -2414,8 +2414,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Shape",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Path Generator".to_string(),
@@ -2478,8 +2478,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Text",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(0), NodeId(0), NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(0), NodeId(0), NodeId(0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: vec![
DocumentNode {
name: "Text Generator".to_string(),
@@ -2520,8 +2520,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Transform",
category: "Transform",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(1), NodeId(1), NodeId(1), NodeId(1), NodeId(1)],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
imports: vec![NodeId(0), NodeId(1), NodeId(1), NodeId(1), NodeId(1), NodeId(1)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: [
DocumentNode {
inputs: vec![NodeInput::Network(concrete!(VectorData))],
@@ -2666,8 +2666,8 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
name: "Sample Points",
category: "Vector",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![NodeId(0), NodeId(2), NodeId(2), NodeId(2), NodeId(2)], // First is given to Identity, the rest are given to Sample Points
outputs: vec![NodeOutput::new(NodeId(2), 0)], // Taken from output 0 of Sample Points
imports: vec![NodeId(0), NodeId(2), NodeId(2), NodeId(2), NodeId(2)], // First is given to Identity, the rest are given to Sample Points
exports: vec![NodeOutput::new(NodeId(2), 0)], // Taken from output 0 of Sample Points
nodes: [
DocumentNode {
name: "Identity".to_string(),
@@ -2820,7 +2820,7 @@ pub static IMAGINATE_NODE: Lazy<DocumentNodeDefinition> = Lazy::new(|| DocumentN
name: "Imaginate",
category: "Image Synthesis",
implementation: DocumentNodeImplementation::Network(NodeNetwork {
inputs: vec![
imports: vec![
NodeId(0),
NodeId(1),
NodeId(1),
@@ -2839,7 +2839,7 @@ pub static IMAGINATE_NODE: Lazy<DocumentNodeDefinition> = Lazy::new(|| DocumentN
NodeId(1),
NodeId(1),
],
outputs: vec![NodeOutput::new(NodeId(1), 0)],
exports: vec![NodeOutput::new(NodeId(1), 0)],
nodes: [
(
NodeId(0),
@@ -2973,7 +2973,7 @@ pub fn wrap_network_in_scope(mut network: NodeNetwork, hash: u64) -> NodeNetwork
}
}
let len = network_inputs.len();
network.inputs = network_inputs;
network.imports = network_inputs;
// if the network has no inputs, it doesn't need to be wrapped in a scope
if len == 0 {
@@ -3007,8 +3007,8 @@ pub fn wrap_network_in_scope(mut network: NodeNetwork, hash: u64) -> NodeNetwork
];
NodeNetwork {
inputs: vec![NodeId(0)],
outputs: vec![NodeOutput::new(NodeId(2), 0)],
imports: vec![NodeId(0)],
exports: vec![NodeOutput::new(NodeId(2), 0)],
nodes: nodes.into_iter().enumerate().map(|(id, node)| (NodeId(id as u64), node)).collect(),
..Default::default()
}
@@ -3016,7 +3016,7 @@ pub fn wrap_network_in_scope(mut network: NodeNetwork, hash: u64) -> NodeNetwork
pub fn new_image_network(output_offset: i32, output_node_id: NodeId) -> NodeNetwork {
let mut network = NodeNetwork {
inputs: vec![NodeId(0)],
imports: vec![NodeId(0)],
..Default::default()
};
network.push_node(
@@ -3040,7 +3040,7 @@ pub fn new_text_network(text: String, font: Font, size: f64) -> NodeNetwork {
let output = resolve_document_node_type("Output").expect("Output node does not exist");
let mut network = NodeNetwork {
inputs: vec![NodeId(0)],
imports: vec![NodeId(0)],
..Default::default()
};
network.push_node(text_generator.to_document_node(

2
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/node_properties.rs
View File

@@ -1825,7 +1825,7 @@ pub fn imaginate_properties(document_node: &DocumentNode, node_id: NodeId, conte
.introspect_node_in_network(
context.network,
&imaginate_node,
|network| network.inputs.first().copied(),
|network| network.imports.first().copied(),
|frame: &IORecord<(), ImageFrame<Color>>| (frame.output.image.width, frame.output.image.height),
)
.unwrap_or_default();

2
editor/src/messages/portfolio/document/utility_types/document_metadata.rs
View File

@@ -141,7 +141,7 @@ impl DocumentMetadata {
self.folders = HashSet::new();
self.artboards = HashSet::new();
let id = graph.outputs[0].node_id;
let id = graph.exports[0].node_id;
let Some(output_node) = graph.nodes.get(&id) else {
return;
};

2
editor/src/node_graph_executor.rs
View File

@@ -211,7 +211,7 @@ impl NodeRuntime {
.collect::<Vec<_>>();
// We assume only one output
assert_eq!(scoped_network.outputs.len(), 1, "Graph with multiple outputs not yet handled");
assert_eq!(scoped_network.exports.len(), 1, "Graph with multiple outputs not yet handled");
let c = Compiler {};
let proto_network = match c.compile_single(scoped_network) {
Ok(network) => network,