forked from 1b-agent/opencadstudio-upstream
Hakan SevenandClaude Opus 4.8
7bf9ce31ae
Rename the Home tab to "Draw" and add a Model tab beside it with two groups: - Model: BOX / CYLINDER / CONE / SPHERE / WEDGE / TORUS, placed with a footprint + height. Each is built as a real ACIS Solid3D (acadrust primitive builders) plus a truck B-rep, tessellated into the shaded mesh pipeline, with edge wires for picking + wireframe. - Design: UNION / SUBTRACT / INTERSECT via truck-shapeops. A session-only Scene.model_solids cache holds each solid's truck B-rep so the boolean tools can combine and chain them. Supersedes the old command-line BOX/SPHERE/CYLINDER (insert::solid3d_cmds keeps EXTRUDE/ REVOLVE/SWEEP/LOFT). Known limitations: booleans need solids created this session; curved ACIS primitives render in-session but not after reload (the SAT tessellator handles only planar caps); geometry assumes world_offset 0. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
76 lines
3.0 KiB
Rust
76 lines
3.0 KiB
Rust
// 3D solid modelling support on the App: committing Model-tab primitives,
|
|
// and the Design-group boolean operations (truck-shapeops) over the scene's
|
|
// session-cached truck B-reps.
|
|
|
|
use acadrust::entities::Solid3D;
|
|
use acadrust::{EntityType, Handle};
|
|
use iced::Task;
|
|
use truck_modeling::Solid;
|
|
|
|
use super::Message;
|
|
use crate::modules::model::boolean_cmd::BoolOp;
|
|
use crate::scene::model_solid::{self, Bool};
|
|
|
|
impl super::OpenCADStudio {
|
|
/// Commit a Model-tab solid: add its acadrust entity to the document, then
|
|
/// register the truck B-rep (caches it for booleans + tessellates it into
|
|
/// the shaded mesh pipeline). Returns the new entity handle.
|
|
pub(super) fn add_model_solid(&mut self, entity: EntityType, solid: Solid) -> Handle {
|
|
let i = self.active_tab;
|
|
let Some(handle) = self.commit_entity_handle(entity) else {
|
|
return Handle::NULL;
|
|
};
|
|
self.tabs[i].scene.register_model_solid(handle, solid);
|
|
handle
|
|
}
|
|
|
|
/// Run a boolean (`union` / `subtract` / `intersect`) on exactly two
|
|
/// selected solids whose truck B-reps are in the session cache.
|
|
pub(super) fn solid_boolean(&mut self, op: BoolOp) -> Task<Message> {
|
|
let i = self.active_tab;
|
|
// Selected entities that have a cached truck B-rep.
|
|
let handles: Vec<Handle> = self.tabs[i]
|
|
.scene
|
|
.selected
|
|
.iter()
|
|
.copied()
|
|
.filter(|h| self.tabs[i].scene.model_solids.contains_key(h))
|
|
.collect();
|
|
if handles.len() != 2 {
|
|
self.command_line.push_error(
|
|
"Boolean: select exactly two solids created this session.",
|
|
);
|
|
return Task::none();
|
|
}
|
|
let a = self.tabs[i].scene.model_solids[&handles[0]].clone();
|
|
let b = self.tabs[i].scene.model_solids[&handles[1]].clone();
|
|
let kind = match op {
|
|
BoolOp::Union => Bool::Union,
|
|
BoolOp::Subtract => Bool::Subtract,
|
|
BoolOp::Intersect => Bool::Intersect,
|
|
};
|
|
let Some(result) = model_solid::boolean(kind, &a, &b) else {
|
|
self.command_line
|
|
.push_error("Boolean failed — the solids may not overlap.");
|
|
return Task::none();
|
|
};
|
|
|
|
self.push_undo_snapshot(i, "BOOLEAN");
|
|
// Remove the two operands (entity + mesh + cached B-rep).
|
|
self.tabs[i].scene.erase_entities(&handles);
|
|
// The result is freshly combined geometry with no ACIS parametrisation,
|
|
// so it lives as a Solid3D whose render/boolean data is the injected
|
|
// truck mesh + cached B-rep; its edge wires make it pickable.
|
|
let mut s3d = Solid3D::new();
|
|
s3d.wires = model_solid::edge_wires(&result);
|
|
let handle = self.add_model_solid(EntityType::Solid3D(s3d), result);
|
|
self.tabs[i].scene.deselect_all();
|
|
if !handle.is_null() {
|
|
self.tabs[i].scene.select_entity(handle, false);
|
|
}
|
|
self.tabs[i].dirty = true;
|
|
self.refresh_properties();
|
|
Task::none()
|
|
}
|
|
}
|