Skip to content

Commit e4ec67d

Browse files
adamgerhantadamgerhant
authored
Fix wires on document change and errors on hidden nodes (#2897)
* Fix wires on document change and errors on hidden nodes * Code cleanup
1 parent 7ef9e5a commit e4ec67d

File tree

9 files changed

+68
-74
lines changed

9 files changed

+68
-74
lines changed

‎editor/src/messages/portfolio/document/document_message_handler.rs

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -182,20 +182,13 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
182182
device_pixel_ratio,
183183
} = context;
184184

185-
let selected_nodes_bounding_box_viewport = self.network_interface.selected_nodes_bounding_box_viewport(&self.breadcrumb_network_path);
186-
let selected_visible_layers_bounding_box_viewport = self.selected_visible_layers_bounding_box_viewport();
187185
match message {
188186
// Sub-messages
189187
DocumentMessage::Navigation(message) => {
190188
let context = NavigationMessageContext {
191189
network_interface: &mut self.network_interface,
192190
breadcrumb_network_path: &self.breadcrumb_network_path,
193191
ipp,
194-
selection_bounds: if self.graph_view_overlay_open {
195-
selected_nodes_bounding_box_viewport
196-
} else {
197-
selected_visible_layers_bounding_box_viewport
198-
},
199192
document_ptz: &mut self.document_ptz,
200193
graph_view_overlay_open: self.graph_view_overlay_open,
201194
preferences,
@@ -259,7 +252,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
259252
AlignAxis::X => DVec2::X,
260253
AlignAxis::Y => DVec2::Y,
261254
};
262-
let Some(combined_box) = self.selected_visible_layers_bounding_box_viewport() else {
255+
let Some(combined_box) = self.network_interface.selected_layers_artwork_bounding_box_viewport() else {
263256
return;
264257
};
265258

@@ -486,7 +479,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
486479
FlipAxis::X => DVec2::new(-1., 1.),
487480
FlipAxis::Y => DVec2::new(1., -1.),
488481
};
489-
if let Some([min, max]) = self.selected_visible_and_unlock_layers_bounding_box_viewport() {
482+
if let Some([min, max]) = self.network_interface.selected_unlocked_layers_bounding_box_viewport() {
490483
let center = (max + min) / 2.;
491484
let bbox_trans = DAffine2::from_translation(-center);
492485
let mut added_transaction = false;
@@ -506,7 +499,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
506499
}
507500
DocumentMessage::RotateSelectedLayers { degrees } => {
508501
// Get the bounding box of selected layers in viewport space
509-
if let Some([min, max]) = self.selected_visible_and_unlock_layers_bounding_box_viewport() {
502+
if let Some([min, max]) = self.network_interface.selected_unlocked_layers_bounding_box_viewport() {
510503
// Calculate the center of the bounding box to use as rotation pivot
511504
let center = (max + min) / 2.;
512505
// Transform that moves pivot point to origin
@@ -1063,13 +1056,13 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
10631056
self.selected_layers_reorder(relative_index_offset, responses);
10641057
}
10651058
DocumentMessage::ClipLayer { id } => {
1066-
let layer = LayerNodeIdentifier::new(id, &self.network_interface, &[]);
1059+
let layer = LayerNodeIdentifier::new(id, &self.network_interface);
10671060

10681061
responses.add(DocumentMessage::AddTransaction);
10691062
responses.add(GraphOperationMessage::ClipModeToggle { layer });
10701063
}
10711064
DocumentMessage::SelectLayer { id, ctrl, shift } => {
1072-
let layer = LayerNodeIdentifier::new(id, &self.network_interface, &[]);
1065+
let layer = LayerNodeIdentifier::new(id, &self.network_interface);
10731066

10741067
let mut nodes = vec![];
10751068

@@ -1266,7 +1259,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
12661259
responses.add(OverlaysMessage::Draw);
12671260
}
12681261
DocumentMessage::ToggleLayerExpansion { id, recursive } => {
1269-
let layer = LayerNodeIdentifier::new(id, &self.network_interface, &[]);
1262+
let layer = LayerNodeIdentifier::new(id, &self.network_interface);
12701263
let metadata = self.metadata();
12711264

12721265
let is_collapsed = self.collapsed.0.contains(&layer);
@@ -1323,7 +1316,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
13231316
self.network_interface.document_network().nodes.contains_key(node_id))
13241317
.filter_map(|(node_id, click_targets)| {
13251318
self.network_interface.is_layer(&node_id, &[]).then(|| {
1326-
let layer = LayerNodeIdentifier::new(node_id, &self.network_interface, &[]);
1319+
let layer = LayerNodeIdentifier::new(node_id, &self.network_interface);
13271320
(layer, click_targets)
13281321
})
13291322
})
@@ -1708,31 +1701,6 @@ impl DocumentMessageHandler {
17081701
.last()
17091702
}
17101703

1711-
/// Get the combined bounding box of the click targets of the selected visible layers in viewport space
1712-
pub fn selected_visible_layers_bounding_box_viewport(&self) -> Option<[DVec2; 2]> {
1713-
self.network_interface
1714-
.selected_nodes()
1715-
.selected_visible_layers(&self.network_interface)
1716-
.filter_map(|layer| self.metadata().bounding_box_viewport(layer))
1717-
.reduce(graphene_std::renderer::Quad::combine_bounds)
1718-
}
1719-
1720-
pub fn selected_visible_and_unlock_layers_bounding_box_viewport(&self) -> Option<[DVec2; 2]> {
1721-
self.network_interface
1722-
.selected_nodes()
1723-
.selected_visible_and_unlocked_layers(&self.network_interface)
1724-
.filter_map(|layer| self.metadata().bounding_box_viewport(layer))
1725-
.reduce(graphene_std::renderer::Quad::combine_bounds)
1726-
}
1727-
1728-
pub fn selected_visible_and_unlock_layers_bounding_box_document(&self) -> Option<[DVec2; 2]> {
1729-
self.network_interface
1730-
.selected_nodes()
1731-
.selected_visible_and_unlocked_layers(&self.network_interface)
1732-
.map(|layer| self.metadata().nonzero_bounding_box(layer))
1733-
.reduce(graphene_std::renderer::Quad::combine_bounds)
1734-
}
1735-
17361704
pub fn document_network(&self) -> &NodeNetwork {
17371705
self.network_interface.document_network()
17381706
}

‎editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
119119
let primary_input = artboard.inputs.first().expect("Artboard should have a primary input").clone();
120120
if let NodeInput::Node { node_id, .. } = &primary_input {
121121
if network_interface.is_layer(node_id, &[]) && !network_interface.is_artboard(node_id, &[]) {
122-
network_interface.move_layer_to_stack(LayerNodeIdentifier::new(*node_id, network_interface, &[]), artboard_layer, 0, &[]);
122+
network_interface.move_layer_to_stack(LayerNodeIdentifier::new(*node_id, network_interface), artboard_layer, 0, &[]);
123123
} else {
124124
network_interface.disconnect_input(&InputConnector::node(artboard_layer.to_node(), 0), &[]);
125125
network_interface.set_input(&InputConnector::node(id, 0), primary_input, &[]);

‎editor/src/messages/portfolio/document/graph_operation/utility_types.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl<'a> ModifyInputsContext<'a> {
124124
pub fn create_layer(&mut self, new_id: NodeId) -> LayerNodeIdentifier {
125125
let new_merge_node = resolve_document_node_type("Merge").expect("Merge node").default_node_template();
126126
self.network_interface.insert_node(new_id, new_merge_node, &[]);
127-
LayerNodeIdentifier::new(new_id, self.network_interface, &[])
127+
LayerNodeIdentifier::new(new_id, self.network_interface)
128128
}
129129

130130
/// Creates an artboard as the primary export for the document network
@@ -138,7 +138,7 @@ impl<'a> ModifyInputsContext<'a> {
138138
Some(NodeInput::value(TaggedValue::Bool(artboard.clip), false)),
139139
]);
140140
self.network_interface.insert_node(new_id, artboard_node_template, &[]);
141-
LayerNodeIdentifier::new(new_id, self.network_interface, &[])
141+
LayerNodeIdentifier::new(new_id, self.network_interface)
142142
}
143143

144144
pub fn insert_boolean_data(&mut self, operation: graphene_std::path_bool::BooleanOperation, layer: LayerNodeIdentifier) {
@@ -236,7 +236,7 @@ impl<'a> ModifyInputsContext<'a> {
236236
self.layer_node.or_else(|| {
237237
let export_node = self.network_interface.document_network().exports.first().and_then(|export| export.as_node())?;
238238
if self.network_interface.is_layer(&export_node, &[]) {
239-
Some(LayerNodeIdentifier::new(export_node, self.network_interface, &[]))
239+
Some(LayerNodeIdentifier::new(export_node, self.network_interface))
240240
} else {
241241
None
242242
}

‎editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ pub struct NavigationMessageContext<'a> {
1818
pub network_interface: &'a mut NodeNetworkInterface,
1919
pub breadcrumb_network_path: &'a [NodeId],
2020
pub ipp: &'a InputPreprocessorMessageHandler,
21-
pub selection_bounds: Option<[DVec2; 2]>,
2221
pub document_ptz: &'a mut PTZ,
2322
pub graph_view_overlay_open: bool,
2423
pub preferences: &'a PreferencesMessageHandler,
@@ -39,7 +38,6 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
3938
network_interface,
4039
breadcrumb_network_path,
4140
ipp,
42-
selection_bounds,
4341
document_ptz,
4442
graph_view_overlay_open,
4543
preferences,
@@ -386,9 +384,16 @@ impl MessageHandler<NavigationMessage, NavigationMessageContext<'_>> for Navigat
386384
responses.add(DocumentMessage::PTZUpdate);
387385
responses.add(NodeGraphMessage::SetGridAlignedEdges);
388386
}
387+
// Fully zooms in on the selected
389388
NavigationMessage::FitViewportToSelection => {
389+
let selection_bounds = if graph_view_overlay_open {
390+
network_interface.selected_nodes_bounding_box_viewport(breadcrumb_network_path)
391+
} else {
392+
network_interface.selected_layers_artwork_bounding_box_viewport()
393+
};
394+
390395
if let Some(bounds) = selection_bounds {
391-
let Some(ptz) = get_ptz_mut(document_ptz, network_interface, graph_view_overlay_open, breadcrumb_network_path) else {
396+
let Some(ptz) = get_ptz(document_ptz, network_interface, graph_view_overlay_open, breadcrumb_network_path) else {
392397
log::error!("Could not get node graph PTZ in FitViewportToSelection");
393398
return;
394399
};

‎editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,6 +1387,11 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
13871387
if node_bbox[1].x >= document_bbox[0].x && node_bbox[0].x <= document_bbox[1].x && node_bbox[1].y >= document_bbox[0].y && node_bbox[0].y <= document_bbox[1].y {
13881388
nodes.push(*node_id);
13891389
}
1390+
for error in &self.node_graph_errors {
1391+
if error.node_path.contains(node_id) {
1392+
nodes.push(*node_id);
1393+
}
1394+
}
13901395
}
13911396

13921397
responses.add(FrontendMessage::UpdateVisibleNodes { nodes });
@@ -2399,19 +2404,19 @@ impl NodeGraphMessageHandler {
23992404
let mut ancestors_of_selected = HashSet::new();
24002405
let mut descendants_of_selected = HashSet::new();
24012406
for selected_layer in &selected_layers {
2402-
for ancestor in LayerNodeIdentifier::new(*selected_layer, network_interface, &[]).ancestors(network_interface.document_metadata()) {
2407+
for ancestor in LayerNodeIdentifier::new(*selected_layer, network_interface).ancestors(network_interface.document_metadata()) {
24032408
if ancestor != LayerNodeIdentifier::ROOT_PARENT && ancestor.to_node() != *selected_layer {
24042409
ancestors_of_selected.insert(ancestor.to_node());
24052410
}
24062411
}
2407-
for descendant in LayerNodeIdentifier::new(*selected_layer, network_interface, &[]).descendants(network_interface.document_metadata()) {
2412+
for descendant in LayerNodeIdentifier::new(*selected_layer, network_interface).descendants(network_interface.document_metadata()) {
24082413
descendants_of_selected.insert(descendant.to_node());
24092414
}
24102415
}
24112416

24122417
for (&node_id, node_metadata) in &network_interface.document_network_metadata().persistent_metadata.node_metadata {
24132418
if node_metadata.persistent_metadata.is_layer() {
2414-
let layer = LayerNodeIdentifier::new(node_id, network_interface, &[]);
2419+
let layer = LayerNodeIdentifier::new(node_id, network_interface);
24152420

24162421
let children_allowed =
24172422
// The layer has other layers as children along the secondary input's horizontal flow

‎editor/src/messages/portfolio/document/utility_types/document_metadata.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,8 @@ impl LayerNodeIdentifier {
250250

251251
/// Construct a [`LayerNodeIdentifier`], debug asserting that it is a layer node. This should only be used in the document network since the structure is not loaded in nested networks.
252252
#[track_caller]
253-
pub fn new(node_id: NodeId, network_interface: &NodeNetworkInterface, network_path: &[NodeId]) -> Self {
254-
debug_assert!(
255-
network_interface.is_layer(&node_id, network_path),
256-
"Layer identifier constructed from non-layer node {node_id}: {:#?}",
257-
network_interface.nested_network(network_path).unwrap().nodes.get(&node_id)
258-
);
253+
pub fn new(node_id: NodeId, network_interface: &NodeNetworkInterface) -> Self {
254+
debug_assert!(network_interface.is_layer(&node_id, &[]), "Layer identifier constructed from non-layer node {node_id}",);
259255
Self::new_unchecked(node_id)
260256
}
261257

0 commit comments

Comments
 (0)