Move length constraint ref coords to own struct

Author: Tom

detailer/src/lib.rs

@@ -1,5 +1,5 @@
 use drawing::{handler::ToolResponse, tools, Data, Feature, FeatureKey, Handler};
-use drawing::{Constraint, ConstraintKey};
+use drawing::{Constraint, ConstraintKey, DimensionDisplay};
 
 #[derive(Debug, Default, Clone, PartialEq)]
 pub enum Tab {
@@ -113,14 +113,14 @@ impl<'a> Widget<'a> {
                                                 y,
                                             )
                                         }
-                                        Some(Constraint::LineLength(_, _, d, ref_pt)) => {
+                                        Some(Constraint::LineLength(_, _, d, dd)) => {
                                             Widget::show_constraint_line_length(
                                                 ui,
                                                 &mut commands,
                                                 &mut changed,
                                                 &ck,
                                                 d,
-                                                ref_pt,
+                                                dd,
                                             )
                                         }
                                         Some(Constraint::LineAlongCardinal(
@@ -186,7 +186,7 @@ impl<'a> Widget<'a> {
         changed: &mut bool,
         k: &ConstraintKey,
         d: &mut f32,
-        _ref_pt: &mut (f32, f32),
+        _ref_pt: &mut DimensionDisplay,
     ) {
         ui.horizontal(|ui| {
             let r = ui.available_size();

drawing/src/constraints.rs

@@ -10,10 +10,16 @@ slotmap::new_key_type! {
 #[derive(Debug, Clone, Default, serde::Deserialize, serde::Serialize, PartialEq)]
 pub struct ConstraintMeta {}
 
+#[derive(Debug, Clone, Default, serde::Deserialize, serde::Serialize, PartialEq)]
+pub struct DimensionDisplay {
+    pub(crate) x: f32,
+    pub(crate) y: f32,
+}
+
 #[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
 pub enum Constraint {
     Fixed(ConstraintMeta, FeatureKey, f32, f32),
-    LineLength(ConstraintMeta, FeatureKey, f32, (f32, f32)),
+    LineLength(ConstraintMeta, FeatureKey, f32, DimensionDisplay),
     LineAlongCardinal(ConstraintMeta, FeatureKey, bool), // true = horizontal
 }
 
@@ -55,7 +61,7 @@ impl Constraint {
         use Constraint::{Fixed, LineAlongCardinal, LineLength};
         match self {
             Fixed(..) => None,
-            LineLength(_, fk, _, (ref_x, ref_y)) => {
+            LineLength(_, fk, _, dd) => {
                 if let Some(Feature::LineSegment(_, f1, f2)) = drawing.features.get(*fk) {
                     let (a, b) = match (
                         drawing.features.get(*f1).unwrap(),
@@ -67,7 +73,7 @@ impl Constraint {
                         _ => panic!("unexpected subkey types: {:?} & {:?}", f1, f2),
                     };
 
-                    let reference = egui::Vec2::new(*ref_x, *ref_y);
+                    let reference = egui::Vec2::new(dd.x, dd.y);
                     let t = (a - b).angle() + reference.angle();
                     let text_center = vp.translate_point(a.lerp(b, 0.5))
                         + egui::Vec2::angled(t) * reference.length();
@@ -123,7 +129,7 @@ impl Constraint {
                 };
             }
 
-            LineLength(_, k, d, (ref_x, ref_y)) => {
+            LineLength(_, k, d, dd) => {
                 if let Some(Feature::LineSegment(_, f1, f2)) = drawing.features.get(*k) {
                     let (a, b) = match (
                         drawing.features.get(*f1).unwrap(),
@@ -139,7 +145,7 @@ impl Constraint {
                         a,
                         b,
                         val: &format!("{:.3}", d),
-                        reference: egui::Vec2::new(*ref_x, *ref_y),
+                        reference: egui::Vec2::new(dd.x, dd.y),
                         hovered: params.hovered,
                         selected: params.selected,
                     }

drawing/src/data/mod.rs

@@ -292,12 +292,12 @@ impl Data {
                 }
             };
 
-            if let Some(Constraint::LineLength(_, fk, _, (ref_x, ref_y))) = self.constraint_mut(k) {
+            if let Some(Constraint::LineLength(_, fk, _, dd)) = self.constraint_mut(k) {
                 let c = a.lerp(b, 0.5);
                 let v = c.to_vec2() - pos.to_vec2();
                 let reference = egui::Vec2::angled((a - b).angle() - v.angle()) * v.length();
-                *ref_x = -reference.x;
-                *ref_y = reference.y;
+                dd.x = -reference.x;
+                dd.y = reference.y;
             };
         }
     }

drawing/src/handler.rs

@@ -1,6 +1,6 @@
 use super::{Data, Feature, FeatureKey, FeatureMeta};
 use crate::tools::Toolbar;
-use crate::{Constraint, ConstraintKey, ConstraintMeta};
+use crate::{Constraint, ConstraintKey, ConstraintMeta, DimensionDisplay};
 
 #[derive(Debug)]
 pub enum ToolResponse {
@@ -92,7 +92,7 @@ impl Handler {
                         ConstraintMeta::default(),
                         k,
                         d,
-                        (0., 35.0),
+                        DimensionDisplay { x: 0., y: 35.0 },
                     ));
 
                     tools.clear();

drawing/src/lib.rs

@@ -7,7 +7,7 @@ pub use data::{Data, Hover, Viewport};
 mod feature;
 pub use feature::{Feature, FeatureKey, FeatureMeta};
 mod constraints;
-pub use constraints::{Constraint, ConstraintKey, ConstraintMeta};
+pub use constraints::{Constraint, ConstraintKey, ConstraintMeta, DimensionDisplay};
 pub mod handler;
 mod system;
 pub use handler::Handler;
@@ -139,9 +139,10 @@ impl<'a> Widget<'a> {
                     } => None,
                     Hover::Constraint {
                         k,
-                        constraint: Constraint::LineLength(_, _, _, (x, y)),
+                        constraint: Constraint::LineLength(_, _, _, dd),
                     } => {
-                        let offset = self.drawing.vp.screen_to_point(hp) - egui::Pos2::new(*x, *y);
+                        let offset =
+                            self.drawing.vp.screen_to_point(hp) - egui::Pos2::new(dd.x, dd.y);
                         let state = DragState::Constraint(*k, offset);
                         ui.memory_mut(|mem| mem.data.insert_temp(select_id, state));
                         Some(state)