jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect 'Clip' on Artboards when exporting "All Artworks". (#1916) 

* Add constraint_bounds function to Quad implementation

* Respect Clip property when exporting All Artworks and centering document using the ctrl + 0 hotkey.
Calculate  artboard_clip_bounds  and then constraint the  all_layer_bounds  to respect the bounds of the Clipped Artboards.

* Use parent_artboard to find ancestor artboards of each layer and constrain bounds if artboard is clipped

* Remove redundant comments
This commit is contained in:
Utsav Singh 2024-08-11 11:59:34 +05:30 committed by GitHub
parent 193f757c45
commit 1b6d45ad30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editor/src/messages/portfolio/document/utility_types/network_interface.rs
View File

@ -905,6 +905,15 @@ impl NodeNetworkInterface {
.is_some_and(|reference| reference == "Artboard" && self.connected_to_output(node_id, &[]))
}
pub fn parent_artboard(&self, layer: LayerNodeIdentifier) -> Option<LayerNodeIdentifier> {
let ancestors: Vec<_> = layer.ancestors(self.document_metadata()).collect();
match ancestors.as_slice() {
[_, second_last, _last] if self.is_artboard(&second_last.to_node(), &[]) => Some(*second_last),
[_, last] if self.is_artboard(&last.to_node(), &[]) => Some(*last),
_ => None,
}
}
pub fn all_artboards(&self) -> HashSet<LayerNodeIdentifier> {
self.network_metadata(&[])
.unwrap()
@ -949,7 +958,23 @@ impl NodeNetworkInterface {
self.document_metadata
.all_layers()
.filter(|layer| include_artboards || !self.is_artboard(&layer.to_node(), &[]))
.filter_map(|layer| self.document_metadata.bounding_box_document(layer))
.filter_map(|layer| {
if !self.is_artboard(&layer.to_node(), &[]) {
if let Some(artboard_node_identifier) = self.parent_artboard(layer) {
let artboard = self.network(&[]).unwrap().nodes.get(&artboard_node_identifier.to_node());
let clip_input = artboard.unwrap().inputs.get(5).unwrap();
if let NodeInput::Value { tagged_value, .. } = clip_input {
if tagged_value.to_primitive_string() == "true" {
return Some(Quad::constraint_bounds(
self.document_metadata.bounding_box_document(layer).unwrap_or_default(),
self.document_metadata.bounding_box_document(artboard_node_identifier).unwrap_or_default(),
));
}
}
}
}
self.document_metadata.bounding_box_document(layer)
})
.reduce(Quad::combine_bounds)
}

8
node-graph/gcore/src/graphic_element/renderer/quad.rs
View File

@ -49,6 +49,14 @@ impl Quad {
[a[0].min(b[0]), a[1].max(b[1])]
}
/// "Clip" bounds of 'a' to the limits of 'b'
pub fn constraint_bounds(a: [DVec2; 2], b: [DVec2; 2]) -> [DVec2; 2] {
[
a[0].max(b[0]), // Constrain min corner
a[1].min(b[1]), // Constrain max corner
]
}
/// Expand a quad by a certain amount on all sides.
///
/// Not currently very optimised