Skip to main content

kcl_lib/std/
revolve.rs

1//! Standard library revolution surfaces.
2
3use anyhow::Result;
4use kcmc::ModelingCmd;
5use kcmc::each_cmd as mcmd;
6use kcmc::length_unit::LengthUnit;
7use kcmc::shared::Angle;
8use kcmc::shared::Opposite;
9use kittycad_modeling_cmds::shared::BodyType;
10use kittycad_modeling_cmds::shared::Point3d;
11use kittycad_modeling_cmds::{self as kcmc};
12
13use super::DEFAULT_TOLERANCE_MM;
14use super::args::FromKclValue;
15use super::args::TyF64;
16use crate::errors::KclError;
17use crate::errors::KclErrorDetails;
18use crate::execution::ExecState;
19use crate::execution::ExecutorContext;
20use crate::execution::KclValue;
21use crate::execution::ModelingCmdMeta;
22use crate::execution::Sketch;
23use crate::execution::Solid;
24use crate::execution::types::ArrayLen;
25use crate::execution::types::RuntimeType;
26use crate::parsing::ast::types::TagNode;
27use crate::std::Args;
28use crate::std::axis_or_reference::Axis2dOrEdgeReference;
29use crate::std::edge;
30use crate::std::extrude::build_segment_surface_sketch;
31use crate::std::extrude::do_post_extrude;
32
33extern crate nalgebra_glm as glm;
34
35/// Revolve a sketch or set of sketches around an axis.
36pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
37    let sketch_values: Vec<KclValue> = args.get_unlabeled_kw_arg(
38        "sketches",
39        &RuntimeType::Array(
40            Box::new(RuntimeType::Union(vec![RuntimeType::sketch(), RuntimeType::segment()])),
41            ArrayLen::Minimum(1),
42        ),
43        exec_state,
44    )?;
45
46    // axis accepts: (1) Edge or Axis2d (legacy), or (2) an object with sideFaces (edge reference payload)
47    let axis_value: KclValue = args.get_kw_arg("axis", &RuntimeType::any(), exec_state)?;
48    let axis: Axis2dOrEdgeReference = if edge::is_edge_specifier_object(&axis_value) {
49        let spec = edge::parse_edge_specifier_value(&axis_value, &args)?;
50        let edge_reference =
51            edge::resolve_edge_specifier_with_adjacent_faces_or_tag_ids(&spec, exec_state, &args).await?;
52        Axis2dOrEdgeReference::EdgeSpecifier(edge_reference)
53    } else if let Some(axis_val) = Axis2dOrEdgeReference::from_kcl_val(&axis_value) {
54        axis_val
55    } else {
56        return Err(KclError::new_type(KclErrorDetails {
57            message: "axis must be an Edge, Axis2d, Segment, or an object with 'sideFaces' (edge reference)"
58                .to_string(),
59            source_ranges: vec![args.source_range],
60            backtrace: Default::default(),
61        }));
62    };
63    let angle: Option<TyF64> = args.get_kw_arg_opt("angle", &RuntimeType::degrees(), exec_state)?;
64    let tolerance: Option<TyF64> = args.get_kw_arg_opt("tolerance", &RuntimeType::length(), exec_state)?;
65    let tag_start = args.get_kw_arg_opt("tagStart", &RuntimeType::tag_decl(), exec_state)?;
66    let tag_end = args.get_kw_arg_opt("tagEnd", &RuntimeType::tag_decl(), exec_state)?;
67    let symmetric = args.get_kw_arg_opt("symmetric", &RuntimeType::bool(), exec_state)?;
68    let bidirectional_angle: Option<TyF64> =
69        args.get_kw_arg_opt("bidirectionalAngle", &RuntimeType::angle(), exec_state)?;
70    let body_type: BodyType = args
71        .get_kw_arg_opt("bodyType", &RuntimeType::string(), exec_state)?
72        .unwrap_or_default();
73    let sketches = coerce_revolve_targets(
74        sketch_values,
75        body_type,
76        tag_start.as_ref(),
77        tag_end.as_ref(),
78        exec_state,
79        &args.ctx,
80        args.source_range,
81    )
82    .await?;
83
84    let value = inner_revolve(
85        sketches,
86        axis,
87        angle.map(|t| t.n),
88        tolerance,
89        tag_start,
90        tag_end,
91        symmetric,
92        bidirectional_angle,
93        body_type,
94        exec_state,
95        args,
96    )
97    .await?;
98    Ok(value.into())
99}
100
101#[allow(clippy::too_many_arguments)]
102async fn inner_revolve(
103    sketches: Vec<Sketch>,
104    axis: Axis2dOrEdgeReference,
105    angle: Option<f64>,
106    tolerance: Option<TyF64>,
107    tag_start: Option<TagNode>,
108    tag_end: Option<TagNode>,
109    symmetric: Option<bool>,
110    bidirectional_angle: Option<TyF64>,
111    body_type: BodyType,
112    exec_state: &mut ExecState,
113    args: Args,
114) -> Result<Vec<Solid>, KclError> {
115    if let Axis2dOrEdgeReference::Axis { direction, .. } = &axis
116        && direction[0].unwrap_to_mm() == 0.0
117        && direction[1].unwrap_to_mm() == 0.0
118    {
119        return Err(KclError::new_semantic(KclErrorDetails::new(
120            "The axis of revolution cannot be the zero vector.".to_owned(),
121            vec![args.source_range],
122        )));
123    }
124
125    if let Some(angle) = angle {
126        // Return an error if the angle is zero.
127        // We don't use validate() here because we want to return a specific error message that is
128        // nice and we use the other data in the docs, so we still need use the derive above for the json schema.
129        if !(-360.0..=360.0).contains(&angle) || angle == 0.0 {
130            return Err(KclError::new_semantic(KclErrorDetails::new(
131                format!("Expected angle to be between -360 and 360 and not 0, found `{angle}`"),
132                vec![args.source_range],
133            )));
134        }
135    }
136
137    let bidirectional_angle = bidirectional_angle.map(|n| n.unwrap_to_degrees(exec_state, args.source_range));
138    if let Some(bidirectional_angle) = bidirectional_angle {
139        // Return an error if the angle is zero.
140        // We don't use validate() here because we want to return a specific error message that is
141        // nice and we use the other data in the docs, so we still need use the derive above for the json schema.
142        if !(-360.0..=360.0).contains(&bidirectional_angle) || bidirectional_angle == 0.0 {
143            return Err(KclError::new_semantic(KclErrorDetails::new(
144                format!(
145                    "Expected bidirectional angle to be between -360 and 360 and not 0, found `{bidirectional_angle}`"
146                ),
147                vec![args.source_range],
148            )));
149        }
150
151        if let Some(angle) = angle {
152            let ang = angle.signum() * bidirectional_angle + angle;
153            if !(-360.0..=360.0).contains(&ang) {
154                return Err(KclError::new_semantic(KclErrorDetails::new(
155                    format!("Combined angle and bidirectional must be between -360 and 360, found '{ang}'"),
156                    vec![args.source_range],
157                )));
158            }
159        }
160    }
161
162    if symmetric.unwrap_or(false) && bidirectional_angle.is_some() {
163        return Err(KclError::new_semantic(KclErrorDetails::new(
164            "You cannot give both `symmetric` and `bidirectional` params, you have to choose one or the other"
165                .to_owned(),
166            vec![args.source_range],
167        )));
168    }
169
170    let angle = Angle::from_degrees(angle.unwrap_or(360.0));
171
172    let bidirectional_angle = bidirectional_angle.map(Angle::from_degrees);
173
174    let opposite = match (symmetric, bidirectional_angle) {
175        (Some(true), _) => Opposite::Symmetric,
176        (None, None) => Opposite::None,
177        (Some(false), None) => Opposite::None,
178        (None, Some(angle)) => Opposite::Other(angle),
179        (Some(false), Some(angle)) => Opposite::Other(angle),
180    };
181
182    let mut solids = Vec::new();
183    for sketch in &sketches {
184        let new_solid_id = exec_state.next_uuid();
185        let tolerance = tolerance
186            .as_ref()
187            .map(|t| t.unwrap_to_mm())
188            .unwrap_or(DEFAULT_TOLERANCE_MM);
189
190        let direction = match &axis {
191            Axis2dOrEdgeReference::Axis { direction, origin } => {
192                exec_state
193                    .batch_modeling_cmd(
194                        ModelingCmdMeta::from_args_id(exec_state, &args, new_solid_id),
195                        ModelingCmd::from(
196                            mcmd::Revolve::builder()
197                                .angle(angle)
198                                .target(sketch.id.into())
199                                .axis(Point3d {
200                                    x: direction[0].unwrap_to_mm(),
201                                    y: direction[1].unwrap_to_mm(),
202                                    z: 0.0,
203                                })
204                                .origin(Point3d {
205                                    x: LengthUnit(origin[0].unwrap_to_mm()),
206                                    y: LengthUnit(origin[1].unwrap_to_mm()),
207                                    z: LengthUnit(0.0),
208                                })
209                                .tolerance(LengthUnit(tolerance))
210                                .axis_is_2d(true)
211                                .opposite(opposite.clone())
212                                .body_type(body_type)
213                                .build(),
214                        ),
215                    )
216                    .await?;
217                glm::DVec2::new(direction[0].unwrap_to_mm(), direction[1].unwrap_to_mm())
218            }
219            Axis2dOrEdgeReference::Edge(edge) => {
220                let edge_id = edge.get_engine_id(exec_state, &args)?;
221                let source_range = args
222                    .labeled
223                    .get("axis")
224                    .map(|arg| arg.source_range)
225                    .unwrap_or(args.source_range);
226                edge::record_refactor_meta_for_consumed_edge(exec_state, edge_id, source_range, &args).await;
227                exec_state
228                    .batch_modeling_cmd(
229                        ModelingCmdMeta::from_args_id(exec_state, &args, new_solid_id),
230                        ModelingCmd::from(
231                            mcmd::RevolveAboutEdge::builder()
232                                .angle(angle)
233                                .target(sketch.id.into())
234                                .edge_id(edge_id)
235                                .tolerance(LengthUnit(tolerance))
236                                .opposite(opposite.clone())
237                                .body_type(body_type)
238                                .build(),
239                        ),
240                    )
241                    .await?;
242                //TODO: fix me! Need to be able to calculate this to ensure the path isn't colinear
243                glm::DVec2::new(0.0, 1.0)
244            }
245            Axis2dOrEdgeReference::EdgeSpecifier(edge_ref) => {
246                // New API: use EdgeReference directly
247                exec_state
248                    .batch_modeling_cmd(
249                        ModelingCmdMeta::from_args_id(exec_state, &args, new_solid_id),
250                        ModelingCmd::from(
251                            mcmd::RevolveAboutEdge::builder()
252                                .angle(angle)
253                                .target(sketch.id.into())
254                                .edge_reference(edge_ref.clone())
255                                .tolerance(LengthUnit(tolerance))
256                                .opposite(opposite.clone())
257                                .body_type(body_type)
258                                .build(),
259                        ),
260                    )
261                    .await?;
262                //TODO: fix me! Need to be able to calculate this to ensure the path isn't colinear
263                glm::DVec2::new(0.0, 1.0)
264            }
265        };
266
267        let mut edge_id = None;
268        // If an edge lies on the axis of revolution it will not exist after the revolve, so
269        // it cannot be used to retrieve data about the solid
270        for path in sketch.paths.clone() {
271            if sketch.synthetic_jump_path_ids.contains(&path.get_id()) {
272                continue;
273            }
274
275            if !path.is_straight_line() {
276                edge_id = Some(path.get_id());
277                break;
278            }
279
280            let from = path.get_from();
281            let to = path.get_to();
282
283            let dir = glm::DVec2::new(to[0].n - from[0].n, to[1].n - from[1].n);
284            if glm::are_collinear2d(&dir, &direction, tolerance) {
285                continue;
286            }
287            edge_id = Some(path.get_id());
288            break;
289        }
290
291        solids.push(
292            do_post_extrude(
293                sketch,
294                new_solid_id.into(),
295                false,
296                &super::extrude::NamedCapTags {
297                    start: tag_start.as_ref(),
298                    end: tag_end.as_ref(),
299                },
300                kittycad_modeling_cmds::shared::ExtrudeMethod::New,
301                exec_state,
302                &args,
303                edge_id,
304                None,
305                body_type,
306                crate::std::extrude::BeingExtruded::Sketch,
307            )
308            .await?,
309        );
310    }
311
312    Ok(solids)
313}
314
315pub async fn coerce_revolve_targets(
316    sketch_values: Vec<KclValue>,
317    body_type: BodyType,
318    tag_start: Option<&TagNode>,
319    tag_end: Option<&TagNode>,
320    exec_state: &mut ExecState,
321    ctx: &ExecutorContext,
322    source_range: crate::SourceRange,
323) -> Result<Vec<Sketch>, KclError> {
324    let mut sketches = Vec::new();
325    let mut segments = Vec::new();
326
327    for value in sketch_values {
328        if let Some(segment) = value.clone().into_segment() {
329            segments.push(segment);
330            continue;
331        }
332
333        let Some(sketch) = Sketch::from_kcl_val(&value) else {
334            return Err(KclError::new_type(KclErrorDetails::new(
335                "Expected sketches or solved sketch segments for revolve.".to_owned(),
336                vec![source_range],
337            )));
338        };
339        sketches.push(sketch);
340    }
341
342    if !segments.is_empty() && !sketches.is_empty() {
343        return Err(KclError::new_semantic(KclErrorDetails::new(
344            "Cannot revolve sketch segments together with sketches in the same call. Use separate `revolve()` calls."
345                .to_owned(),
346            vec![source_range],
347        )));
348    }
349
350    if !segments.is_empty() {
351        if !matches!(body_type, BodyType::Surface) {
352            return Err(KclError::new_semantic(KclErrorDetails::new(
353                "Revolving sketch segments is only supported for surface revolves. Set `bodyType = SURFACE`."
354                    .to_owned(),
355                vec![source_range],
356            )));
357        }
358
359        if tag_start.is_some() || tag_end.is_some() {
360            return Err(KclError::new_semantic(KclErrorDetails::new(
361                "`tagStart` and `tagEnd` are not supported when revolving sketch segments. Segment surface revolves do not create start or end caps."
362                    .to_owned(),
363                vec![source_range],
364            )));
365        }
366
367        let synthetic_sketch = build_segment_surface_sketch(segments, exec_state, ctx, source_range).await?;
368        return Ok(vec![synthetic_sketch]);
369    }
370
371    Ok(sketches)
372}
373
374#[cfg(test)]
375mod tests {
376    use kcl_api::Expr;
377    use kcl_api::Number;
378    use kcl_api::ObjectId;
379    use kcl_api::Point2d;
380    use kcl_api::PointCtor;
381    use kcl_api::UnitLength;
382
383    use super::*;
384    use crate::execution::AbstractSegment;
385    use crate::execution::MockConfig;
386    use crate::execution::Plane;
387    use crate::execution::Segment;
388    use crate::execution::SegmentKind;
389    use crate::execution::SegmentRepr;
390    use crate::execution::SketchSurface;
391    use crate::execution::types::NumericType;
392    use crate::execution::types::NumericTypeExt;
393    use crate::parsing::ast::types::TagDeclarator;
394    use crate::std::sketch::PlaneData;
395
396    fn point_expr(x: f64, y: f64) -> Point2d<Expr> {
397        Point2d {
398            x: Expr::Var(Number::from((x, UnitLength::Millimeters))),
399            y: Expr::Var(Number::from((y, UnitLength::Millimeters))),
400        }
401    }
402
403    fn segment_value(exec_state: &mut ExecState) -> KclValue {
404        let plane = Plane::from_plane_data_skipping_engine(PlaneData::XY, exec_state).unwrap();
405        let segment = Segment {
406            id: exec_state.next_uuid(),
407            object_id: ObjectId(1),
408            kind: SegmentKind::Point {
409                position: [TyF64::new(0.0, NumericType::mm()), TyF64::new(0.0, NumericType::mm())],
410                ctor: Box::new(PointCtor {
411                    position: point_expr(0.0, 0.0),
412                }),
413                freedom: None,
414            },
415            surface: SketchSurface::Plane(Box::new(plane)),
416            sketch_id: exec_state.next_uuid(),
417            sketch: None,
418            tag: None,
419            node_path: None,
420            meta: vec![],
421        };
422        KclValue::Segment {
423            value: Box::new(AbstractSegment {
424                repr: SegmentRepr::Solved {
425                    segment: Box::new(segment),
426                },
427                meta: vec![],
428            }),
429        }
430    }
431
432    #[tokio::test(flavor = "multi_thread")]
433    async fn segment_revolve_rejects_cap_tags() {
434        let ctx = ExecutorContext::new_mock(None).await;
435        let mut exec_state = ExecState::new(&ctx);
436        let err = coerce_revolve_targets(
437            vec![segment_value(&mut exec_state)],
438            BodyType::Surface,
439            Some(&TagDeclarator::new("cap_start")),
440            None,
441            &mut exec_state,
442            &ctx,
443            crate::SourceRange::default(),
444        )
445        .await
446        .unwrap_err();
447
448        assert!(
449            err.message()
450                .contains("`tagStart` and `tagEnd` are not supported when revolving sketch segments"),
451            "{err:?}"
452        );
453        ctx.close().await;
454    }
455
456    #[tokio::test(flavor = "multi_thread")]
457    async fn mock_revolve_rejects_axis_that_collapses_to_zero_in_2d() {
458        let code = r#"
459profile = startSketchOn(XZ)
460  |> startProfile(at = [10, 0])
461  |> line(end = [0, 10])
462  |> line(end = [-10, 0])
463  |> close()
464
465body = revolve(profile, axis = Z, angle = 90deg)
466"#;
467        let program = crate::Program::parse_no_errs(code).unwrap();
468        let ctx = ExecutorContext::new_mock(None).await;
469        let err = ctx.run_mock(&program, &MockConfig::default()).await.unwrap_err();
470        ctx.close().await;
471
472        assert!(
473            err.error
474                .message()
475                .contains("axis of revolution cannot be the zero vector"),
476            "{err:?}"
477        );
478    }
479
480    #[tokio::test(flavor = "multi_thread")]
481    async fn mock_revolve_accepts_nonzero_2d_axis() {
482        let code = r#"
483profile = startSketchOn(XZ)
484  |> startProfile(at = [10, 0])
485  |> line(end = [0, 10])
486  |> line(end = [-10, 0])
487  |> close()
488
489body = revolve(profile, axis = Y, angle = 90deg)
490"#;
491        let program = crate::Program::parse_no_errs(code).unwrap();
492        let ctx = ExecutorContext::new_mock(None).await;
493        let outcome = ctx.run_mock(&program, &MockConfig::default()).await;
494        ctx.close().await;
495
496        outcome.unwrap();
497    }
498
499    #[tokio::test(flavor = "multi_thread")]
500    async fn revolve_converts_bidirectional_angle_to_degrees() {
501        // https://github.com/KittyCAD/modeling-app/issues/14209
502        // Like `angle`, `bidirectionalAngle` must reach the engine in degrees,
503        // whatever unit it was written in.
504        for (bidirectional_angle, expected_degrees) in [
505            ("2rad", 2.0_f64.to_degrees()),
506            ("30deg", 30.0),
507            ("30", 30.0),
508            ("0.5rad", 0.5_f64.to_degrees()),
509        ] {
510            let code = format!(
511                r#"
512profile = startSketchOn(XZ)
513  |> startProfile(at = [10, 0])
514  |> line(end = [0, 10])
515  |> line(end = [-10, 0])
516  |> close()
517
518body = revolve(profile, axis = Y, angle = 90deg, bidirectionalAngle = {bidirectional_angle})
519"#
520            );
521            let result = crate::execution::parse_execute(&code).await.unwrap();
522            let opposite = result
523                .root_module_artifact_commands()
524                .iter()
525                .find_map(|artifact_command| match &artifact_command.command {
526                    ModelingCmd::Revolve(command) => Some(command.opposite.clone()),
527                    _ => None,
528                })
529                .expect("expected revolve() to send a Revolve command");
530
531            let Opposite::Other(actual) = opposite else {
532                panic!("bidirectionalAngle = {bidirectional_angle}: expected an opposite angle, got {opposite:?}");
533            };
534            assert!(
535                (actual.to_degrees() - expected_degrees).abs() < 1e-9,
536                "bidirectionalAngle = {bidirectional_angle}: expected {expected_degrees} deg, got {} deg",
537                actual.to_degrees()
538            );
539        }
540    }
541
542    #[tokio::test(flavor = "multi_thread")]
543    async fn revolve_checks_bidirectional_angle_range_in_degrees() {
544        // 7rad is about 401 degrees, which is out of range. Before the fix it
545        // was read as 7 degrees and accepted.
546        let code = r#"
547profile = startSketchOn(XZ)
548  |> startProfile(at = [10, 0])
549  |> line(end = [0, 10])
550  |> line(end = [-10, 0])
551  |> close()
552
553body = revolve(profile, axis = Y, angle = 90deg, bidirectionalAngle = 7rad)
554"#;
555        let Err(err) = crate::execution::parse_execute(code).await else {
556            panic!("expected bidirectionalAngle = 7rad to be rejected as out of range");
557        };
558        assert!(
559            err.message()
560                .contains("Expected bidirectional angle to be between -360 and 360"),
561            "{err:?}"
562        );
563    }
564
565    #[tokio::test(flavor = "multi_thread")]
566    async fn revolve_panic_with_direction_unknown_units() {
567        // Regression test for https://github.com/KittyCAD/modeling-app/issues/14328
568        for code in [
569            // Case with non-length units in direction
570            r#"@settings(kclVersion = 2.0)
571profile = sketch(on = XY) {
572  circle1 = circle(center = [10mm, 0mm], start = [11mm, 0mm])
573}
574body = revolve(region(segments = [profile.circle1]),
575axis = { direction = [0, 1rad], origin = [1mm, 0mm] })
576"#,
577            // Case with non-length units in origin
578            r#"@settings(kclVersion = 2.0)
579profile = sketch(on = XY) {
580  circle1 = circle(center = [10mm, 0mm], start = [11mm, 0mm])
581}
582body = revolve(region(segments = [profile.circle1]),
583axis = { direction = [0, 1], origin = [1mm + 1deg, 0mm] })
584"#,
585        ] {
586            let program = crate::Program::parse_no_errs(code).unwrap();
587            let ctx = ExecutorContext::new_mock(None).await;
588            let outcome = ctx.run_mock(&program, &crate::MockConfig::default()).await;
589            ctx.close().await;
590            let err = outcome.expect_err("This should not have passed").error;
591            let KclError::Type { details } = err else {
592                panic!("Expected Type error, got {err}");
593            };
594            // Error message should be something like
595            // axis must be an Edge, Axis2d, Segment, or an object with 'sideFaces' (edge reference)
596            assert!(details.message.contains("Edge"));
597            assert!(details.message.contains("Axis2d"));
598            assert!(details.message.contains("Segment"));
599        }
600    }
601}