Place curve markers along spatial splines and polylines

src/modules/draw/inquiry/divide.rs

@@ -5,7 +5,7 @@ use acadrust::{Entity, EntityType, Handle};
 use cadkernel::space::PlanarCurve;
 use glam::DVec3;
 use crate::command::{CadCommand, CmdOption, CmdResult, CurveMarker, WorkingPlane};
-use crate::entities::curve::entity_curve;
+use crate::entities::curve::{entity_curve, entity_spatial_measurement};
 use crate::t;
 const MEASURE: bool = false;
 
@@ -215,9 +215,10 @@ pub fn measure_entity(entity: &EntityType, segment_length: f64) -> Vec<EntityTyp
     if segment_length <= 0.0 {
         return vec![];
     }
-    let Some((curve, total)) = measurable(entity) else {
+    let Some(curve) = entity_curve(entity) else {
         return vec![];
     };
+    let total = curve.length();
     let mut pts = Vec::new();
     let mut walked = segment_length;
     while walked < total - 1e-6 {
@@ -227,7 +228,7 @@ pub fn measure_entity(entity: &EntityType, segment_length: f64) -> Vec<EntityTyp
     pts
 }
 
-fn make_marker(curve: &PlanarCurve, distance: f64, marker: Option<&CurveMarker>) -> EntityType {
+fn make_marker(curve: &MeasuredCurve, distance: f64, marker: Option<&CurveMarker>) -> EntityType {
     let pos = curve.point_at_distance(distance);
     let Some(marker) = marker else {
         let mut point = PointEnt::new();
@@ -251,9 +252,36 @@ fn make_point(pos: [f64; 3]) -> EntityType {
     EntityType::Point(p)
 }
 
-fn measurable(entity: &EntityType) -> Option<(PlanarCurve, f64)> {
-    let curve = entity_curve(entity)?;
-    let total = curve.curve.length();
+/// The entity's curve and its length, or `None` for anything that cannot be
+/// walked along — a hatch, a block, an unbounded ray.
+enum MeasuredCurve {
+    Planar(PlanarCurve),
+    Spatial(cadkernel::space::ArcLengthCurve3),
+}
+impl MeasuredCurve {
+    fn is_closed(&self) -> bool {
+        match self { Self::Planar(curve) => curve.is_closed(), Self::Spatial(curve) => curve.is_closed() }
+    }
+    fn point_at_distance(&self, distance: f64) -> [f64; 3] {
+        match self { Self::Planar(curve) => curve.point_at_distance(distance), Self::Spatial(curve) => curve.point_at_distance(distance) }
+    }
+    fn parameter_at_distance(&self, distance: f64) -> f64 {
+        match self { Self::Planar(curve) => curve.parameter_at_distance(distance), Self::Spatial(curve) => curve.parameter_at_distance(distance) }
+    }
+    fn tangent_at(&self, parameter: f64) -> [f64; 3] {
+        match self { Self::Planar(curve) => curve.tangent_at(parameter), Self::Spatial(curve) => curve.tangent_at(parameter) }
+    }
+}
+
+fn measurable(entity: &EntityType) -> Option<(MeasuredCurve, f64)> {
+    let (curve, total) = if let Some(curve) = entity_curve(entity) {
+        let total = curve.length();
+        (MeasuredCurve::Planar(curve), total)
+    } else {
+        let curve = entity_spatial_measurement(entity)?;
+        let total = curve.length();
+        (MeasuredCurve::Spatial(curve), total)
+    };
     (total.is_finite() && total > 1e-10).then_some((curve, total))
 }