forked from 1b-agent/opencadstudio-upstream
feat(commands): expand standard CAD command coverage
Integrate a large batch of standard CAD commands and fix several name/behaviour mismatches, with no product references in code. 3D solids (reusing the truck B-rep pipeline): - SLICE, INTERFERE, PRESSPULL, POLYSOLID, PYRAMID, SECTION - 3DROTATE, 3DMIRROR, 3DALIGN (cached-solid transforms) Annotation / text: - ARCTEXT, SPLINEFIT (Catmull-Rom to Bezier), DIMJOGGED, OBJECTSCALE (XData markers honoured by the existing geometry-gen / tessellator) Blocks / misc: - NCOPY (block-content extraction via explode_entity) - OPTIONS, SYNCPVIEWPORTS, THICKEN, plus earlier toggles, aliases, system variables, and layer/style/view commands POINTCLOUD/RECAP and UNDERLAYLAYERS/UOSNAP are intentionally left out: they require a proprietary binary / PDF-layer parser, a GPU point renderer, and real test files. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
76ef544cda
commit
c19c18c2f2
24 files changed
+4405
-216
No files matched your search
@@ -0,0 +1,229 @@
|
||||
//! MINSERT command — place a block reference as a rectangular array.
|
||||
//!
|
||||
//! Modeled on the plain INSERT command but simpler: there is no attribute
|
||||
//! filling. The user picks a block name and an insertion point, then types the
|
||||
//! array parameters (rows, columns, row spacing, column spacing). The committed
|
||||
//! entity is a single [`Insert`] with its array fields set, which the renderer
|
||||
//! replicates over `row_count × column_count` using the row/column spacing.
|
||||
|
||||
use acadrust::entities::Insert;
|
||||
use acadrust::types::Vector3;
|
||||
use acadrust::EntityType;
|
||||
use glam::DVec3;
|
||||
|
||||
use crate::command::{CadCommand, CmdResult};
|
||||
use crate::modules::{IconKind, ModuleEvent, ToolDef};
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn tool() -> ToolDef {
|
||||
ToolDef {
|
||||
id: "MINSERT",
|
||||
label: "Array Insert",
|
||||
icon: IconKind::Svg(include_bytes!("../../../assets/icons/blocks/insert.svg")),
|
||||
event: ModuleEvent::Command("MINSERT".to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
/// Which step the command is currently collecting.
|
||||
enum Step {
|
||||
/// Pick / type the block name from the available list.
|
||||
Name,
|
||||
/// Specify the insertion point for `name`.
|
||||
Point { name: String },
|
||||
/// Type the numeric array parameters, one per `ParamIdx`.
|
||||
Params {
|
||||
name: String,
|
||||
point: Vector3,
|
||||
idx: ParamIdx,
|
||||
},
|
||||
}
|
||||
|
||||
/// The numeric array parameter currently being typed.
|
||||
#[derive(Clone, Copy)]
|
||||
enum ParamIdx {
|
||||
Rows,
|
||||
Columns,
|
||||
RowSpacing,
|
||||
ColumnSpacing,
|
||||
}
|
||||
|
||||
impl ParamIdx {
|
||||
fn next(self) -> Option<ParamIdx> {
|
||||
match self {
|
||||
ParamIdx::Rows => Some(ParamIdx::Columns),
|
||||
ParamIdx::Columns => Some(ParamIdx::RowSpacing),
|
||||
ParamIdx::RowSpacing => Some(ParamIdx::ColumnSpacing),
|
||||
ParamIdx::ColumnSpacing => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct MinsertCommand {
|
||||
available: Vec<String>,
|
||||
step: Step,
|
||||
/// Collected array parameters (defaults applied as the user Enters through).
|
||||
rows: u16,
|
||||
columns: u16,
|
||||
row_spacing: f64,
|
||||
column_spacing: f64,
|
||||
}
|
||||
|
||||
impl MinsertCommand {
|
||||
pub fn new(available: Vec<String>) -> Self {
|
||||
Self {
|
||||
available,
|
||||
step: Step::Name,
|
||||
rows: 1,
|
||||
columns: 1,
|
||||
row_spacing: 0.0,
|
||||
column_spacing: 0.0,
|
||||
}
|
||||
}
|
||||
|
||||
/// Build the array Insert from the collected parameters and finish.
|
||||
fn build(&self, name: &str, point: Vector3) -> CmdResult {
|
||||
let mut ins = Insert::new(name.to_string(), point);
|
||||
ins.row_count = self.rows.max(1);
|
||||
ins.column_count = self.columns.max(1);
|
||||
ins.row_spacing = self.row_spacing;
|
||||
ins.column_spacing = self.column_spacing;
|
||||
CmdResult::CommitAndExit(EntityType::Insert(ins))
|
||||
}
|
||||
|
||||
/// Advance from the parameter currently at `idx` to the next, or build the
|
||||
/// entity when the last parameter has been accepted.
|
||||
fn advance_param(&mut self, name: String, point: Vector3, idx: ParamIdx) -> CmdResult {
|
||||
match idx.next() {
|
||||
Some(next) => {
|
||||
self.step = Step::Params {
|
||||
name,
|
||||
point,
|
||||
idx: next,
|
||||
};
|
||||
CmdResult::NeedPoint
|
||||
}
|
||||
None => self.build(&name, point),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl CadCommand for MinsertCommand {
|
||||
fn name(&self) -> &'static str {
|
||||
"MINSERT"
|
||||
}
|
||||
|
||||
fn prompt(&self) -> String {
|
||||
match &self.step {
|
||||
Step::Name => {
|
||||
let hint = if self.available.is_empty() {
|
||||
String::new()
|
||||
} else {
|
||||
format!(" [{}]", self.available.join(", "))
|
||||
};
|
||||
format!("MINSERT Enter block name:{hint}")
|
||||
}
|
||||
Step::Point { name } => {
|
||||
format!("MINSERT Specify insertion point for \"{name}\":")
|
||||
}
|
||||
Step::Params { idx, .. } => match idx {
|
||||
ParamIdx::Rows => format!("MINSERT Enter number of rows <{}>:", self.rows),
|
||||
ParamIdx::Columns => {
|
||||
format!("MINSERT Enter number of columns <{}>:", self.columns)
|
||||
}
|
||||
ParamIdx::RowSpacing => {
|
||||
format!("MINSERT Enter row spacing <{}>:", self.row_spacing)
|
||||
}
|
||||
ParamIdx::ColumnSpacing => {
|
||||
format!("MINSERT Enter column spacing <{}>:", self.column_spacing)
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn on_point(&mut self, pt: DVec3) -> CmdResult {
|
||||
match &self.step {
|
||||
Step::Name => CmdResult::NeedPoint,
|
||||
Step::Point { name } => {
|
||||
let name = name.clone();
|
||||
let point = Vector3::new(pt.x, pt.y, pt.z);
|
||||
self.step = Step::Params {
|
||||
name,
|
||||
point,
|
||||
idx: ParamIdx::Rows,
|
||||
};
|
||||
CmdResult::NeedPoint
|
||||
}
|
||||
// Numeric-parameter steps ignore stray clicks and keep prompting.
|
||||
Step::Params { .. } => CmdResult::NeedPoint,
|
||||
}
|
||||
}
|
||||
|
||||
fn on_enter(&mut self) -> CmdResult {
|
||||
match &self.step {
|
||||
// Bare Enter at a parameter step accepts the current default and
|
||||
// advances (or commits after the last one).
|
||||
Step::Params { name, point, idx } => {
|
||||
let (name, point, idx) = (name.clone(), *point, *idx);
|
||||
self.advance_param(name, point, idx)
|
||||
}
|
||||
// Enter before a block / point is supplied cancels the command.
|
||||
Step::Name | Step::Point { .. } => CmdResult::Cancel,
|
||||
}
|
||||
}
|
||||
|
||||
fn wants_text_input(&self) -> bool {
|
||||
matches!(self.step, Step::Name | Step::Params { .. })
|
||||
}
|
||||
|
||||
fn on_text_input(&mut self, text: &str) -> Option<CmdResult> {
|
||||
match &self.step {
|
||||
Step::Name => {
|
||||
let typed = text.trim();
|
||||
let matched = self
|
||||
.available
|
||||
.iter()
|
||||
.find(|c| c.eq_ignore_ascii_case(typed))?;
|
||||
self.step = Step::Point {
|
||||
name: matched.clone(),
|
||||
};
|
||||
Some(CmdResult::NeedPoint)
|
||||
}
|
||||
Step::Point { .. } => None,
|
||||
Step::Params { name, point, idx } => {
|
||||
let (name, point, idx) = (name.clone(), *point, *idx);
|
||||
let typed = text.trim();
|
||||
// Empty input keeps the default; otherwise parse and store.
|
||||
if !typed.is_empty() {
|
||||
match idx {
|
||||
ParamIdx::Rows => {
|
||||
if let Ok(v) = typed.parse::<u16>() {
|
||||
self.rows = v.max(1);
|
||||
}
|
||||
}
|
||||
ParamIdx::Columns => {
|
||||
if let Ok(v) = typed.parse::<u16>() {
|
||||
self.columns = v.max(1);
|
||||
}
|
||||
}
|
||||
ParamIdx::RowSpacing => {
|
||||
if let Ok(v) = typed.parse::<f64>() {
|
||||
self.row_spacing = v;
|
||||
}
|
||||
}
|
||||
ParamIdx::ColumnSpacing => {
|
||||
if let Ok(v) = typed.parse::<f64>() {
|
||||
self.column_spacing = v;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Some(self.advance_param(name, point, idx))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── Autocomplete registry ─────────────────────────────────
|
||||
inventory::submit!(crate::command::CommandRegistration {
|
||||
names: &["MINSERT"]
|
||||
});
|
||||
@@ -11,6 +11,7 @@ mod design_center;
|
||||
mod edit_block;
|
||||
pub(crate) mod insert_block;
|
||||
mod landxml;
|
||||
pub mod minsert;
|
||||
mod mview_block;
|
||||
mod open_obj;
|
||||
mod pc_attach;
|
||||
|
||||
Reference in new issue
Block a user