Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

Pre-highlight whole bodies for body selection inputs (#5572) (#5575)

fkirill8e80d986107f
diff --git a/crates/ui-egui/src/viewport.rs b/crates/ui-egui/src/viewport.rs
index 4c3d3a70c2..99373db15d 100644
--- a/crates/ui-egui/src/viewport.rs
+++ b/crates/ui-egui/src/viewport.rs
@@ -3357,6 +3357,19 @@ fn hover_drawn(hover: &Option<Hit>) -> String {
}
}
+/// The body the current hover actually selects, after the active dialog's filter.
+fn hovered_body(app: &SolveApp) -> Option<String> {
+ if app.tool.is_some() {
+ return None;
+ }
+ let hit = app.viewport.hover.as_ref()?;
+ let (_, selected) = candidate(app, std::slice::from_ref(hit))?;
+ match selected {
+ Sel::Body { name } => Some(name),
+ _ => None,
+ }
+}
+
fn highlight_geometry_key(app: &SolveApp) -> u64 {
let mut h = std::collections::hash_map::DefaultHasher::new();
let selected = app.highlighted();
@@ -3364,6 +3377,7 @@ fn highlight_geometry_key(app: &SolveApp) -> u64 {
(std::sync::Arc::as_ptr(&crate::open_meshing::shown_world(app)) as usize).hash(&mut h);
serde_json::to_string(&selected).unwrap_or_default().hash(&mut h);
hover_drawn(&app.viewport.hover).hash(&mut h);
+ hovered_body(app).hash(&mut h);
app.viewport.hover_feature.hash(&mut h);
app.viewport.hover_bodies.hash(&mut h);
app.viewport.hover_plane.hash(&mut h);
@@ -3889,6 +3903,8 @@ pub(crate) fn build_highlight(app: &SolveApp) -> GpuScene {
let mut hovered = app.viewport.hover_feature.map(|id| feature_geometry(app, id)).unwrap_or_default();
hovered.extend(app.viewport.hover_bodies.iter().map(|name| Sel::Body { name: name.clone() }));
hovered.extend(component_hover.into_iter().flatten());
+ let body_hover = hovered_body(app);
+ hovered.extend(body_hover.iter().map(|name| Sel::Body { name: name.clone() }));
// By name, once: a whole assembly holds thousands of bodies, and scanning the list for
// each of them is quadratic (as is a body lookup by name in the world).
let hovered_whole: std::collections::HashSet<&str> =
@@ -3944,22 +3960,10 @@ pub(crate) fn build_highlight(app: &SolveApp) -> GpuScene {
}
// Hover (pre-highlight).
match hover {
- // Body selection: the whole body lights up.
- Some(Hit::Face { body, .. }) if app.ui.pick_bodies && app.dialog.is_none() && app.tool.is_none() => {
- if let Some(b) = st.body(body) {
- let k = t.hover_face_lift;
- let c = body_color(&s.doc, b).unwrap_or(t.body);
- let hover_col = [c.r().saturating_add(k), c.g().saturating_add(k), c.b().saturating_add(k), 255];
- let lit = WholeBody { selected: false, colour: hover_col };
- if !light_whole_body(app, b, &active_bodies, lit, &body_slots, &mut feedback, &mut hover_instances) {
- let m = shown(b);
- let count = b.body.face_count();
- mesh_tris(&mut feedback, &m, hover_col, true, |f| (f as usize) < count);
- }
- }
- }
Some(Hit::Face { body, index, .. })
- if !replaced(body) && !sel.iter().any(|x| matches!(x, Sel::Face { body: b, index: i, .. } if b == body && i == index)) =>
+ if body_hover.as_ref() != Some(body)
+ && !replaced(body)
+ && !sel.iter().any(|x| matches!(x, Sel::Face { body: b, index: i, .. } if b == body && i == index)) =>
{
if let Some(b) = st.body(body) {
let k = t.hover_face_lift;
@@ -9371,6 +9375,31 @@ mod tests {
app.session.world_state().body(name).cloned().unwrap()
}
+ #[test]
+ fn body_input_hover_lights_the_whole_body_and_refreshes_for_face_inputs() {
+ let mut app = cylinder_app();
+ app.set_origin_shown(false);
+ let body = app.session.world_state().bodies[0].clone();
+ let hit = Hit::Face { body: body.name.clone(), index: 0, point: Vec3::ZERO };
+ app.start("file.save_mesh");
+ app.viewport.hover = Some(hit.clone());
+ let expected = shown_mesh(&app, &body, &None).triangles.len() * 3 * crate::gpu::TRI_SIZE;
+ assert_eq!(hovered_body(&app), Some(body.name.clone()));
+ assert_eq!(build_highlight(&app).merged().tris.len(), expected);
+ let body_key = highlight_key(&app);
+ for accept in [crate::selection::FACES, crate::selection::FACES | crate::selection::BODIES] {
+ app.dialog.as_mut().unwrap().inputs[0].accept = accept;
+ assert_eq!(hovered_body(&app), None, "face inputs must keep face feedback");
+ assert_ne!(highlight_key(&app), body_key, "a changed input must invalidate cached body feedback");
+ assert!(build_highlight(&app).merged().tris.len() < expected);
+ }
+ app.dialog.as_mut().unwrap().inputs[0].accept = crate::selection::BODIES;
+ let (_, sel) = candidate(&app, std::slice::from_ref(&hit)).unwrap();
+ dialog_pick(&mut app, &hit, sel);
+ assert!(app.highlighted().contains(&Sel::Body { name: body.name.clone() }));
+ assert_eq!(build_highlight(&app).merged().tris.len(), expected, "hover must not duplicate the selected body's faces");
+ }
+
#[test]
fn smooth_wall_display_preserves_wireframe_and_edge_selection() {
let mut s = solidcraft_engine::Session::default();