forked from 1b-agent/opencadstudio-upstream
cargo fmt
This commit is contained in:
1 parent
468cbde5e1
commit
ca07268c7c
204 files changed
+13997
-5525
No files matched your search
@@ -37,13 +37,15 @@ impl AlignedDimensionCommand {
|
||||
}
|
||||
|
||||
impl CadCommand for AlignedDimensionCommand {
|
||||
fn name(&self) -> &'static str { "DIMALIGNED" }
|
||||
fn name(&self) -> &'static str {
|
||||
"DIMALIGNED"
|
||||
}
|
||||
|
||||
fn prompt(&self) -> String {
|
||||
match self.step {
|
||||
Step::First => "DIMALIGNED Specify first extension line origin:".into(),
|
||||
Step::Second(_) => "DIMALIGNED Specify second extension line origin:".into(),
|
||||
Step::DimLine { .. } => "DIMALIGNED Specify dimension line location:".into(),
|
||||
Step::First => "DIMALIGNED Specify first extension line origin:".into(),
|
||||
Step::Second(_) => "DIMALIGNED Specify second extension line origin:".into(),
|
||||
Step::DimLine { .. } => "DIMALIGNED Specify dimension line location:".into(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,13 +67,11 @@ impl CadCommand for AlignedDimensionCommand {
|
||||
let offset = (dx * dx + dy * dy).sqrt();
|
||||
dim.set_offset(offset);
|
||||
dim.base.definition_point = v3(pt);
|
||||
dim.base.text_middle_point = v3(
|
||||
Vec3::new(
|
||||
(p1.x + p2.x) * 0.5,
|
||||
(p1.y + p2.y) * 0.5,
|
||||
(p1.z + p2.z) * 0.5,
|
||||
)
|
||||
);
|
||||
dim.base.text_middle_point = v3(Vec3::new(
|
||||
(p1.x + p2.x) * 0.5,
|
||||
(p1.y + p2.y) * 0.5,
|
||||
(p1.z + p2.z) * 0.5,
|
||||
));
|
||||
dim.base.insertion_point = dim.base.text_middle_point;
|
||||
dim.base.actual_measurement = dim.measurement();
|
||||
CmdResult::CommitAndExit(EntityType::Dimension(Dimension::Aligned(dim)))
|
||||
@@ -79,7 +79,9 @@ impl CadCommand for AlignedDimensionCommand {
|
||||
}
|
||||
}
|
||||
|
||||
fn on_enter(&mut self) -> CmdResult { CmdResult::Cancel }
|
||||
fn on_enter(&mut self) -> CmdResult {
|
||||
CmdResult::Cancel
|
||||
}
|
||||
|
||||
fn on_mouse_move(&mut self, pt: Vec3) -> Option<WireModel> {
|
||||
let (p1, p2) = match self.step {
|
||||
@@ -123,11 +125,14 @@ fn preview_aligned(p1: Vec3, p2: Vec3, dim_pt: Vec3) -> WireModel {
|
||||
WireModel {
|
||||
name: "dimaligned_preview".into(),
|
||||
points: vec![
|
||||
[p1.x, p1.y, p1.z], [d1.x, d1.y, d1.z],
|
||||
[p1.x, p1.y, p1.z],
|
||||
[d1.x, d1.y, d1.z],
|
||||
[f32::NAN, 0.0, 0.0],
|
||||
[p2.x, p2.y, p2.z], [d2.x, d2.y, d2.z],
|
||||
[p2.x, p2.y, p2.z],
|
||||
[d2.x, d2.y, d2.z],
|
||||
[f32::NAN, 0.0, 0.0],
|
||||
[d1.x, d1.y, d1.z], [d2.x, d2.y, d2.z],
|
||||
[d1.x, d1.y, d1.z],
|
||||
[d2.x, d2.y, d2.z],
|
||||
],
|
||||
color: WireModel::CYAN,
|
||||
selected: false,
|
||||
@@ -137,10 +142,10 @@ fn preview_aligned(p1: Vec3, p2: Vec3, dim_pt: Vec3) -> WireModel {
|
||||
snap_pts: vec![],
|
||||
tangent_geoms: vec![],
|
||||
aci: 0,
|
||||
key_vertices: vec![],
|
||||
aabb: WireModel::UNBOUNDED_AABB,
|
||||
plinegen: true,
|
||||
vp_scissor: None,
|
||||
fill_tris: vec![],
|
||||
key_vertices: vec![],
|
||||
aabb: WireModel::UNBOUNDED_AABB,
|
||||
plinegen: true,
|
||||
vp_scissor: None,
|
||||
fill_tris: vec![],
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user