mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-03 21:08:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add preview and disable buttons for nodes (#905)

Browse source 
* Add preview and disable button

* Fix tests

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
0HyperCube 2022-12-25 10:28:18 +00:00 • committed by Keavon Chambers
parent 41b07ad0cf
commit 8d7e6c530e
10 changed files with 196 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

18
node-graph/graph-craft/src/document.rs
View file

@ -163,12 +163,18 @@ pub struct NodeNetwork {
pub inputs: Vec<NodeId>,
pub output: NodeId,
pub nodes: HashMap<NodeId, DocumentNode>,
/// These nodes are replaced with identity nodes when flattening
pub disabled: Vec<NodeId>,
/// In the case where a new node is chosen as output - what was the origional
pub previous_output: Option<NodeId>,
}
impl NodeNetwork {
pub fn map_ids(&mut self, f: impl Fn(NodeId) -> NodeId + Copy) {
self.inputs.iter_mut().for_each(|id| *id = f(*id));
self.output = f(self.output);
self.disabled.iter_mut().for_each(|id| *id = f(*id));
self.previous_output = self.previous_output.map(f);
let mut empty = HashMap::new();
std::mem::swap(&mut self.nodes, &mut empty);
self.nodes = empty
@ -204,6 +210,13 @@ impl NodeNetwork {
.remove_entry(&node)
.unwrap_or_else(|| panic!("The node which was supposed to be flattened does not exist in the network, id {} network {:#?}", node, self));
if self.disabled.contains(&id) {
node.implementation = DocumentNodeImplementation::Unresolved(NodeIdentifier::new("graphene_core::ops::IdNode", &[generic!("T")]));
node.inputs.drain(1..);
self.nodes.insert(id, node);
return;
}
match node.implementation {
DocumentNodeImplementation::Network(mut inner_network) => {
// Connect all network inputs to either the parent network nodes, or newly created value nodes.
@ -211,6 +224,7 @@ impl NodeNetwork {
let new_nodes = inner_network.nodes.keys().cloned().collect::<Vec<_>>();
// Copy nodes from the inner network into the parent network
self.nodes.extend(inner_network.nodes);
self.disabled.extend(inner_network.disabled);
let mut network_offsets = HashMap::new();
for (document_input, network_input) in node.inputs.into_iter().zip(inner_network.inputs.iter()) {
@ -305,6 +319,7 @@ mod test {
]
.into_iter()
.collect(),
..Default::default()
}
}
@ -337,6 +352,7 @@ mod test {
]
.into_iter()
.collect(),
..Default::default()
};
assert_eq!(network, maped_add);
}
@ -363,6 +379,7 @@ mod test {
)]
.into_iter()
.collect(),
..Default::default()
};
network.flatten_with_fns(1, |self_id, inner_id| self_id * 10 + inner_id, gen_node_id);
let flat_network = flat_network();
@ -480,6 +497,7 @@ mod test {
]
.into_iter()
.collect(),
..Default::default()
}
}
}