Fix point-and-click code

KittyCAD · Feb 19, 2025 · 5ce73f7 · 5ce73f7
1 parent e0713b4
commit 5ce73f7
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 293 deletions.
diff --git a/e2e/playwright/point-click.spec.ts b/e2e/playwright/point-click.spec.ts
@@ -215,7 +215,8 @@ test.describe('Point-and-click tests', { tag: ['@skipWin'] }, () => {
       getNextAdjacentEdge(yo),
       getNextAdjacentEdge(seg02),
       getOppositeEdge(seg01)
-    ])`,
+    ],
+    )`,
 
         afterChamferSelectSnippet:
           'sketch002 = startSketchOn(extrude001, seg03)',
@@ -281,10 +282,9 @@ test.describe('Point-and-click tests', { tag: ['@skipWin'] }, () => {
         clickCoords: { x: 620, y: 300 },
         cameraPos: { x: -1100, y: -7700, z: 1600 },
         cameraTarget: { x: 1450, y: 670, z: 4000 },
-        beforeChamferSnippet: `chamfer(
-         length = 30,
-         tags = [getNextAdjacentEdge(yo)]
-       )`,
+        beforeChamferSnippet: `chamfer(length = 30, tags = [getNextAdjacentEdge(yo)])`,
+        beforeChamferSnippetEnd:
+          '|> chamfer(length = 30, tags = [getNextAdjacentEdge(yo)])',
         afterChamferSelectSnippet:
           'sketch005 = startSketchOn(extrude001, seg06)',
         afterRectangle1stClickSnippet:
@@ -312,34 +312,16 @@ test.describe('Point-and-click tests', { tag: ['@skipWin'] }, () => {
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
   |> close()
 extrude001 = extrude(sketch001, length = 100)
-  |> chamfer(
-       length = 30,
-       tags = [getOppositeEdge(seg01)],
-       tag = $seg03,
-     )
-  |> chamfer( length = 30, tags = [seg01], tag = $seg04)
-  |> chamfer(
-       length = 30,
-       tags = [getNextAdjacentEdge(seg02)],
-       tag = $seg05,
-     )
-  |> chamfer(
-       length = 30,
-       tags = [getNextAdjacentEdge(yo)],
-       tag = $seg06,
-     )
+  |> chamfer(length = 30, tags = [getOppositeEdge(seg01)], tag = $seg03)
+  |> chamfer(length = 30, tags = [seg01], tag = $seg04)
+  |> chamfer(length = 30, tags = [getNextAdjacentEdge(seg02)], tag = $seg05)
+  |> chamfer(length = 30, tags = [getNextAdjacentEdge(yo)], tag = $seg06)
 sketch005 = startSketchOn(extrude001, seg06)
-profile004 = startProfileAt([-23.43, 19.69], sketch005)
+profile004=startProfileAt([-23.43,19.69], sketch005)
   |> angledLine([0, 9.1], %, $rectangleSegmentA005)
-  |> angledLine([
-       segAng(rectangleSegmentA005) - 90,
-       84.07
-     ], %)
-  |> angledLine([
-       segAng(rectangleSegmentA005),
-       -segLen(rectangleSegmentA005)
-     ], %)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> angledLine([segAng(rectangleSegmentA005) - 90, 84.07], %)
+  |> angledLine([segAng(rectangleSegmentA005), -segLen(rectangleSegmentA005)], %)
+  |> line(endAbsolute=[profileStartX(%), profileStartY(%)])
   |> close()
 sketch004 = startSketchOn(extrude001, seg05)
 profile003 = startProfileAt([82.57, 322.96], sketch004)
@@ -380,7 +362,6 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
      ], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-
 `,
           { shouldNormalise: true }
         )
@@ -421,9 +402,9 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
       seg01,
       getNextAdjacentEdge(yo),
       getNextAdjacentEdge(seg02),
-      getOppositeEdge(seg01)
+      getOppositeEdge(seg01),
     ])`,
-        beforeChamferSnippetEnd: '}, extrude001)',
+        beforeChamferSnippetEnd: ')',
         afterChamferSelectSnippet:
           'sketch002 = startSketchOn(extrude001, seg03)',
         afterRectangle1stClickSnippet:
@@ -453,15 +434,15 @@ chamf = chamfer(
        extrude001,
        length = 30,
        tags = [getOppositeEdge(seg01)],
-       tag = $seg03
-      )
+       tag = $seg03,
+     )
   |> chamfer(
        length = 30,
        tags = [
          seg01,
          getNextAdjacentEdge(yo),
          getNextAdjacentEdge(seg02)
-       ]
+       ],
      )
 sketch002 = startSketchOn(extrude001, seg03)
 profile001 = startProfileAt([205.96, 254.59], sketch002)
@@ -474,7 +455,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
        segAng(rectangleSegmentA002),
        -segLen(rectangleSegmentA002)
      ], %)
-  |> line(endAbsolute=[profileStartX(%), profileStartY(%)])
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 `,
         { shouldNormalise: true }

diff --git a/exp b/exp
@@ -0,0 +1 @@
+sketch001=startSketchOn('XZ')|>startProfileAt([75.8,317.2],%)//[$startCapTag,$EndCapTag]|>angledLine([0,268.43],%,$rectangleSegmentA001)|>angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)|>angledLine([segAng(rectangleSegmentA001),-segLen(rectangleSegmentA001)],%,$yo)|>line(endAbsolute=[profileStartX(%),profileStartY(%)],tag=$seg02)|>close()extrude001=extrude(sketch001,length=100)|>chamfer(length=30,tags=[getOppositeEdge(seg01)],tag=$seg03)|>chamfer(length=30,tags=[seg01],tag=$seg04)|>chamfer(length=30,tags=[getNextAdjacentEdge(seg02)],tag=$seg05)|>chamfer(length=30,tags=[getNextAdjacentEdge(yo)],tag=$seg06)sketch004=startSketchOn(extrude001,seg05)profile003=startProfileAt([82.57,322.96],sketch004)|>angledLine([0,11.16],%,$rectangleSegmentA004)|>angledLine([segAng(rectangleSegmentA004)-90,103.07],%)|>angledLine([segAng(rectangleSegmentA004),-segLen(rectangleSegmentA004)],%)|>line(endAbsolute=[profileStartX(%),profileStartY(%)])|>close()sketch003=startSketchOn(extrude001,seg04)profile002=startProfileAt([-209.64,255.28],sketch003)|>angledLine([0,11.56],%,$rectangleSegmentA003)|>angledLine([segAng(rectangleSegmentA003)-90,106.84],%)|>angledLine([segAng(rectangleSegmentA003),-segLen(rectangleSegmentA003)],%)|>line(endAbsolute=[profileStartX(%),profileStartY(%)])|>close()sketch002=startSketchOn(extrude001,seg03)profile001=startProfileAt([205.96,254.59],sketch002)|>angledLine([0,11.39],%,$rectangleSegmentA002)|>angledLine([segAng(rectangleSegmentA002)-90,105.26],%)|>angledLine([segAng(rectangleSegmentA002),-segLen(rectangleSegmentA002)],%)|>line(endAbsolute=[profileStartX(%),profileStartY(%)])|>close()
diff --git a/got b/got
@@ -0,0 +1 @@
+sketch001=startSketchOn('XZ')|>startProfileAt([75.8,317.2],%)//[$startCapTag,$EndCapTag]|>angledLine([0,268.43],%,$rectangleSegmentA001)|>angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)|>angledLine([segAng(rectangleSegmentA001),-segLen(rectangleSegmentA001)],%,$yo)|>line(endAbsolute=[profileStartX(%),profileStartY(%)],tag=$seg02)|>close()extrude001=extrude(sketch001,length=100)|>chamfer(length=30,tags=[getOppositeEdge(seg01)],tag=$seg03)|>chamfer(length=30,tags=[seg01],tag=$seg04)|>chamfer(length=30,tags=[getNextAdjacentEdge(seg02)],tag=$seg05)|>chamfer(length=30,tags=[getNextAdjacentEdge(yo)],tag=$seg06)sketch005=startSketchOn(extrude001,seg06)profile004=startProfileAt([-23.43,19.69],sketch005)|>angledLine([0,9.1],%,$rectangleSegmentA005)|>angledLine([segAng(rectangleSegmentA005)-90,84.07],%)|>angledLine([segAng(rectangleSegmentA005),-segLen(rectangleSegmentA005)],%)|>line(endAbsolute=[profileStartX(%),profileStartY(%)])|>close()sketch004=startSketchOn(extrude001,seg05)profile003=startProfileAt([82.57,322.96],sketch004)|>angledLine([0,11.16],%,$rectangleSegmentA004)|>angledLine([segAng(rectangleSegmentA004)-90,103.07],%)|>angledLine([segAng(rectangleSegmentA004),-segLen(rectangleSegmentA004)],%)|>line(endAbsolute=[profileStartX(%),profileStartY(%)])|>close()sketch003=startSketchOn(extrude001,seg04)profile002=startProfileAt([-209.64,255.28],sketch003)|>angledLine([0,11.56],%,$rectangleSegmentA003)|>angledLine([segAng(rectangleSegmentA003)-90,106.84],%)|>angledLine([segAng(rectangleSegmentA003),-segLen(rectangleSegmentA003)],%)|>line(endAbsolute=[profileStartX(%),profileStartY(%)])|>close()sketch002=startSketchOn(extrude001,seg03)profile001=startProfileAt([205.96,254.59],sketch002)|>angledLine([0,11.39],%,$rectangleSegmentA002)|>angledLine([segAng(rectangleSegmentA002)-90,105.26],%)|>angledLine([segAng(rectangleSegmentA002),-segLen(rectangleSegmentA002)],%)|>line(endAbsolute=[profileStartX(%),profileStartY(%)])|>close()
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "fmt": "prettier --write ./src *.ts *.json *.js ./e2e ./packages",
     "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e ./packages",
     "fetch:wasm": "./get-latest-wasm-bundle.sh",
-    "fetch:samples": "echo \"Fetching latest KCL samples...\" && curl -o public/kcl-samples-manifest-fallback.json https://raw.githubusercontent.com/KittyCAD/kcl-samples/next/manifest.json",
+    "fetch:samples": "echo \"Fetching latest KCL samples...\" && curl -o public/kcl-samples-manifest-fallback.json https://raw.githubusercontent.com/KittyCAD/achalmers/kw-fillet-chamfer/manifest.json",
     "isomorphic-copy-wasm": "(copy src/wasm-lib/pkg/wasm_lib_bg.wasm public || cp src/wasm-lib/pkg/wasm_lib_bg.wasm public)",
     "build:wasm-dev": "yarn wasm-prep && (cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
     "build:wasm": "yarn wasm-prep && cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings && cd ../.. && yarn isomorphic-copy-wasm && yarn fmt",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		sketch001=startSketchOn('XZ')\|>startProfileAt([75.8,317.2],%)//[$startCapTag,$EndCapTag]\|>angledLine([0,268.43],%,$rectangleSegmentA001)\|>angledLine([segAng(rectangleSegmentA001)-90,217.26],%,$seg01)\|>angledLine([segAng(rectangleSegmentA001),-segLen(rectangleSegmentA001)],%,$yo)\|>line(endAbsolute=[profileStartX(%),profileStartY(%)],tag=$seg02)\|>close()extrude001=extrude(sketch001,length=100)\|>chamfer(length=30,tags=[getOppositeEdge(seg01)],tag=$seg03)\|>chamfer(length=30,tags=[seg01],tag=$seg04)\|>chamfer(length=30,tags=[getNextAdjacentEdge(seg02)],tag=$seg05)\|>chamfer(length=30,tags=[getNextAdjacentEdge(yo)],tag=$seg06)sketch004=startSketchOn(extrude001,seg05)profile003=startProfileAt([82.57,322.96],sketch004)\|>angledLine([0,11.16],%,$rectangleSegmentA004)\|>angledLine([segAng(rectangleSegmentA004)-90,103.07],%)\|>angledLine([segAng(rectangleSegmentA004),-segLen(rectangleSegmentA004)],%)\|>line(endAbsolute=[profileStartX(%),profileStartY(%)])\|>close()sketch003=startSketchOn(extrude001,seg04)profile002=startProfileAt([-209.64,255.28],sketch003)\|>angledLine([0,11.56],%,$rectangleSegmentA003)\|>angledLine([segAng(rectangleSegmentA003)-90,106.84],%)\|>angledLine([segAng(rectangleSegmentA003),-segLen(rectangleSegmentA003)],%)\|>line(endAbsolute=[profileStartX(%),profileStartY(%)])\|>close()sketch002=startSketchOn(extrude001,seg03)profile001=startProfileAt([205.96,254.59],sketch002)\|>angledLine([0,11.39],%,$rectangleSegmentA002)\|>angledLine([segAng(rectangleSegmentA002)-90,105.26],%)\|>angledLine([segAng(rectangleSegmentA002),-segLen(rectangleSegmentA002)],%)\|>line(endAbsolute=[profileStartX(%),profileStartY(%)])\|>close()