Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Bezier edge-drawing #8379

Merged
merged 3 commits into from
Dec 11, 2024
+12 −17
Merged

Improve Bezier edge-drawing #8379

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a856d2
Improve Bezier edge-drawing
grtlr Dec 10, 2024
3b3726c
Fix lint
grtlr Dec 10, 2024
87503fe
Merge branch 'main' into grtlr/fix-graph-bezier
grtlr Dec 11, 2024
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
29 changes: 12 additions & 17 deletions crates/viewer/re_space_view_graph/src/layout/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,6 @@ impl ForceLayoutProvider {
// Multiple edges occupy the same space, so we fan them out.
let num_edges = edges.len();

// Controls the amount of space (in scene coordinates) that a slot can occupy.
let fan_amount = 20.0;

for (i, edge) in edges.iter().enumerate() {
let source_rect = layout.nodes[slot_source];
let target_rect = layout.nodes[slot_target];
Expand All @@ -230,24 +227,22 @@ impl ForceLayoutProvider {
let source_pos = source_rect.intersects_ray_from_center(d);
let target_pos = target_rect.intersects_ray_from_center(-d);

// How far along the edge should the control points be?
let c1_base = source_pos + (target_pos - source_pos) * 0.25;
let c2_base = source_pos + (target_pos - source_pos) * 0.75;
let delta = target_pos - source_pos;

let c1_base_n = Vec2::new(-c1_base.y, c1_base.x).normalized();
let mut c2_base_n = Vec2::new(-c2_base.y, c2_base.x).normalized();
// Controls the amount of space (in scene coordinates) that a slot can occupy.
let fan_amount = (delta.length() * 0.3).min(40.);

// How far along the edge should the control points be?
let c1_base = source_pos + delta * 0.25;
let c2_base = source_pos + delta * 0.75;

// Make sure both point to the same side of the edge.
if c1_base_n.dot(c2_base_n) < 0.0 {
// If they point in opposite directions, flip one of them.
c2_base_n = -c2_base_n;
}
let base_n = Vec2::new(-c1_base.y, c1_base.x).normalized();

let c1_left = c1_base + c1_base_n * (fan_amount / 2.);
let c2_left = c2_base + c2_base_n * (fan_amount / 2.);
let c1_left = c1_base + base_n * (fan_amount / 2.);
let c2_left = c2_base + base_n * (fan_amount / 2.);

let c1_right = c1_base - c1_base_n * (fan_amount / 2.);
let c2_right = c2_base - c2_base_n * (fan_amount / 2.);
let c1_right = c1_base - base_n * (fan_amount / 2.);
let c2_right = c2_base - base_n * (fan_amount / 2.);

// Calculate an offset for the control points based on index `i`, spreading points equidistantly.
let t = (i as f32) / (num_edges - 1) as f32;
Expand Down
Loading