Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 63 additions & 2 deletions editor/src/messages/tool/tool_messages/select_tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::messages::portfolio::document::graph_operation::utility_types::Transf
use crate::messages::portfolio::document::node_graph::document_node_definitions::DefinitionIdentifier;
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
use crate::messages::portfolio::document::utility_types::document_metadata::{DocumentMetadata, LayerNodeIdentifier};
use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, FlipAxis, GroupFolderType};
use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, BoundingBoxSnapTarget, FlipAxis, GroupFolderType, PathSnapSource, SnapSource, SnapTarget};
use crate::messages::portfolio::document::utility_types::network_interface::{FlowType, NodeNetworkInterface, NodeTemplate};
use crate::messages::portfolio::document::utility_types::nodes::SelectedNodes;
use crate::messages::preferences::SelectionMode;
Expand Down Expand Up @@ -592,6 +592,52 @@ pub fn create_bounding_box_transform(document: &DocumentMessageHandler) -> DAffi
.unwrap_or_default()
}

fn snap_pivot_to_bounds(document: &DocumentMessageHandler, mouse_position: DVec2, selection_bounds: &Option<BoundingBoxManager>) -> Option<snapping::SnappedPoint> {
let tolerance = snapping::snap_tolerance(document);
let mut best_snap: Option<(DVec2, Quad, BoundingBoxSnapTarget, f64)> = None;

let mut check_quad = |quad: Quad| {
let check = |snap_doc: DVec2, point_type: BoundingBoxSnapTarget, best: &mut Option<(DVec2, Quad, BoundingBoxSnapTarget, f64)>| {
let snap_viewport = document.metadata().document_to_viewport.transform_point2(snap_doc);
let distance = mouse_position.distance(snap_viewport);
if distance < tolerance && best.map_or(true, |(_, _, _, d)| distance < d) {
*best = Some((snap_doc, quad, point_type, distance));
}
};
for i in 0..4 {
check(quad.0[i], BoundingBoxSnapTarget::CornerPoint, &mut best_snap);
check((quad.0[i] + quad.0[(i + 1) % 4]) / 2.0, BoundingBoxSnapTarget::EdgeMidpoint, &mut best_snap);
}
check(quad.center(), BoundingBoxSnapTarget::CenterPoint, &mut best_snap);
};

// Snap to selection's combined bounding box
if let Some(bounds) = selection_bounds {
check_quad(document.metadata().document_to_viewport.inverse() * bounds.transform * Quad::from_box(bounds.bounds));
}

let selected: Vec<_> = document.network_interface.selected_nodes().selected_visible_and_unlocked_layers(&document.network_interface).collect();
for layer in document.metadata().all_layers() {
if selected.contains(&layer) || !document.network_interface.is_visible(&layer.to_node(), &[]) {
continue;
}
let Some(bounds) = document.metadata().bounding_box_with_transform(layer, document.metadata().transform_to_document(layer)) else {
continue;
};
check_quad(Quad::from_box(bounds));
}

best_snap.map(|(snap_point, quad, point_type, distance)| snapping::SnappedPoint {
snapped_point_document: snap_point,
source: SnapSource::Path(PathSnapSource::HandlePoint),
target: SnapTarget::BoundingBox(point_type),
distance,
tolerance,
target_bounds: Some(quad),
..Default::default()
})
}

impl Fsm for SelectToolFsmState {
type ToolData = SelectToolData;
type ToolOptions = ();
Expand Down Expand Up @@ -1149,6 +1195,7 @@ impl Fsm for SelectToolFsmState {
}
(SelectToolFsmState::DraggingPivot, SelectToolMessage::Abort) => {
responses.add(DocumentMessage::AbortTransaction);
tool_data.snap_manager.cleanup(responses);

let selection = tool_data.nested_selection_behavior;
SelectToolFsmState::Ready { selection }
Expand Down Expand Up @@ -1274,10 +1321,24 @@ impl Fsm for SelectToolFsmState {
}
(SelectToolFsmState::DraggingPivot, SelectToolMessage::PointerMove { modifier_keys }) => {
let mouse_position = input.mouse.position;
let snapped_mouse_position = mouse_position;
let document_mouse = document.metadata().document_to_viewport.inverse().transform_point2(mouse_position);

let snap_data = SnapData::new(document, input, viewport);
let point = SnapCandidatePoint::handle(document_mouse);
let mut snapped = tool_data.snap_manager.free_snap(&snap_data, &point, snapping::SnapTypeConfiguration::default());

if let Some(pivot_snap) = snap_pivot_to_bounds(document, mouse_position, &tool_data.bounding_box_manager)
&& pivot_snap.distance < snapped.distance
{
snapped = pivot_snap;
}

tool_data.snap_manager.update_indicator(snapped.clone());

let snapped_mouse_position = document.metadata().document_to_viewport.transform_point2(snapped.snapped_point_document);
tool_data.pivot_gizmo.pivot.set_viewport_position(snapped_mouse_position);

responses.add(OverlaysMessage::Draw);
responses.add(NodeGraphMessage::RunDocumentGraph);

// Auto-panning
Expand Down
Loading