make sure all enter sketch mode are with the stuff they need in the same batch order always (#5646)

* updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * comment out Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * update artifacts Signed-off-by: Jess Frazelle <github@jessfraz.com> * small Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * last of the artifacts Signed-off-by: Jess Frazelle <github@jessfraz.com> * update playwirght Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * add crazy multi-profile test Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * steps Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix artifact graph Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * cleanup Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates ; Signed-off-by: Jess Frazelle <github@jessfraz.com> * more artifact grph Signed-off-by: Jess Frazelle <github@jessfraz.com> * turn back on playwright Signed-off-by: Jess Frazelle <github@jessfraz.com> * fmt Signed-off-by: Jess Frazelle <github@jessfraz.com> * playwright fixes Signed-off-by: Jess Frazelle <github@jessfraz.com> * playwright fixes Signed-off-by: Jess Frazelle <github@jessfraz.com> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com>
2025-03-13 21:59:39 -07:00
parent 78ac5b0a11
commit 3cff26b987
225 changed files with 22648 additions and 4858 deletions
--- a/rust/kcl-lib/src/std/extrude.rs
+++ b/rust/kcl-lib/src/std/extrude.rs
@ -5,8 +5,13 @@ use std::collections::HashMap;
 use anyhow::Result;
 use kcl_derive_docs::stdlib;
 use kcmc::{
-    each_cmd as mcmd, length_unit::LengthUnit, ok_response::OkModelingCmdResponse, output::ExtrusionFaceInfo,
-    shared::ExtrusionFaceCapType, websocket::OkWebSocketResponseData, ModelingCmd,
+    each_cmd as mcmd,
+    length_unit::LengthUnit,
+    ok_response::OkModelingCmdResponse,
+    output::ExtrusionFaceInfo,
+    shared::ExtrusionFaceCapType,
+    websocket::{ModelingCmdReq, OkWebSocketResponseData},
+    ModelingCmd,
 };
 use kittycad_modeling_cmds as kcmc;
 use uuid::Uuid;
@ -95,50 +100,24 @@ async fn inner_extrude(
    exec_state: &mut ExecState,
    args: Args,
 ) -> Result<SolidSet, KclError> {
-    let id = exec_state.next_uuid();
-
    // Extrude the element(s).
    let sketches: Vec<Sketch> = sketch_set.into();
    let mut solids = Vec::new();
    for sketch in &sketches {
-        // Before we extrude, we need to enable the sketch mode.
-        // We do this here in case extrude is called out of order.
-        args.batch_modeling_cmd(
-            exec_state.next_uuid(),
-            ModelingCmd::from(mcmd::EnableSketchMode {
-                animated: false,
-                ortho: false,
-                entity_id: sketch.on.id(),
-                adjust_camera: false,
-                planar_normal: if let SketchSurface::Plane(plane) = &sketch.on {
-                    // We pass in the normal for the plane here.
-                    Some(plane.z_axis.into())
-                } else {
-                    None
-                },
-            }),
-        )
+        let id = exec_state.next_uuid();
+        args.batch_modeling_cmds(&sketch.build_sketch_mode_cmds(
+            exec_state,
+            ModelingCmdReq {
+                cmd_id: id.into(),
+                cmd: ModelingCmd::from(mcmd::Extrude {
+                    target: sketch.id.into(),
+                    distance: LengthUnit(length),
+                    faces: Default::default(),
+                }),
+            },
+        ))
        .await?;

-        // TODO: We're reusing the same UUID for multiple commands.  This seems
-        // like the artifact graph would never be able to find all the
-        // responses.
-        args.batch_modeling_cmd(
-            id,
-            ModelingCmd::from(mcmd::Extrude {
-                target: sketch.id.into(),
-                distance: LengthUnit(length),
-                faces: Default::default(),
-            }),
-        )
-        .await?;
-
-        // Disable the sketch mode.
-        args.batch_modeling_cmd(
-            exec_state.next_uuid(),
-            ModelingCmd::SketchModeDisable(mcmd::SketchModeDisable::default()),
-        )
-        .await?;
        solids.push(do_post_extrude(sketch.clone(), id.into(), length, exec_state, args.clone()).await?);
    }