Skip to content

Commit 39894b3

Browse files
mTvare6Keavon
andauthored
Fix constrained snap when dragging by a compass rose axis and fix that axis line's jiggling (#2333)
* Fixes constrained snap when using compass axes; Fix line banding Fixes #2313 Fixes line banding[0] [0]: https://discord.com/channels/731730685944922173/931942323644928040/1345339390809083934 * Separate axis align and axis constraint logic * Final fix * Use projection instead of length --------- Co-authored-by: Keavon Chambers <keavon@keavon.com>
1 parent 0570edc commit 39894b3

File tree

4 files changed

+33
-9
lines changed

4 files changed

+33
-9
lines changed

editor/src/messages/tool/common_functionality/compass_rose.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,13 @@ impl Axis {
101101
matches!(self, Self::X | Self::Y)
102102
}
103103
}
104+
105+
impl From<Axis> for DVec2 {
106+
fn from(value: Axis) -> Self {
107+
match value {
108+
Axis::X => DVec2::X,
109+
Axis::Y => DVec2::Y,
110+
Axis::None => DVec2::ZERO,
111+
}
112+
}
113+
}

editor/src/messages/tool/common_functionality/transformation_cage.rs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::messages::frontend::utility_types::MouseCursorIcon;
88
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
99
use crate::messages::portfolio::document::utility_types::transformation::OriginalTransforms;
1010
use crate::messages::prelude::*;
11+
use crate::messages::tool::common_functionality::compass_rose::Axis;
1112
use crate::messages::tool::common_functionality::snapping::SnapTypeConfiguration;
1213
use glam::{DAffine2, DMat2, DVec2};
1314
use graphene_core::renderer::Quad;
@@ -286,25 +287,30 @@ impl SelectedEdges {
286287
}
287288

288289
/// Aligns the mouse position to the closest axis
289-
pub fn axis_align_drag(axis_align: bool, position: DVec2, start: DVec2) -> DVec2 {
290+
pub fn axis_align_drag(axis_align: bool, axis: Axis, position: DVec2, start: DVec2) -> DVec2 {
290291
if axis_align {
291292
let mouse_position = position - start;
292293
let snap_resolution = SELECTION_DRAG_ANGLE.to_radians();
293294
let angle = -mouse_position.angle_to(DVec2::X);
294295
let snapped_angle = (angle / snap_resolution).round() * snap_resolution;
296+
let axis_vector = DVec2::from_angle(snapped_angle);
295297
if snapped_angle.is_finite() {
296-
start + DVec2::new(snapped_angle.cos(), snapped_angle.sin()) * mouse_position.length()
298+
start + axis_vector * mouse_position.dot(axis_vector).abs()
297299
} else {
298300
start
299301
}
302+
} else if axis.is_constraint() {
303+
let mouse_position = position - start;
304+
let axis_vector: DVec2 = axis.into();
305+
start + axis_vector * mouse_position.dot(axis_vector)
300306
} else {
301307
position
302308
}
303309
}
304310

305311
/// Snaps a dragging event from the artboard or select tool
306-
pub fn snap_drag(start: DVec2, current: DVec2, axis_align: bool, snap_data: SnapData, snap_manager: &mut SnapManager, candidates: &[SnapCandidatePoint]) -> DVec2 {
307-
let mouse_position = axis_align_drag(axis_align, snap_data.input.mouse.position, start);
312+
pub fn snap_drag(start: DVec2, current: DVec2, snap_to_axis: bool, axis: Axis, snap_data: SnapData, snap_manager: &mut SnapManager, candidates: &[SnapCandidatePoint]) -> DVec2 {
313+
let mouse_position = axis_align_drag(snap_to_axis, axis, snap_data.input.mouse.position, start);
308314
let document = snap_data.document;
309315
let total_mouse_delta_document = document.metadata().document_to_viewport.inverse().transform_vector2(mouse_position - start);
310316
let mouse_delta_document = document.metadata().document_to_viewport.inverse().transform_vector2(mouse_position - current);
@@ -324,7 +330,8 @@ pub fn snap_drag(start: DVec2, current: DVec2, axis_align: bool, snap_data: Snap
324330
let mut point = point.clone();
325331
point.document_point += total_mouse_delta_document;
326332

327-
let snapped = if axis_align {
333+
let constrained_along_axis = snap_to_axis || axis.is_constraint();
334+
let snapped = if constrained_along_axis {
328335
let constraint = SnapConstraint::Line {
329336
origin: point.document_point,
330337
direction: total_mouse_delta_document.try_normalize().unwrap_or(DVec2::X),

editor/src/messages/tool/tool_messages/artboard_tool.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::messages::portfolio::document::graph_operation::utility_types::Transf
33
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
44
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
55
use crate::messages::tool::common_functionality::auto_panning::AutoPanning;
6+
use crate::messages::tool::common_functionality::compass_rose::Axis;
67
use crate::messages::tool::common_functionality::resize::Resize;
78
use crate::messages::tool::common_functionality::snapping;
89
use crate::messages::tool::common_functionality::snapping::SnapCandidatePoint;
@@ -283,7 +284,7 @@ impl Fsm for ArtboardToolFsmState {
283284
let snap_data = SnapData::ignore(document, input, &ignore);
284285
let document_to_viewport = document.metadata().document_to_viewport;
285286
let [start, current] = [tool_data.drag_start, tool_data.drag_current].map(|point| document_to_viewport.transform_point2(point));
286-
let mouse_delta = snap_drag(start, current, axis_align, snap_data, &mut tool_data.snap_manager, &tool_data.snap_candidates);
287+
let mouse_delta = snap_drag(start, current, axis_align, Axis::None, snap_data, &mut tool_data.snap_manager, &tool_data.snap_candidates);
287288

288289
let size = bounds.bounds[1] - bounds.bounds[0];
289290
let position = bounds.bounds[0] + bounds.transform.inverse().transform_vector2(mouse_delta);

editor/src/messages/tool/tool_messages/select_tool.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ struct SelectToolData {
319319
cursor: MouseCursorIcon,
320320
pivot: Pivot,
321321
compass_rose: CompassRose,
322+
line_center: DVec2,
322323
skew_edge: EdgeBool,
323324
nested_selection_behavior: NestedSelectionBehavior,
324325
selected_layers_count: usize,
@@ -660,6 +661,9 @@ impl Fsm for SelectToolFsmState {
660661
// Update compass rose
661662
tool_data.compass_rose.refresh_position(document);
662663
let compass_center = tool_data.compass_rose.compass_rose_position();
664+
if !matches!(self, Self::Dragging { .. }) {
665+
tool_data.line_center = compass_center;
666+
}
663667
overlay_context.compass_rose(compass_center, angle, show_compass_with_ring);
664668

665669
let axis_state = if let SelectToolFsmState::Dragging { axis, .. } = self {
@@ -691,7 +695,8 @@ impl Fsm for SelectToolFsmState {
691695
let color_string = &graphene_std::Color::from_rgb_str(color.strip_prefix('#').unwrap()).unwrap().with_alpha(0.25).rgba_hex();
692696
&format!("#{}", color_string)
693697
};
694-
overlay_context.line(compass_center - direction * viewport_diagonal, compass_center + direction * viewport_diagonal, Some(color));
698+
let line_center = tool_data.line_center;
699+
overlay_context.line(line_center - direction * viewport_diagonal, line_center + direction * viewport_diagonal, Some(color));
695700
}
696701
}
697702
}
@@ -984,20 +989,21 @@ impl Fsm for SelectToolFsmState {
984989
tool_data.stop_duplicates(document, responses);
985990
}
986991

987-
tool_data.axis_align = input.keyboard.key(modifier_keys.axis_align) && !axis.is_constraint();
992+
tool_data.axis_align = input.keyboard.key(modifier_keys.axis_align);
988993

989994
// Ignore the non duplicated layers if the current layers have not spawned yet.
990995
let layers_exist = tool_data.layers_dragging.iter().all(|&layer| document.metadata().click_targets(layer).is_some());
991996
let ignore = tool_data.non_duplicated_layers.as_ref().filter(|_| !layers_exist).unwrap_or(&tool_data.layers_dragging);
992997

993998
let snap_data = SnapData::ignore(document, input, ignore);
994999
let (start, current) = (tool_data.drag_start, tool_data.drag_current);
995-
let mouse_delta = snap_drag(start, current, tool_data.axis_align, snap_data, &mut tool_data.snap_manager, &tool_data.snap_candidates);
9961000
let e0 = tool_data
9971001
.bounding_box_manager
9981002
.as_ref()
9991003
.map(|bounding_box_manager| bounding_box_manager.transform * Quad::from_box(bounding_box_manager.bounds))
10001004
.map_or(DVec2::X, |quad| (quad.top_left() - quad.top_right()).normalize_or(DVec2::X));
1005+
1006+
let mouse_delta = snap_drag(start, current, tool_data.axis_align, axis, snap_data, &mut tool_data.snap_manager, &tool_data.snap_candidates);
10011007
let mouse_delta = match axis {
10021008
Axis::X => mouse_delta.project_onto(e0),
10031009
Axis::Y => mouse_delta.project_onto(e0.perp()),

0 commit comments

Comments
 (0)