forked from 1b-agent/opencadstudio-upstream
Create regions on the shared plane of selected open curves
This commit is contained in:
1 parent
9da2a36efa
commit
2486adbb67
1 file changed
+14
-9
@@ -1148,10 +1148,17 @@ impl OpenCADStudio {
|
|||||||
sources.push(*handle);
|
sources.push(*handle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Assemble remaining selected open edges on the active plane.
|
// Open inputs must share one geometric plane, independently of the UCS.
|
||||||
// Face discovery and exact curve reconstruction reuse the
|
let open_curves: Vec<_> = self.tabs[i].scene.selected_entities().iter()
|
||||||
// same kernel-backed boundary path used by area selection.
|
.filter(|(handle, _)| !sources.contains(handle))
|
||||||
let working_plane = self.tabs[i].ucs_xform().working_plane();
|
.filter_map(|(_, entity)| crate::entities::curve::entity_curve(entity))
|
||||||
|
.collect();
|
||||||
|
if let Some(plane) = cadkernel::space::common_curve_plane(&open_curves, 1.0e-6) {
|
||||||
|
let working_plane = crate::command::WorkingPlane::new(
|
||||||
|
glam::DVec3::from_array(plane.origin),
|
||||||
|
glam::DVec3::from_array(plane.x_axis),
|
||||||
|
glam::DVec3::from_array(plane.y_axis),
|
||||||
|
);
|
||||||
let selected_handles: rustc_hash::FxHashSet<_> = self.tabs[i].scene
|
let selected_handles: rustc_hash::FxHashSet<_> = self.tabs[i].scene
|
||||||
.selected_entities().iter().map(|(handle, _)| *handle).collect();
|
.selected_entities().iter().map(|(handle, _)| *handle).collect();
|
||||||
let mut boundary_sources = self.tabs[i].scene
|
let mut boundary_sources = self.tabs[i].scene
|
||||||
@@ -1159,11 +1166,6 @@ impl OpenCADStudio {
|
|||||||
boundary_sources.retain(|handle, _| {
|
boundary_sources.retain(|handle, _| {
|
||||||
selected_handles.contains(handle) && !sources.contains(handle)
|
selected_handles.contains(handle) && !sources.contains(handle)
|
||||||
});
|
});
|
||||||
let plane = cadkernel::space::Plane::from_axes(
|
|
||||||
working_plane.origin.to_array(),
|
|
||||||
working_plane.x.to_array(),
|
|
||||||
working_plane.y.to_array(),
|
|
||||||
);
|
|
||||||
for ring in crate::scene::boundary_faces(&boundary_sources, 1.0e-6) {
|
for ring in crate::scene::boundary_faces(&boundary_sources, 1.0e-6) {
|
||||||
let paths = crate::scene::exact_hatch_paths(
|
let paths = crate::scene::exact_hatch_paths(
|
||||||
std::slice::from_ref(&ring), &[true], &boundary_sources, 1.0e-6,
|
std::slice::from_ref(&ring), &[true], &boundary_sources, 1.0e-6,
|
||||||
@@ -1182,6 +1184,9 @@ impl OpenCADStudio {
|
|||||||
regions.push((region, body));
|
regions.push((region, body));
|
||||||
sources.extend(crate::scene::ring_source_handles(&ring, &boundary_sources));
|
sources.extend(crate::scene::ring_source_handles(&ring, &boundary_sources));
|
||||||
}
|
}
|
||||||
|
} else if !open_curves.is_empty() {
|
||||||
|
self.command_line.push_error("REGION: open objects must form coplanar, noncollinear boundaries.");
|
||||||
|
}
|
||||||
if regions.is_empty() {
|
if regions.is_empty() {
|
||||||
self.command_line
|
self.command_line
|
||||||
.push_error(crate::t!("REGION: select closed polylines or circles.").as_ref());
|
.push_error(crate::t!("REGION: select closed polylines or circles.").as_ref());
|
||||||
|
|||||||
Reference in new issue
Block a user