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

Remove explicit empty stack nodes (#1445)

Browse Source 
* Remove explicit empty stack nodes

* Code review stylistic simplifications

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
0HyperCube
2023-10-29 03:41:31 +00:00
committed by GitHub
parent ceb2f4c13f
commit 380bc19b09
4 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,6 @@ impl<'a> ModifyInputsContext<'a> {
} else {
// The user has connected another node to the output. Insert a layer node between the output and the node.
let mut node = resolve_document_node_type("Layer").expect("Layer node").default_document_node();
self.add_empty_stack(&mut node);
let node_id = self.insert_between(generate_uuid(), NodeOutput::new(node_id, output_index), output, node, 0, 0, IVec2::new(-8, 0))?;
NodeOutput::new(node_id, 0)
};
@@ -116,7 +115,6 @@ impl<'a> ModifyInputsContext<'a> {
self.insert_between(new_id, sibling_layer, output, node, 7, 0, IVec2::new(0, 3))
} else {
let mut layer_node = resolve_document_node_type("Layer").expect("Node").default_document_node();
self.add_empty_stack(&mut layer_node);
self.insert_node_before(new_id, output_node_id, input_index, layer_node, IVec2::new(-5, 3))
};
@@ -131,15 +129,7 @@ impl<'a> ModifyInputsContext<'a> {
new_id
}
fn add_empty_stack(&mut self, node: &mut DocumentNode) {
let empty_stack = resolve_document_node_type("Empty Stack").expect("EmptyStack node").default_document_node();
let empty_id = generate_uuid();
self.network.nodes.insert(empty_id, empty_stack);
*node.inputs.last_mut().unwrap() = NodeInput::node(empty_id, 0);
}
fn insert_artboard(&mut self, artboard: Artboard, layer: NodeId) -> Option<NodeId> {
let cull_node = resolve_document_node_type("Cull").expect("Node").default_document_node();
let artboard_node = resolve_document_node_type("Artboard").expect("Node").to_document_node_default_inputs(
[
None,
@@ -152,8 +142,7 @@ impl<'a> ModifyInputsContext<'a> {
);
self.responses.add(NodeGraphMessage::SendGraph { should_rerender: true });
let cull_id = generate_uuid();
self.insert_node_before(cull_id, layer, 0, cull_node, IVec2::new(-8, 0));
self.insert_node_before(generate_uuid(), cull_id, 0, artboard_node, IVec2::new(-8, 0))
self.insert_node_before(generate_uuid(), layer, 0, artboard_node, IVec2::new(-8, 0))
}
fn insert_vector_data(&mut self, subpaths: Vec<Subpath<ManipulatorGroupId>>, layer: NodeId) {

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

@@ -262,15 +262,6 @@ fn static_nodes() -> Vec<DocumentNodeType> {
properties: node_properties::artboard_properties,
..Default::default()
},
DocumentNodeType {
name: "Empty Stack",
category: "Hidden",
identifier: NodeImplementation::proto("graphene_core::transform::CullNode<_>"),
manual_composition: Some(concrete!(Footprint)),
inputs: vec![DocumentInputType::value("Graphic Group", TaggedValue::GraphicGroup(GraphicGroup::EMPTY), false)],
outputs: vec![DocumentOutputType::new("Out", FrontendGraphDataType::Artboard)],
..Default::default()
},
DocumentNodeType {
name: "Input Frame",
category: "Ignore",
@@ -2486,6 +2477,7 @@ impl DocumentNodeType {
pub fn wrap_network_in_scope(mut network: NodeNetwork, hash: u64) -> NodeNetwork {
network.generate_node_paths(&[]);
network.resolve_empty_stacks();
let node_ids = network.nodes.keys().copied().collect::<Vec<_>>();
for id in node_ids {
network.flatten(id);