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

Fix image loading and remove resolve_empty_stacks() function (#1746)

Browse source 
* Fix Image loading and remove `resolve_empty_stacks()`

* Revert noise pattern change

* Add todo comment
This commit is contained in:
Dennis Kobert 2024-05-08 10:31:41 +02:00 • committed by GitHub
parent 244c8ad10a
commit 1bfbe306be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 67 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1182,47 +1182,6 @@ impl NodeNetwork {
self.nodes.extend(extraction_nodes);
}
/// Due to the adaptive resolution system, nodes that take a `GraphicGroup` as input must call the upstream node with the `Footprint` parameter.
///
/// However, in the case of the default input, we must insert a node that takes an input of `Footprint` and returns `GraphicGroup::Empty`, in order to satisfy the type system.
/// This is because the standard value node takes in `()`.
pub fn resolve_empty_stacks(&mut self) {
for value in [
TaggedValue::GraphicGroup(GraphicGroup::EMPTY),
TaggedValue::VectorData(VectorData::empty()),
TaggedValue::ArtboardGroup(ArtboardGroup::EMPTY),
] {
const EMPTY_STACK: &str = "Empty Stack";
let new_id = generate_uuid();
let mut used = false;
// We filter out the newly inserted empty stack in case `resolve_empty_stacks` runs multiple times.
for node in self.nodes.values_mut().filter(|node| node.name != EMPTY_STACK) {
for input in &mut node.inputs {
if let NodeInput::Value { tagged_value, .. } = input {
if *tagged_value == value {
*input = NodeInput::node(NodeId(new_id), 0);
used = true;
}
}
}
}
// Only insert the node if necessary.
if used {
let new_node = DocumentNode {
name: EMPTY_STACK.to_string(),
implementation: DocumentNodeImplementation::proto("graphene_core::transform::CullNode<_>"),
manual_composition: Some(concrete!(graphene_core::transform::Footprint)),
inputs: vec![NodeInput::value(value, false)],
..Default::default()
};
self.nodes.insert(NodeId(new_id), new_node);
}
}
}
/// Creates a proto network for evaluating each output of this network.
pub fn into_proto_networks(self) -> impl Iterator<Item = ProtoNetwork> {
let mut nodes: Vec<_> = self.nodes.into_iter().map(|(id, node)| (id, node.resolve_proto_node())).collect();