1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

fix: preserve web builds and leader selection order

Browse Source
This commit is contained in:
Hakan Seven committed 2026-09-09 13:10:21 +03:00
1 parent 6d5763bb70
commit cba2680be0
5 files changed
+38 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/scene/pick/interaction_index.rs
+23 -23
View File
@@ -914,17 +914,17 @@ impl InteractionIndex {
let (
((segment_entries, snap_point_entries), (key_vertex_entries, key_segment_entries)),
((fill_triangle_entries, pick_triangle_entries), glyph_entries),
) = rayon::join(
) = crate::par::join(
|| {
rayon::join(
crate::par::join(
|| {
rayon::join(
crate::par::join(
|| flatten_entry_parts(segment_parts),
|| flatten_entry_parts(snap_point_parts),
)
},
|| {
rayon::join(
crate::par::join(
|| flatten_entry_parts(key_vertex_parts),
|| flatten_entry_parts(key_segment_parts),
)
@@ -932,7 +932,7 @@ impl InteractionIndex {
)
},
|| {
let (fill, pick) = rayon::join(
let (fill, pick) = crate::par::join(
|| flatten_entry_parts(fill_triangle_parts),
|| flatten_entry_parts(pick_triangle_parts),
);
@@ -966,17 +966,17 @@ impl InteractionIndex {
let (
((wires, segments), (snap_points, key_vertices)),
((key_segments, fill_triangles), (pick_triangles, glyphs)),
) = rayon::join(
) = crate::par::join(
|| {
rayon::join(
crate::par::join(
|| {
rayon::join(
crate::par::join(
|| SpatialSet::build(wire_entries),
|| SpatialSet::build(segment_entries),
)
},
|| {
rayon::join(
crate::par::join(
|| SpatialSet::build(snap_point_entries),
|| SpatialSet::build(key_vertex_entries),
)
@@ -984,15 +984,15 @@ impl InteractionIndex {
)
},
|| {
rayon::join(
crate::par::join(
|| {
rayon::join(
crate::par::join(
|| SpatialSet::build(key_segment_entries),
|| SpatialSet::build(fill_triangle_entries),
)
},
|| {
rayon::join(
crate::par::join(
|| SpatialSet::build(pick_triangle_entries),
|| SpatialSet::build(glyph_entries),
)
@@ -1054,12 +1054,12 @@ impl InteractionIndex {
/// thread. Perspective/orbit hover must never pay this one-time cost.
pub fn prepare_screen(&self) {
#[cfg(not(target_arch = "wasm32"))]
rayon::join(
crate::par::join(
|| {
rayon::join(
|| rayon::join(|| self.wires.prepare_screen(), || self.segments.prepare_screen()),
crate::par::join(
|| crate::par::join(|| self.wires.prepare_screen(), || self.segments.prepare_screen()),
|| {
rayon::join(
crate::par::join(
|| self.snap_points.prepare_screen(),
|| self.key_vertices.prepare_screen(),
)
@@ -1067,15 +1067,15 @@ impl InteractionIndex {
)
},
|| {
rayon::join(
crate::par::join(
|| {
rayon::join(
crate::par::join(
|| self.key_segments.prepare_screen(),
|| self.fill_triangles.prepare_screen(),
)
},
|| {
rayon::join(
crate::par::join(
|| self.pick_triangles.prepare_screen(),
|| self.glyphs.prepare_screen(),
)
@@ -1426,9 +1426,9 @@ impl InteractionIndex {
// sum. Each closure still calls the same query, so the results are
// identical to the sequential ones, order included.
let ((wire_indices, segments), ((fill_triangles, pick_triangles), glyphs)) =
rayon::join(
crate::par::join(
|| {
rayon::join(
crate::par::join(
|| {
let mut indices = self.wires.query_xy_unordered(aabb);
indices.extend_from_slice(&self.unbounded_wires);
@@ -1440,9 +1440,9 @@ impl InteractionIndex {
)
},
|| {
rayon::join(
crate::par::join(
|| {
rayon::join(
crate::par::join(
|| self.fill_triangles.query_xy_unordered(aabb),
|| self.pick_triangles.query_xy_unordered(aabb),
)
src/scene/selection.rs
+3 -17
View File
@@ -47,6 +47,7 @@ impl Scene {
let leaders = self.leaders_by_annotation();
let mut expanded = Vec::with_capacity(handles.len());
for &handle in handles {
let start = expanded.len();
expanded.push(handle);
if let Some(EntityType::Leader(leader)) = self.document.get_entity(handle) {
if !leader.annotation_handle.is_null() {
@@ -56,6 +57,7 @@ impl Scene {
if let Some(pointing) = leaders.1.get(&handle) {
expanded.extend(pointing.iter().copied());
}
expanded[start..].sort_unstable_by_key(Handle::value);
}
expanded
}
@@ -106,23 +108,7 @@ impl Scene {
&self,
handles: &[Handle],
) -> Vec<Handle> {
let mut expanded = handles.to_vec();
let leaders = self.leaders_by_annotation();
for &handle in handles {
// LEADER -> annotation.
if let Some(EntityType::Leader(leader)) = self.document.get_entity(handle) {
if !leader.annotation_handle.is_null() {
expanded.push(leader.annotation_handle);
}
}
// Annotation -> LEADER.
if let Some(pointing) = leaders.1.get(&handle) {
expanded.extend(pointing.iter().copied());
}
}
let mut expanded = self.expanded_with_leaders(handles);
expanded.sort_unstable_by_key(|handle| handle.value());
expanded.dedup();
expanded