73b05e1dec
Change CadModule::ribbon_groups() from -> Vec<RibbonGroup> to -> &[RibbonGroup], backed by a per-module OnceLock cache. The ribbon group tree is static data (&'static str, Copy enums) that was being fully reconstructed — Vecs, String clones, enum discriminants — on every call, including all three per-frame call sites (view(), dropdown_overlay(), style_combo_overlay()). - 7 built-in modules + 2 plugin templates cache via function-local OnceLock. Safe because each is a unit struct with exactly one instance per process (plugins run in isolated child processes; see PluginProcess::spawn()). - SharedCadModule avoids the static pattern entirely, storing groups in an instance field (owned.rs). - IPC runner converts &RibbonGroup -> OwnedRibbonGroup directly via new From<&T> impls, avoiding an intermediate clone. - render_small/render_large and the two make_tool_row closures now borrow (&RibbonItem, &[ToolDef]) instead of taking ownership, so the view loop doesn't need to clone items to satisfy the old by-value signatures. - Various match-ergonomics deref fixes (*id, *default, *icon, etc.) from the &RibbonItem pattern change.
76 lines
3.1 KiB
Rust
76 lines
3.1 KiB
Rust
// Model module — 3D solid modelling.
|
|
//
|
|
// Model group : create primitive solids (box, cylinder, cone, sphere, …)
|
|
// as ACIS Solid3D entities via acadrust's primitive builders.
|
|
// Design group : combine solids with truck boolean operations
|
|
// (union / subtract / intersect).
|
|
|
|
pub mod boolean_cmd;
|
|
pub mod primitive_cmd;
|
|
|
|
use crate::modules::{CadModule, IconKind, ModuleEvent, RibbonGroup, RibbonItem, ToolDef};
|
|
|
|
pub struct ModelModule;
|
|
|
|
const BOX_ICON: &[u8] = include_bytes!("../../../assets/icons/box3d.svg");
|
|
const CYLINDER_ICON: &[u8] = include_bytes!("../../../assets/icons/cylinder3d.svg");
|
|
const CONE_ICON: &[u8] = include_bytes!("../../../assets/icons/cone3d.svg");
|
|
const SPHERE_ICON: &[u8] = include_bytes!("../../../assets/icons/sphere3d.svg");
|
|
const WEDGE_ICON: &[u8] = include_bytes!("../../../assets/icons/wedge3d.svg");
|
|
const TORUS_ICON: &[u8] = include_bytes!("../../../assets/icons/torus3d.svg");
|
|
const UNION_ICON: &[u8] = include_bytes!("../../../assets/icons/union.svg");
|
|
const SUBTRACT_ICON: &[u8] = include_bytes!("../../../assets/icons/subtract.svg");
|
|
const INTERSECT_ICON: &[u8] = include_bytes!("../../../assets/icons/intersect.svg");
|
|
|
|
/// Helper to declare a ribbon tool that fires a named command.
|
|
fn tool(id: &'static str, label: &'static str, icon: &'static [u8]) -> ToolDef {
|
|
ToolDef {
|
|
id,
|
|
label,
|
|
icon: IconKind::Svg(icon),
|
|
event: ModuleEvent::Command(id.to_string()),
|
|
}
|
|
}
|
|
|
|
impl CadModule for ModelModule {
|
|
fn id(&self) -> &'static str {
|
|
"model"
|
|
}
|
|
fn title(&self) -> &'static str {
|
|
"Model"
|
|
}
|
|
|
|
fn ribbon_groups(&self) -> &[RibbonGroup] {
|
|
static GROUPS: std::sync::OnceLock<Vec<RibbonGroup>> = std::sync::OnceLock::new();
|
|
GROUPS.get_or_init(|| {
|
|
vec![
|
|
RibbonGroup {
|
|
title: "Model",
|
|
tools: vec![
|
|
RibbonItem::LargeTool(tool("BOX", "Box", BOX_ICON)),
|
|
RibbonItem::LargeTool(tool("CYLINDER", "Cylinder", CYLINDER_ICON)),
|
|
RibbonItem::LargeTool(tool("CONE", "Cone", CONE_ICON)),
|
|
RibbonItem::LargeTool(tool("SPHERE", "Sphere", SPHERE_ICON)),
|
|
RibbonItem::Dropdown {
|
|
id: "MODEL_MORE",
|
|
icon: IconKind::Svg(WEDGE_ICON),
|
|
items: vec![
|
|
("WEDGE", "Wedge", IconKind::Svg(WEDGE_ICON)),
|
|
("TORUS", "Torus", IconKind::Svg(TORUS_ICON)),
|
|
],
|
|
default: "WEDGE",
|
|
},
|
|
],
|
|
},
|
|
RibbonGroup {
|
|
title: "Design",
|
|
tools: vec![
|
|
RibbonItem::LargeTool(tool("UNION", "Union", UNION_ICON)),
|
|
RibbonItem::LargeTool(tool("SUBTRACT", "Subtract", SUBTRACT_ICON)),
|
|
RibbonItem::LargeTool(tool("INTERSECT", "Intersect", INTERSECT_ICON)),
|
|
],
|
|
},
|
|
]
|
|
})
|
|
}
|
|
}
|