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].to_mm() == 0.0
117        && direction[1].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.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.as_ref().map(|t| t.to_mm()).unwrap_or(DEFAULT_TOLERANCE_MM);
186
187        let direction = match &axis {
188            Axis2dOrEdgeReference::Axis { direction, origin } => {
189                exec_state
190                    .batch_modeling_cmd(
191                        ModelingCmdMeta::from_args_id(exec_state, &args, new_solid_id),
192                        ModelingCmd::from(
193                            mcmd::Revolve::builder()
194                                .angle(angle)
195                                .target(sketch.id.into())
196                                .axis(Point3d {
197                                    x: direction[0].to_mm(),
198                                    y: direction[1].to_mm(),
199                                    z: 0.0,
200                                })
201                                .origin(Point3d {
202                                    x: LengthUnit(origin[0].to_mm()),
203                                    y: LengthUnit(origin[1].to_mm()),
204                                    z: LengthUnit(0.0),
205                                })
206                                .tolerance(LengthUnit(tolerance))
207                                .axis_is_2d(true)
208                                .opposite(opposite.clone())
209                                .body_type(body_type)
210                                .build(),
211                        ),
212                    )
213                    .await?;
214                glm::DVec2::new(direction[0].to_mm(), direction[1].to_mm())
215            }
216            Axis2dOrEdgeReference::Edge(edge) => {
217                let edge_id = edge.get_engine_id(exec_state, &args)?;
218                let source_range = args
219                    .labeled
220                    .get("axis")
221                    .map(|arg| arg.source_range)
222                    .unwrap_or(args.source_range);
223                edge::record_refactor_meta_for_consumed_edge(exec_state, edge_id, source_range, &args).await;
224                exec_state
225                    .batch_modeling_cmd(
226                        ModelingCmdMeta::from_args_id(exec_state, &args, new_solid_id),
227                        ModelingCmd::from(
228                            mcmd::RevolveAboutEdge::builder()
229                                .angle(angle)
230                                .target(sketch.id.into())
231                                .edge_id(edge_id)
232                                .tolerance(LengthUnit(tolerance))
233                                .opposite(opposite.clone())
234                                .body_type(body_type)
235                                .build(),
236                        ),
237                    )
238                    .await?;
239                //TODO: fix me! Need to be able to calculate this to ensure the path isn't colinear
240                glm::DVec2::new(0.0, 1.0)
241            }
242            Axis2dOrEdgeReference::EdgeSpecifier(edge_ref) => {
243                // New API: use EdgeReference directly
244                exec_state
245                    .batch_modeling_cmd(
246                        ModelingCmdMeta::from_args_id(exec_state, &args, new_solid_id),
247                        ModelingCmd::from(
248                            mcmd::RevolveAboutEdge::builder()
249                                .angle(angle)
250                                .target(sketch.id.into())
251                                .edge_reference(edge_ref.clone())
252                                .tolerance(LengthUnit(tolerance))
253                                .opposite(opposite.clone())
254                                .body_type(body_type)
255                                .build(),
256                        ),
257                    )
258                    .await?;
259                //TODO: fix me! Need to be able to calculate this to ensure the path isn't colinear
260                glm::DVec2::new(0.0, 1.0)
261            }
262        };
263
264        let mut edge_id = None;
265        // If an edge lies on the axis of revolution it will not exist after the revolve, so
266        // it cannot be used to retrieve data about the solid
267        for path in sketch.paths.clone() {
268            if sketch.synthetic_jump_path_ids.contains(&path.get_id()) {
269                continue;
270            }
271
272            if !path.is_straight_line() {
273                edge_id = Some(path.get_id());
274                break;
275            }
276
277            let from = path.get_from();
278            let to = path.get_to();
279
280            let dir = glm::DVec2::new(to[0].n - from[0].n, to[1].n - from[1].n);
281            if glm::are_collinear2d(&dir, &direction, tolerance) {
282                continue;
283            }
284            edge_id = Some(path.get_id());
285            break;
286        }
287
288        solids.push(
289            do_post_extrude(
290                sketch,
291                new_solid_id.into(),
292                false,
293                &super::extrude::NamedCapTags {
294                    start: tag_start.as_ref(),
295                    end: tag_end.as_ref(),
296                },
297                kittycad_modeling_cmds::shared::ExtrudeMethod::New,
298                exec_state,
299                &args,
300                edge_id,
301                None,
302                body_type,
303                crate::std::extrude::BeingExtruded::Sketch,
304            )
305            .await?,
306        );
307    }
308
309    Ok(solids)
310}
311
312pub async fn coerce_revolve_targets(
313    sketch_values: Vec<KclValue>,
314    body_type: BodyType,
315    tag_start: Option<&TagNode>,
316    tag_end: Option<&TagNode>,
317    exec_state: &mut ExecState,
318    ctx: &ExecutorContext,
319    source_range: crate::SourceRange,
320) -> Result<Vec<Sketch>, KclError> {
321    let mut sketches = Vec::new();
322    let mut segments = Vec::new();
323
324    for value in sketch_values {
325        if let Some(segment) = value.clone().into_segment() {
326            segments.push(segment);
327            continue;
328        }
329
330        let Some(sketch) = Sketch::from_kcl_val(&value) else {
331            return Err(KclError::new_type(KclErrorDetails::new(
332                "Expected sketches or solved sketch segments for revolve.".to_owned(),
333                vec![source_range],
334            )));
335        };
336        sketches.push(sketch);
337    }
338
339    if !segments.is_empty() && !sketches.is_empty() {
340        return Err(KclError::new_semantic(KclErrorDetails::new(
341            "Cannot revolve sketch segments together with sketches in the same call. Use separate `revolve()` calls."
342                .to_owned(),
343            vec![source_range],
344        )));
345    }
346
347    if !segments.is_empty() {
348        if !matches!(body_type, BodyType::Surface) {
349            return Err(KclError::new_semantic(KclErrorDetails::new(
350                "Revolving sketch segments is only supported for surface revolves. Set `bodyType = SURFACE`."
351                    .to_owned(),
352                vec![source_range],
353            )));
354        }
355
356        if tag_start.is_some() || tag_end.is_some() {
357            return Err(KclError::new_semantic(KclErrorDetails::new(
358                "`tagStart` and `tagEnd` are not supported when revolving sketch segments. Segment surface revolves do not create start or end caps."
359                    .to_owned(),
360                vec![source_range],
361            )));
362        }
363
364        let synthetic_sketch = build_segment_surface_sketch(segments, exec_state, ctx, source_range).await?;
365        return Ok(vec![synthetic_sketch]);
366    }
367
368    Ok(sketches)
369}
370
371#[cfg(test)]
372mod tests {
373    use kcl_api::UnitLength;
374
375    use super::*;
376    use crate::execution::AbstractSegment;
377    use crate::execution::MockConfig;
378    use crate::execution::Plane;
379    use crate::execution::Segment;
380    use crate::execution::SegmentKind;
381    use crate::execution::SegmentRepr;
382    use crate::execution::SketchSurface;
383    use crate::execution::types::NumericType;
384    use crate::execution::types::NumericTypeExt;
385    use crate::front::Expr;
386    use crate::front::Number;
387    use crate::front::ObjectId;
388    use crate::front::Point2d;
389    use crate::front::PointCtor;
390    use crate::parsing::ast::types::TagDeclarator;
391    use crate::std::sketch::PlaneData;
392
393    fn point_expr(x: f64, y: f64) -> Point2d<Expr> {
394        Point2d {
395            x: Expr::Var(Number::from((x, UnitLength::Millimeters))),
396            y: Expr::Var(Number::from((y, UnitLength::Millimeters))),
397        }
398    }
399
400    fn segment_value(exec_state: &mut ExecState) -> KclValue {
401        let plane = Plane::from_plane_data_skipping_engine(PlaneData::XY, exec_state).unwrap();
402        let segment = Segment {
403            id: exec_state.next_uuid(),
404            object_id: ObjectId(1),
405            kind: SegmentKind::Point {
406                position: [TyF64::new(0.0, NumericType::mm()), TyF64::new(0.0, NumericType::mm())],
407                ctor: Box::new(PointCtor {
408                    position: point_expr(0.0, 0.0),
409                }),
410                freedom: None,
411            },
412            surface: SketchSurface::Plane(Box::new(plane)),
413            sketch_id: exec_state.next_uuid(),
414            sketch: None,
415            tag: None,
416            node_path: None,
417            meta: vec![],
418        };
419        KclValue::Segment {
420            value: Box::new(AbstractSegment {
421                repr: SegmentRepr::Solved {
422                    segment: Box::new(segment),
423                },
424                meta: vec![],
425            }),
426        }
427    }
428
429    #[tokio::test(flavor = "multi_thread")]
430    async fn segment_revolve_rejects_cap_tags() {
431        let ctx = ExecutorContext::new_mock(None).await;
432        let mut exec_state = ExecState::new(&ctx);
433        let err = coerce_revolve_targets(
434            vec![segment_value(&mut exec_state)],
435            BodyType::Surface,
436            Some(&TagDeclarator::new("cap_start")),
437            None,
438            &mut exec_state,
439            &ctx,
440            crate::SourceRange::default(),
441        )
442        .await
443        .unwrap_err();
444
445        assert!(
446            err.message()
447                .contains("`tagStart` and `tagEnd` are not supported when revolving sketch segments"),
448            "{err:?}"
449        );
450        ctx.close().await;
451    }
452
453    #[tokio::test(flavor = "multi_thread")]
454    async fn mock_revolve_rejects_axis_that_collapses_to_zero_in_2d() {
455        let code = r#"
456profile = startSketchOn(XZ)
457  |> startProfile(at = [10, 0])
458  |> line(end = [0, 10])
459  |> line(end = [-10, 0])
460  |> close()
461
462body = revolve(profile, axis = Z, angle = 90deg)
463"#;
464        let program = crate::Program::parse_no_errs(code).unwrap();
465        let ctx = ExecutorContext::new_mock(None).await;
466        let err = ctx.run_mock(&program, &MockConfig::default()).await.unwrap_err();
467        ctx.close().await;
468
469        assert!(
470            err.error
471                .message()
472                .contains("axis of revolution cannot be the zero vector"),
473            "{err:?}"
474        );
475    }
476
477    #[tokio::test(flavor = "multi_thread")]
478    async fn mock_revolve_accepts_nonzero_2d_axis() {
479        let code = r#"
480profile = startSketchOn(XZ)
481  |> startProfile(at = [10, 0])
482  |> line(end = [0, 10])
483  |> line(end = [-10, 0])
484  |> close()
485
486body = revolve(profile, axis = Y, angle = 90deg)
487"#;
488        let program = crate::Program::parse_no_errs(code).unwrap();
489        let ctx = ExecutorContext::new_mock(None).await;
490        let outcome = ctx.run_mock(&program, &MockConfig::default()).await;
491        ctx.close().await;
492
493        outcome.unwrap();
494    }
495
496    #[tokio::test(flavor = "multi_thread")]
497    async fn revolve_converts_bidirectional_angle_to_degrees() {
498        // https://github.com/KittyCAD/modeling-app/issues/14209
499        // Like `angle`, `bidirectionalAngle` must reach the engine in degrees,
500        // whatever unit it was written in.
501        for (bidirectional_angle, expected_degrees) in [
502            ("2rad", 2.0_f64.to_degrees()),
503            ("30deg", 30.0),
504            ("30", 30.0),
505            ("0.5rad", 0.5_f64.to_degrees()),
506        ] {
507            let code = format!(
508                r#"
509profile = startSketchOn(XZ)
510  |> startProfile(at = [10, 0])
511  |> line(end = [0, 10])
512  |> line(end = [-10, 0])
513  |> close()
514
515body = revolve(profile, axis = Y, angle = 90deg, bidirectionalAngle = {bidirectional_angle})
516"#
517            );
518            let result = crate::execution::parse_execute(&code).await.unwrap();
519            let opposite = result
520                .root_module_artifact_commands()
521                .iter()
522                .find_map(|artifact_command| match &artifact_command.command {
523                    ModelingCmd::Revolve(command) => Some(command.opposite.clone()),
524                    _ => None,
525                })
526                .expect("expected revolve() to send a Revolve command");
527
528            let Opposite::Other(actual) = opposite else {
529                panic!("bidirectionalAngle = {bidirectional_angle}: expected an opposite angle, got {opposite:?}");
530            };
531            assert!(
532                (actual.to_degrees() - expected_degrees).abs() < 1e-9,
533                "bidirectionalAngle = {bidirectional_angle}: expected {expected_degrees} deg, got {} deg",
534                actual.to_degrees()
535            );
536        }
537    }
538
539    #[tokio::test(flavor = "multi_thread")]
540    async fn revolve_checks_bidirectional_angle_range_in_degrees() {
541        // 7rad is about 401 degrees, which is out of range. Before the fix it
542        // was read as 7 degrees and accepted.
543        let code = r#"
544profile = startSketchOn(XZ)
545  |> startProfile(at = [10, 0])
546  |> line(end = [0, 10])
547  |> line(end = [-10, 0])
548  |> close()
549
550body = revolve(profile, axis = Y, angle = 90deg, bidirectionalAngle = 7rad)
551"#;
552        let Err(err) = crate::execution::parse_execute(code).await else {
553            panic!("expected bidirectionalAngle = 7rad to be rejected as out of range");
554        };
555        assert!(
556            err.message()
557                .contains("Expected bidirectional angle to be between -360 and 360"),
558            "{err:?}"
559        );
560    }
561}