Skip to content

Commit 203e252

Browse files
committed
Refine Router selection, orbit focus, and inspector pane merging
1 parent 8955d0d commit 203e252

8 files changed

Lines changed: 305 additions & 88 deletions

File tree

‎assets/i18n/en.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,7 @@
866866
"grain_direction.show": "Show Grain Direction",
867867
"frame_rate.fps": "— FPS",
868868
"frame_rate.fps_2": "{fps:.0} FPS",
869+
"inspector_docking.divider_gestures": "Drag to resize areas. Double-click to merge them.",
869870
"inspector_docking.drop_within_15px_inside_an_area_s_edge": "Drop within 15px inside an area's edge to split; cross a section's vertical midpoint to reorder, or drop in another area's center to join",
870871
"inspector_docking.export_time_and_cost_estimates_as_pdf": "Export time and cost estimates as PDF",
871872
"inspector_docking.generate_pdf": "Generate PDF",

‎crates/benchup-app/src/app.rs‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,11 @@ pub struct BenchUpApp {
419419
gesture: Option<Gesture>,
420420
section_drag: Option<section_gizmo::SectionDrag>,
421421
orbit_origin: sidebar::OrbitOrigin,
422+
setting_orbit_focus: bool,
422423
drawing_orbit_down: bool,
423424
drawing_orbit_pivot: Option<DVec3>,
424425
viewport_pointer: Option<Pos2>,
425426
viewport: Rect,
426-
setting_orbit_focus: bool,
427427
viewports: viewports::Workspace,
428428
inspector: bool,
429429
inspector_width: f32,
@@ -612,12 +612,12 @@ impl BenchUpApp {
612612
gesture: None,
613613
section_drag: None,
614614
orbit_origin: Default::default(),
615+
setting_orbit_focus: false,
615616
drawing_orbit_down: false,
616617
drawing_orbit_pivot: None,
617618
viewport_pointer: None,
618619
viewport: Rect::NOTHING,
619620
viewports: viewports::Workspace::default(),
620-
setting_orbit_focus: false,
621621
inspector: true,
622622
inspector_width: 300.,
623623
inspector_preferences: sidebar::InspectorPreferences::default(),
@@ -4448,6 +4448,11 @@ impl BenchUpApp {
44484448
}
44494449

44504450
fn update_pointer(&mut self, pos: Pos2) {
4451+
if self.tool == Tool::Orbit && self.setting_orbit_focus && !self.navigating() {
4452+
self.hover = self.pick_at(dv(pos - self.viewport.min), dv(self.viewport.size()), true);
4453+
self.flip_hover = None;
4454+
return;
4455+
}
44514456
// Navigation and selection rectangles do not need hover queries.
44524457
// Keep their feedback responsive on large imported models.
44534458
let selecting_box = self.gesture.as_ref().is_some_and(|gesture| {
@@ -4569,11 +4574,6 @@ impl BenchUpApp {
45694574
if self.drawing.is_some() && self.paste_preview.is_none() {
45704575
if self.lock.is_none()
45714576
&& let Some(drawing) = &mut self.drawing
4572-
if self.tool == Tool::Orbit && self.setting_orbit_focus && !self.navigating() {
4573-
self.hover = self.pick_at(dv(pos - self.viewport.min), dv(self.viewport.size()), true);
4574-
self.flip_hover = None;
4575-
return;
4576-
}
45774577
{
45784578
// Inferred planes belong to the current snap only. Start
45794579
// each query on the original plane so leaving a target
@@ -4626,6 +4626,7 @@ impl BenchUpApp {
46264626
}
46274627
fn orbit_center(&mut self) -> DVec3 {
46284628
match self.orbit_origin {
4629+
sidebar::OrbitOrigin::Focused => return self.doc.orbit_focus.unwrap_or(self.doc.camera.target),
46294630
sidebar::OrbitOrigin::World => return DVec3::ZERO,
46304631
sidebar::OrbitOrigin::View => return self.doc.camera.target,
46314632
sidebar::OrbitOrigin::Selection => {
@@ -4747,7 +4748,6 @@ impl BenchUpApp {
47474748
return;
47484749
};
47494750
if !matches!(
4750-
sidebar::OrbitOrigin::Focused => return self.doc.orbit_focus.unwrap_or(self.doc.camera.target),
47514751
gesture.button,
47524752
egui::PointerButton::Primary | egui::PointerButton::Middle
47534753
) {
@@ -4934,6 +4934,22 @@ impl BenchUpApp {
49344934
}
49354935
continue;
49364936
}
4937+
if self.tool == Tool::Orbit && self.setting_orbit_focus {
4938+
if button == egui::PointerButton::Primary {
4939+
self.prepare_picking();
4940+
if let Some(snap) = self.infer_snap(pos, None, None, false) {
4941+
self.doc.orbit_focus = Some(snap.point);
4942+
self.orbit_origin = sidebar::OrbitOrigin::Focused;
4943+
self.setting_orbit_focus = false;
4944+
self.camera_changed(ctx);
4945+
}
4946+
continue;
4947+
}
4948+
if button == egui::PointerButton::Secondary {
4949+
self.setting_orbit_focus = false;
4950+
continue;
4951+
}
4952+
}
49374953
self.update_drawing_orbit(modifiers);
49384954
if button == egui::PointerButton::Secondary {
49394955
self.solid_first = None;
@@ -5055,22 +5071,6 @@ impl BenchUpApp {
50555071
self.viewport_pointer = in_viewport.then_some(pos);
50565072
if let Some(mut gesture) = self.gesture.take() {
50575073
self.update_compass_orbit(ctx, &mut gesture, pos);
5058-
if self.tool == Tool::Orbit && self.setting_orbit_focus {
5059-
if button == egui::PointerButton::Primary {
5060-
self.prepare_picking();
5061-
if let Some(snap) = self.infer_snap(pos, None, None, false) {
5062-
self.doc.orbit_focus = Some(snap.point);
5063-
self.orbit_origin = sidebar::OrbitOrigin::Focused;
5064-
self.setting_orbit_focus = false;
5065-
self.camera_changed(ctx);
5066-
}
5067-
continue;
5068-
}
5069-
if button == egui::PointerButton::Secondary {
5070-
self.setting_orbit_focus = false;
5071-
continue;
5072-
}
5073-
}
50745074
match &mut gesture.kind {
50755075
GestureKind::Navigate { pivot } => {
50765076
self.navigate(ctx, dv(pos - gesture.last), pivot);
@@ -5343,6 +5343,19 @@ impl BenchUpApp {
53435343
{
53445344
return;
53455345
}
5346+
if self.tool == Tool::Orbit && self.setting_orbit_focus && !self.navigating() {
5347+
#[cfg(target_arch = "wasm32")]
5348+
if crate::tool_cursor::show_focus(ctx) {
5349+
ctx.set_cursor_icon(egui::CursorIcon::None);
5350+
return;
5351+
}
5352+
let painter = ctx.layer_painter(egui::LayerId::new(
5353+
egui::Order::Tooltip, egui::Id::unique("viewport_tool_cursor"),
5354+
));
5355+
ctx.set_cursor_icon(egui::CursorIcon::None);
5356+
icons::origin_target(&painter, pos, if ctx.global_style().visuals.dark_mode { Color32::WHITE } else { Color32::BLACK });
5357+
return;
5358+
}
53465359
let tool = if self.navigating() {
53475360
Tool::Orbit
53485361
} else {
@@ -5464,19 +5477,6 @@ impl BenchUpApp {
54645477
pair[0],
54655478
pair[1],
54665479
2.2,
5467-
if self.tool == Tool::Orbit && self.setting_orbit_focus && !self.navigating() {
5468-
#[cfg(target_arch = "wasm32")]
5469-
if crate::tool_cursor::show_focus(ctx) {
5470-
ctx.set_cursor_icon(egui::CursorIcon::None);
5471-
return;
5472-
}
5473-
let painter = ctx.layer_painter(egui::LayerId::new(
5474-
egui::Order::Tooltip, egui::Id::unique("viewport_tool_cursor"),
5475-
));
5476-
ctx.set_cursor_icon(egui::CursorIcon::None);
5477-
icons::origin_target(&painter, pos, if ctx.global_style().visuals.dark_mode { Color32::WHITE } else { Color32::BLACK });
5478-
return;
5479-
}
54805480
self.lock
54815481
.map(|axis| self.axis_color(axis))
54825482
.unwrap_or(ACCENT),

‎crates/benchup-app/src/app_tests.rs‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7000,6 +7000,10 @@ fn router_rail_tool_routes_clicked_edges_and_reopens_existing_cuts() {
70007000
assert_eq!(h.app.doc.history.position(), initial);
70017001
h.click(pos);
70027002
assert!(h.app.doc.model.routes.is_empty());
7003+
assert_eq!(h.app.doc.model.edit_context, board);
7004+
assert_eq!(h.app.selected, BTreeSet::from([edges[0]]));
7005+
assert_eq!(h.app.tool, Tool::Select);
7006+
assert_eq!(h.app.doc.history.position(), initial);
70037007
let output = h.frame(vec![], egui::Modifiers::NONE);
70047008
h.click(text_position(
70057009
&output,
@@ -7202,7 +7206,6 @@ fn view_menu_toggles_selected_edge_lengths_without_model_edits() {
72027206
assert!(h.app.doc.history.is_empty());
72037207
}
72047208

7205-
72067209
#[test]
72077210
fn selected_edge_lengths_appear_in_the_viewport() {
72087211
let mut h = Harness::new();
@@ -7231,7 +7234,6 @@ fn selected_edge_lengths_appear_in_the_viewport() {
72317234
)));
72327235
}
72337236

7234-
72357237
#[test]
72367238
fn selected_edge_length_labels_hide_behind_faces() {
72377239
fn contains_length(shape: &egui::Shape) -> bool {
@@ -7275,6 +7277,18 @@ fn orbit_origin_choices_use_current_project_and_selection() {
72757277
assert_eq!(h.app.orbit_center(), DVec3::ZERO);
72767278
h.app.orbit_origin = sidebar::OrbitOrigin::View;
72777279
assert_eq!(h.app.orbit_center(), h.app.doc.camera.target);
7280+
h.app.orbit_origin = sidebar::OrbitOrigin::Focused;
7281+
assert_eq!(h.app.orbit_center(), h.app.doc.camera.target);
7282+
h.app.doc.orbit_focus = Some(DVec3::new(4., 5., 6.));
7283+
assert_eq!(h.app.orbit_center(), DVec3::new(4., 5., 6.));
7284+
let saved = serde_json::to_string(&h.app.doc).unwrap();
7285+
let restored: Document = serde_json::from_str(&saved).unwrap();
7286+
assert_eq!(restored.orbit_focus, h.app.doc.orbit_focus);
7287+
let mut legacy = serde_json::to_value(&h.app.doc).unwrap();
7288+
legacy.as_object_mut().unwrap().remove("orbit_focus");
7289+
let restored: Document = serde_json::from_value(legacy).unwrap();
7290+
assert_eq!(restored.orbit_focus, None);
7291+
assert_eq!(Document::default().orbit_focus, None);
72787292
h.app.orbit_origin = sidebar::OrbitOrigin::Selection;
72797293
assert_eq!(h.app.orbit_center(), DVec3::X * 7.);
72807294
h.app.selected.insert(edge);
@@ -7317,18 +7331,6 @@ fn precision_routed_edge_selection_shows_only_original_endpoints() {
73177331
let mut points = Vec::new();
73187332
for shape in &output.shapes { handles(&shape.shape, &mut points); }
73197333
assert_eq!(points.len(), 2);
7320-
h.app.orbit_origin = sidebar::OrbitOrigin::Focused;
7321-
assert_eq!(h.app.orbit_center(), h.app.doc.camera.target);
7322-
h.app.doc.orbit_focus = Some(DVec3::new(4., 5., 6.));
7323-
assert_eq!(h.app.orbit_center(), DVec3::new(4., 5., 6.));
7324-
let saved = serde_json::to_string(&h.app.doc).unwrap();
7325-
let restored: Document = serde_json::from_str(&saved).unwrap();
7326-
assert_eq!(restored.orbit_focus, h.app.doc.orbit_focus);
7327-
let mut legacy = serde_json::to_value(&h.app.doc).unwrap();
7328-
legacy.as_object_mut().unwrap().remove("orbit_focus");
7329-
let restored: Document = serde_json::from_value(legacy).unwrap();
7330-
assert_eq!(restored.orbit_focus, None);
7331-
assert_eq!(Document::default().orbit_focus, None);
73327334
for (actual, source) in points.into_iter().zip([a, b]) {
73337335
let expected = pv(h.app.doc.camera.project(source, dv(rect.size())).unwrap());
73347336
assert!(actual.distance(expected) < 0.01);

0 commit comments

Comments
 (0)