Improve KCL Samples (#5767)

* improve KCL Samples & .gitignore * update block and car wheel assembly * update flange and lego, delete flange xy * artifacts 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> * scale Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * docs 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> --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Jess Frazelle <github@jessfraz.com>
2025-03-13 23:38:51 -07:00
parent dd99c27d56
commit 58e0c0e916
101 changed files with 107664 additions and 57348 deletions
--- a/public/kcl-samples/README.md
+++ b/public/kcl-samples/README.md
@ -23,14 +23,14 @@ KCL samples conform to a set of style guidelines to ensure consistency and reada
 When you submit a PR to add or modify KCL samples, images and STEP files will be generated and added to the repository automatically.

 ---
-#### [3d-boaty](3d-boaty/main.kcl) ([step](step/3d-boaty.step)) ([screenshot](screenshots/3d-boaty.png))
-[![3d-boaty](screenshots/3d-boaty.png)](3d-boaty/main.kcl)
 #### [80-20-rail](80-20-rail/main.kcl) ([step](step/80-20-rail.step)) ([screenshot](screenshots/80-20-rail.png))
 [![80-20-rail](screenshots/80-20-rail.png)](80-20-rail/main.kcl)
 #### [a-parametric-bearing-pillow-block](a-parametric-bearing-pillow-block/main.kcl) ([step](step/a-parametric-bearing-pillow-block.step)) ([screenshot](screenshots/a-parametric-bearing-pillow-block.png))
 [![a-parametric-bearing-pillow-block](screenshots/a-parametric-bearing-pillow-block.png)](a-parametric-bearing-pillow-block/main.kcl)
 #### [ball-bearing](ball-bearing/main.kcl) ([step](step/ball-bearing.step)) ([screenshot](screenshots/ball-bearing.png))
 [![ball-bearing](screenshots/ball-bearing.png)](ball-bearing/main.kcl)
+#### [bench](bench/main.kcl) ([step](step/bench.step)) ([screenshot](screenshots/bench.png))
+[![bench](screenshots/bench.png)](bench/main.kcl)
 #### [bracket](bracket/main.kcl) ([step](step/bracket.step)) ([screenshot](screenshots/bracket.png))
 [![bracket](screenshots/bracket.png)](bracket/main.kcl)
 #### [car-wheel-assembly](car-wheel-assembly/main.kcl) ([step](step/car-wheel-assembly.step)) ([screenshot](screenshots/car-wheel-assembly.png))
@ -45,10 +45,8 @@ When you submit a PR to add or modify KCL samples, images and STEP files will be
 [![enclosure](screenshots/enclosure.png)](enclosure/main.kcl)
 #### [exhaust-manifold](exhaust-manifold/main.kcl) ([step](step/exhaust-manifold.step)) ([screenshot](screenshots/exhaust-manifold.png))
 [![exhaust-manifold](screenshots/exhaust-manifold.png)](exhaust-manifold/main.kcl)
-#### [flange-with-patterns](flange-with-patterns/main.kcl) ([step](step/flange-with-patterns.step)) ([screenshot](screenshots/flange-with-patterns.png))
-[![flange-with-patterns](screenshots/flange-with-patterns.png)](flange-with-patterns/main.kcl)
-#### [flange-xy](flange-xy/main.kcl) ([step](step/flange-xy.step)) ([screenshot](screenshots/flange-xy.png))
-[![flange-xy](screenshots/flange-xy.png)](flange-xy/main.kcl)
+#### [flange](flange/main.kcl) ([step](step/flange.step)) ([screenshot](screenshots/flange.png))
+[![flange](screenshots/flange.png)](flange/main.kcl)
 #### [focusrite-scarlett-mounting-bracket](focusrite-scarlett-mounting-bracket/main.kcl) ([step](step/focusrite-scarlett-mounting-bracket.step)) ([screenshot](screenshots/focusrite-scarlett-mounting-bracket.png))
 [![focusrite-scarlett-mounting-bracket](screenshots/focusrite-scarlett-mounting-bracket.png)](focusrite-scarlett-mounting-bracket/main.kcl)
 #### [food-service-spatula](food-service-spatula/main.kcl) ([step](step/food-service-spatula.step)) ([screenshot](screenshots/food-service-spatula.png))
--- a/public/kcl-samples/a-parametric-bearing-pillow-block/main.kcl
+++ b/public/kcl-samples/a-parametric-bearing-pillow-block/main.kcl
@ -15,90 +15,57 @@ padding = 1.5
 bearingDia = 3

 // (Needs to be updated). Sketch the block and extrude up to where the counterbore diameter starts.
-block = startSketchOn('XY')
+extrude001 = startSketchOn('XY')
  |> startProfileAt([-width / 2, -length / 2], %)
  |> line(endAbsolute = [width / 2, -length / 2])
  |> line(endAbsolute = [width / 2, length / 2])
  |> line(endAbsolute = [-width / 2, length / 2])
  |> close()
-  |> hole(circle(
-       center = [
+  |> extrude(length = height)
+  
+extrude002 = startSketchOn(extrude001, 'end')
+  |> circle(
+      center = [
         -(width / 2 - (padding / 2)),
         -(length / 2 - (padding / 2))
-       ],
-       radius = holeDia / 2
-     ), %)
-  |> hole(circle(
-       center = [
-         -(width / 2 - (padding / 2)),
-         length / 2 - (padding / 2)
-       ],
-       radius = holeDia / 2
-     ), %)
-  |> hole(circle(
-       center = [
-         width / 2 - (padding / 2),
-         length / 2 - (padding / 2)
-       ],
-       radius = holeDia / 2
-     ), %)
-  |> hole(circle(
-       center = [
-         width / 2 - (padding / 2),
-         -(length / 2 - (padding / 2))
-       ],
-       radius = holeDia / 2
-     ), %)
-  |> hole(circle(
-       center = [0, 0],
-       radius = bearingDia / 2
-     ), %)
-  |> extrude(length = height - cbDepth)
+      ],
+      radius = cbDia / 2,
+     )
+  |> patternLinear2d(
+      instances = 2,
+      distance = length - padding,
+      axis = [0, 1],
+     )
+  |> patternLinear2d(
+      instances = 2,
+      distance = width - padding,
+      axis = [1, 0],
+    )
+  |> extrude(%, length = -cbDepth)

-// Create a second sketch that creates the counterbore diameters and extrude the rest of the way to get the total height. Note: You cannot use startSketchOn(block, 'end'). The extrude lives outside the bounds, and the engine will not execute. This is a known issue.
-secondHalf = startSketchOn({
-       plane = {
-         origin = { x = 0, y = 0, z = height - cbDepth },
-         xAxis = { x = 1, y = 0, z = 0 },
-         yAxis = { x = 0, y = 1, z = 0 },
-         zAxis = { x = 0, y = 0, z = 1 }
-       }
-     })
-  |> startProfileAt([-width / 2, -length / 2], %)
-  |> line(endAbsolute = [width / 2, -length / 2])
-  |> line(endAbsolute = [width / 2, length / 2])
-  |> line(endAbsolute = [-width / 2, length / 2])
-  |> close()
-  |> hole(circle(
-       center = [
-         -(width / 2 - (padding / 2)),
-         -(length / 2 - (padding / 2))
-       ],
-       radius = cbDia / 2
-     ), %)
-  |> hole(circle(
-       center = [
-         -(width / 2 - (padding / 2)),
-         length / 2 - (padding / 2)
-       ],
-       radius = cbDia / 2
-     ), %)
-  |> hole(circle(
-       center = [
-         width / 2 - (padding / 2),
-         length / 2 - (padding / 2)
-       ],
-       radius = cbDia / 2
-     ), %)
-  |> hole(circle(
-       center = [
-         width / 2 - (padding / 2),
-         -(length / 2 - (padding / 2))
-       ],
-       radius = cbDia / 2
-     ), %)
-  |> hole(circle(
-       center = [0, 0],
-       radius = bearingDia / 2
-     ), %)
-  |> extrude(length = cbDepth)
+extrude003 = startSketchOn(extrude001, 'start')
+  |> circle(
+        center = [
+           -(width / 2 - (padding / 2)),
+           -(length / 2 - (padding / 2))
+        ],
+        radius = holeDia / 2,
+     )
+  |> patternLinear2d(
+      instances = 2,
+      distance = length - padding,
+      axis = [0, 1],
+    )
+  |> patternLinear2d(
+      instances = 2,
+      distance = width - padding,
+      axis = [1, 0],
+    )
+  |> extrude(length = -height + cbDepth)
+
+extrude004 = startSketchOn(extrude001, 'end')
+  |> circle(
+      center = [0, 0],
+      radius = bearingDia/2,
+    )
+  |> extrude(length = -height)
--- a/public/kcl-samples/ball-bearing/main.kcl
+++ b/public/kcl-samples/ball-bearing/main.kcl
@ -16,21 +16,8 @@ chainWidth = sphereDia / 2
 chainThickness = sphereDia / 8
 linkDiameter = sphereDia / 4

-customPlane = {
-  plane = {
-    origin = {
-      x = 0,
-      y = 0,
-      z = -overallThickness / 2
-    },
-    xAxis = { x = 1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 1, z = 0 },
-    zAxis = { x = 0, y = 0, z = 1 }
-  }
-}
-
 // Sketch the inside bearing piece
-insideWallSketch = startSketchOn(customPlane)
+insideWallSketch = startSketchOn(offsetPlane("XY", offset = -overallThickness / 2))
  |> circle(
       center = [0, 0],
       radius = shaftDia / 2 + wallThickness
@ -109,7 +96,7 @@ linkRevolve = revolve({ axis = 'Y', angle = 360 / nBalls }, linkSketch)
     )

 // Create the sketch for the outside walls
-outsideWallSketch = startSketchOn(customPlane)
+outsideWallSketch = startSketchOn(offsetPlane("XY", offset = -overallThickness / 2))
  |> circle(
       center = [0, 0],
       radius = outsideDiameter / 2
--- a/public/kcl-samples/3d-boaty/boat-parts.kcl
+++ b/public/kcl-samples/3d-boaty/boat-parts.kcl
--- a/public/kcl-samples/3d-boaty/main.kcl
+++ b/public/kcl-samples/3d-boaty/main.kcl
@ -1,4 +1,4 @@
-// 3D Boaty
+// Bench
 // This is a slight remix of Depep1's original 3D Boaty (https://www.printables.com/model/1141963-3d-boaty). This is a tool used for benchmarking 3D FDM printers for bed adhesion, overhangs, bridging and top surface quality. The name of this file is a bit of misnomer, the shape of the object is a typical park bench.

 // Set units in millimeters (mm)
@ -8,12 +8,12 @@
 benchLength = 56

 // Import various constants and functions from our library
-import dividerThickness from "boat-parts.kcl"
-import divider from "boat-parts.kcl"
-import connector from "boat-parts.kcl"
-import seatSlats from "boat-parts.kcl"
-import backSlats from "boat-parts.kcl"
-import armRest from "boat-parts.kcl"
+import dividerThickness from "bench-parts.kcl"
+import divider from "bench-parts.kcl"
+import connector from "bench-parts.kcl"
+import seatSlats from "bench-parts.kcl"
+import backSlats from "bench-parts.kcl"
+import armRest from "bench-parts.kcl"

 // Create the dividers, these hold the seat and back slats
 divider("YZ")
--- a/public/kcl-samples/bracket/main.kcl
+++ b/public/kcl-samples/bracket/main.kcl
@ -1,113 +1,76 @@
 // Shelf Bracket
 // This is a bracket that holds a shelf. It is made of aluminum and is designed to hold a force of 300 lbs. The bracket is 6 inches wide and the force is applied at the end of the shelf, 12 inches from the wall. The bracket has a factor of safety of 1.2. The legs of the bracket are 5 inches and 2 inches long. The thickness of the bracket is calculated from the constraints provided.

-// Set units
-@settings(defaultLengthUnit = in)

 // Define constants
 sigmaAllow = 35000 // psi (6061-T6 aluminum)
-width = 6
+width = 6 // inch
 p = 300 // Force on shelf - lbs
 factorOfSafety = 1.2 // FOS of 1.2
-shelfMountL = 5
-wallMountL = 2
+shelfMountL = 5 // inches
+wallMountL = 2 // inches
 shelfDepth = 12 // Shelf is 12 inches in depth from the wall
 moment = shelfDepth * p // assume the force is applied at the end of the shelf to be conservative (lb-in)

-
-filletRadius = .375
-extFilletRadius = .25
-mountingHoleDiameter = 0.5
-
 // Calculate required thickness of bracket
 thickness = sqrt(moment * factorOfSafety * 6 / (sigmaAllow * width)) // this is the calculation of two brackets holding up the shelf (inches)

+filletRadius = .25
+extFilletRadius = filletRadius + thickness
+mountingHoleDiameter = 0.5

-// Sketch the bracket body and fillet the inner and outer edges of the bend
-bracketLeg1Sketch = startSketchOn('XY')
+sketch001 = startSketchOn('XZ')
  |> startProfileAt([0, 0], %)
-  |> line(end = [shelfMountL - filletRadius, 0], tag = $fillet1)
-  |> line(end = [0, width], tag = $fillet2)
-  |> line(end = [-shelfMountL + filletRadius, 0])
+  |> xLine(length = shelfMountL - thickness, tag = $seg01)
+  |> yLine(length = thickness, tag = $seg02)
+  |> xLine(length = -shelfMountL, tag = $seg03)
+  |> yLine(length = -wallMountL, tag = $seg04)
+  |> xLine(length = thickness, tag = $seg05)
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg06)
  |> close()
-  |> hole(circle(
-       center = [1, 1],
-       radius = mountingHoleDiameter / 2
-     ), %)
-  |> hole(circle(
-       center = [shelfMountL - 1.5, width - 1],
-       radius = mountingHoleDiameter / 2
-     ), %)
-  |> hole(circle(
-       center = [1, width - 1],
-       radius = mountingHoleDiameter / 2
-     ), %)
-  |> hole(circle(
-       center = [shelfMountL - 1.5, 1],
-       radius = mountingHoleDiameter / 2
-     ), %)
-
-// Extrude the leg 2 bracket sketch
-bracketLeg1Extrude = extrude(bracketLeg1Sketch, length = thickness)
+  |> extrude(%, length = width)
  |> fillet(
       radius = extFilletRadius,
-       tags = [
-         getNextAdjacentEdge(fillet1),
-         getNextAdjacentEdge(fillet2)
-       ]
+       tags = [getNextAdjacentEdge(seg03)],
     )
-
-// Sketch the fillet arc
-filletSketch = startSketchOn('XZ')
-  |> startProfileAt([0, 0], %)
-  |> line(end = [0, thickness])
-  |> arc({
-       angleEnd = 180,
-       angleStart = 90,
-       radius = filletRadius + thickness
-     }, %)
-  |> line(end = [thickness, 0])
-  |> arc({
-       angleEnd = 90,
-       angleStart = 180,
-       radius = filletRadius
-     }, %)
-
-// Sketch the bend
-filletExtrude = extrude(filletSketch, length = -width)
-
-// Create a custom plane for the leg that sits on the wall
-customPlane = {
-  plane = {
-    origin = { x = -filletRadius, y = 0, z = 0 },
-    xAxis = { x = 0, y = 1, z = 0 },
-    yAxis = { x = 0, y = 0, z = 1 },
-    zAxis = { x = 1, y = 0, z = 0 }
-  }
-}
-
-// Create a sketch for the second leg
-bracketLeg2Sketch = startSketchOn(customPlane)
-  |> startProfileAt([0, -filletRadius], %)
-  |> line(end = [width, 0])
-  |> line(end = [0, -wallMountL], tag = $fillet3)
-  |> line(end = [-width, 0], tag = $fillet4)
-  |> close()
-  |> hole(circle(
-       center = [1, -1.5],
-       radius = mountingHoleDiameter / 2
-     ), %)
-  |> hole(circle(
-       center = [5, -1.5],
-       radius = mountingHoleDiameter / 2
-     ), %)
-
-// Extrude the second leg
-bracketLeg2Extrude = extrude(bracketLeg2Sketch, length = -thickness)
  |> fillet(
-       radius = extFilletRadius,
-       tags = [
-         getNextAdjacentEdge(fillet3),
-         getNextAdjacentEdge(fillet4)
-       ]
+       radius = filletRadius,
+       tags = [getNextAdjacentEdge(seg06)],
     )
+  |> fillet(
+      radius = filletRadius,
+      tags = [seg02, getOppositeEdge(seg02)],
+    )
+  |> fillet(
+      radius = filletRadius,
+      tags = [seg05, getOppositeEdge(seg05)],
+    )
+
+sketch002 = startSketchOn(sketch001, seg03)
+  |> circle(
+    center = [-1.25, 1],
+    radius = mountingHoleDiameter / 2,
+  )
+  |> patternLinear2d(
+    instances = 2,
+    distance = 2.5,
+    axis = [-1, 0],
+  )
+  |> patternLinear2d(
+    instances = 2,
+    distance = 4,
+    axis = [0, 1],
+  )
+  |> extrude(%, length = -thickness-.01)
+
+sketch003 = startSketchOn(sketch001, seg04)
+  |> circle(
+    center = [1, -1],
+    radius = mountingHoleDiameter / 2,
+  )
+  |> patternLinear2d(
+    instances = 2,
+    distance = 4,
+    axis = [1, 0],
+  )
+  |> extrude(%, length = -thickness-0.1)
--- a/public/kcl-samples/car-wheel-assembly/brake-caliper.kcl
+++ b/public/kcl-samples/car-wheel-assembly/brake-caliper.kcl
@ -9,18 +9,8 @@
 // Import Constants
 import caliperTolerance, caliperPadLength, caliperThickness, caliperOuterEdgeRadius, caliperInnerEdgeRadius, rotorDiameter, rotorTotalThickness, yAxisOffset from "globals.kcl"

-// Create the plane for the brake caliper. This is so it can match up with the rotor model.
-brakeCaliperPlane = {
-  plane = {
-    origin = { x = 0, y = yAxisOffset, z = 0 },
-    xAxis = { x = 1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 1, z = 0 },
-    zAxis = { x = 0, y = 0, z = 1 }
-  }
-}
-
 // Sketch the brake caliper profile
-brakeCaliperSketch = startSketchOn(brakeCaliperPlane)
+brakeCaliperSketch = startSketchOn('XY')
  |> startProfileAt([
       rotorDiameter / 2 + caliperTolerance,
       0
--- a/public/kcl-samples/car-wheel-assembly/car-rotor.kcl
+++ b/public/kcl-samples/car-wheel-assembly/car-rotor.kcl
@ -9,64 +9,61 @@
 // Import Constants
 import rotorDiameter, rotorInnerDiameter, rotorSinglePlateThickness, rotorInnerDiameterThickness, lugHolePatternDia, lugSpacing, rotorTotalThickness, spacerPatternDiameter, spacerDiameter, spacerLength, spacerCount, wheelDiameter, lugCount, yAxisOffset, drillAndSlotCount from "globals.kcl"

-rotorPlane = {
-  plane = {
-    origin = { x = 0, y = yAxisOffset, z = 0 },
-    xAxis = { x = -1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 0, z = 1 },
-    zAxis = { x = 0, y = 1, z = 0 }
-  }
-}
-fn lugPattern(plane) {
-  lugHolePattern = circle(
-         plane,
-         center = [-lugSpacing / 2, 0],
-         radius = 0.315
-       )
-    |> patternCircular2d(
-         arcDegrees = 360,
-         center = [0, 0],
-         instances = lugCount,
-         rotateDuplicates = true
-       )
-  return lugHolePattern
-}
-rotorSketch = startSketchOn(rotorPlane)
+rotorSketch = startSketchOn('XZ')
  |> circle(
       center = [0, 0],
       radius = rotorDiameter / 2
     )
-  |> hole(lugPattern(%), %)
 rotor = extrude(rotorSketch, length = rotorSinglePlateThickness)
  |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
-rotorBumpSketch = startSketchOn(rotorPlane)
+
+rotorBumpSketch = startSketchOn(rotor, 'end')
  |> circle(
       center = [0, 0],
       radius = rotorInnerDiameter / 2
     )
-  |> hole(lugPattern(%), %)
-rotorBump = extrude(rotorBumpSketch, length = -rotorInnerDiameterThickness)
+rotorBump = extrude(rotorBumpSketch, length = rotorInnerDiameterThickness)
+
+lugHoles = startSketchOn(rotorBump, 'end')
+  |> circle(
+       center = [-lugSpacing / 2, 0],
+       radius = 0.315
+     )
+  |> patternCircular2d(
+       arcDegrees = 360,
+       center = [0, 0],
+       instances = lugCount,
+       rotateDuplicates = true
+     )
+  |> extrude(%, length = -(rotorInnerDiameterThickness + rotorSinglePlateThickness))
  |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
-rotorSecondaryPlatePlane = {
-  plane = {
-    origin = {
-      x = 0,
-      y = yAxisOffset + rotorTotalThickness * 0.75,
-      z = 0
-    },
-    xAxis = { x = -1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 0, z = 1 },
-    zAxis = { x = 0, y = 1, z = 0 }
-  }
-}
-secondaryRotorSketch = startSketchOn(rotorSecondaryPlatePlane)
+
+// (update when boolean is available)
+centerSpacer = startSketchOn(rotor, 'start')
+  |> circle(%, center = [0, 0], radius = .25)
+  |> extrude(%, length = spacerLength)
+
+secondaryRotorSketch = startSketchOn(centerSpacer, 'end')
  |> circle(
       center = [0, 0],
       radius = rotorDiameter / 2
     )
-  |> hole(lugPattern(%), %)
 secondRotor = extrude(secondaryRotorSketch, length = rotorSinglePlateThickness)
-spacerSketch = startSketchOn(rotorSecondaryPlatePlane)
+
+lugHoles2 = startSketchOn(secondRotor, 'end')
+  |> circle(
+       center = [-lugSpacing / 2, 0],
+       radius = 0.315
+     )
+  |> patternCircular2d(
+       arcDegrees = 360,
+       center = [0, 0],
+       instances = lugCount,
+       rotateDuplicates = true
+     )
+  |> extrude(length = -rotorSinglePlateThickness)
+
+spacerSketch = startSketchOn(rotor, 'start')
  |> circle(
       center = [spacerPatternDiameter / 2, 0],
       radius = spacerDiameter
@ -77,8 +74,8 @@ spacerSketch = startSketchOn(rotorSecondaryPlatePlane)
       instances = spacerCount,
       rotateDuplicates = true
     )
-spacers = extrude(spacerSketch, length = -spacerLength)
-  |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
+spacers = extrude(spacerSketch, length = spacerLength)
+
 rotorSlottedSketch = startSketchOn(rotor, 'START')
  |> startProfileAt([2.17, 2.56], %)
  |> xLine(length = 0.12)
@ -107,5 +104,6 @@ secondRotorSlottedSketch = startSketchOn(secondRotor, 'END')
       arcDegrees = 360,
       rotateDuplicates = true
     )
-secondRotorSlotted = extrude(secondRotorSlottedSketch, length = -rotorSinglePlateThickness / 2)
+
+extrude(secondRotorSlottedSketch, length = -rotorSinglePlateThickness / 2)
  |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
--- a/public/kcl-samples/car-wheel-assembly/main.kcl
+++ b/public/kcl-samples/car-wheel-assembly/main.kcl
@ -12,6 +12,7 @@ import 'car-tire.kcl' as carTire
 import lugCount from 'globals.kcl'

 carRotor
+  |> translate(translate = [0, 0.5, 0])
 carWheel
 lugNut
  |> patternCircular3d(
@ -22,4 +23,5 @@ lugNut
     rotateDuplicates = false
   )
 brakeCaliper
+  |> translate(translate = [0, 0.5, 0])
 carTire
--- a/public/kcl-samples/flange-xy/main.kcl
+++ b/public/kcl-samples/flange-xy/main.kcl
@ -1,87 +0,0 @@
-// Flange with XY coordinates
-// A flange is a flat rim, collar, or rib, typically forged or cast, that is used to strengthen an object, guide it, or attach it to another object. Flanges are known for their use in various applications, including piping, plumbing, and mechanical engineering, among others.
-
-// Set units
-@settings(defaultLengthUnit = in)
-
-// Define constants
-mountingHoleDia = .625
-baseDia = 4.625
-pipeDia = 1.25
-thickness = .625
-totalThickness = 0.813
-topTotalDiameter = 2.313
-bottomThickness = 0.06
-bottomTotalDiameter = 2.5
-mountingHolePlacementDiameter = 3.5
-baseThickness = .625
-topTotalThickness = totalThickness - (bottomThickness + baseThickness)
-holeLocator = baseDia - 8
-nHoles = 4
-
-// Add assertion so nHoles are always greater than 1
-assertGreaterThan(nHoles, 1, "nHoles must be greater than 1")
-
-// Create the flange base and the six mounting holes
-flangeBase = startSketchOn('XY')
-  |> circle(
-       center = [0, 0],
-       radius = baseDia / 2
-     )
-  |> hole(circle(
-       center = [mountingHolePlacementDiameter / 2, 0],
-       radius = mountingHoleDia / 2
-     ), %)
-  |> hole(circle(
-       center = [0, mountingHolePlacementDiameter / 2],
-       radius = mountingHoleDia / 2
-     ), %)
-  |> hole(circle(
-       center = [-mountingHolePlacementDiameter / 2, 0],
-       radius = mountingHoleDia / 2
-     ), %)
-  |> hole(circle(
-       center = [0, -mountingHolePlacementDiameter / 2],
-       radius = mountingHoleDia / 2
-     ), %)
-  |> hole(circle(
-       center = [0, 0],
-       radius = pipeDia / 2
-     ), %)
-  |> extrude(length = baseThickness)
-
-// Plane for top face
-topFacePlane = {
-  plane = {
-    origin = { x = 0, y = 0, z = baseThickness },
-    xAxis = { x = 1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 1, z = 0 },
-    zAxis = { x = 0, y = 0, z = 1 }
-  }
-}
-
-// Create the extrusion on the top of the flange base
-topExtrusion = startSketchOn(topFacePlane, 'end')
-  |> circle(
-       center = [0, 0],
-       radius = topTotalDiameter / 2
-     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = pipeDia / 2
-     ), %)
-  |> extrude(length = topTotalThickness)
-
-// Create the extrusion on the bottom of the flange base
-bottomExtrusion = startSketchOn("XY")
-  |> circle(
-       center = [0, 0],
-       radius = bottomTotalDiameter / 2
-     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = pipeDia / 2
-     ), %)
-  |> extrude(length = -bottomThickness)
-
-// https://www.mcmaster.com/44685K193/
--- a/public/kcl-samples/flange-with-patterns/main.kcl
+++ b/public/kcl-samples/flange-with-patterns/main.kcl
@ -8,7 +8,6 @@
 mountingHoleDia = .625
 baseDia = 4.625
 pipeDia = 1.25
-thickness = .625
 totalThickness = 0.813
 topTotalDiameter = 2.313
 bottomThickness = 0.06
@ -16,7 +15,6 @@ bottomTotalDiameter = 2.5
 mountingHolePlacementDiameter = 3.5
 baseThickness = .625
 topTotalThickness = totalThickness - (bottomThickness + baseThickness)
-holeLocator = baseDia - 8
 nHoles = 4

 // Add assertion so nHoles are always greater than 1
@ -42,42 +40,25 @@ flangeBase = startSketchOn('XY')
       radius = baseDia / 2
     )
  |> hole(circles, %)
-  |> hole(circle(
-       center = [0, 0],
-       radius = pipeDia / 2
-     ), %)
  |> extrude(length = baseThickness)

-// Plane for top face
-topFacePlane = {
-  plane = {
-    origin = { x = 0, y = 0, z = baseThickness },
-    xAxis = { x = 1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 1, z = 0 },
-    zAxis = { x = 0, y = 0, z = 1 }
-  }
-}
-
 // Create the extrusion on the top of the flange base
-topExtrusion = startSketchOn(topFacePlane)
+topExtrusion = startSketchOn(flangeBase, 'end')
  |> circle(
       center = [0, 0],
       radius = topTotalDiameter / 2
     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = pipeDia / 2
-     ), %)
  |> extrude(length = topTotalThickness)

 // Create the extrusion on the bottom of the flange base
-bottomExtrusion = startSketchOn("XY")
+bottomExtrusion = startSketchOn(flangeBase, 'start')
  |> circle(
       center = [0, 0],
       radius = bottomTotalDiameter / 2
     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = pipeDia / 2
-     ), %)
-  |> extrude(length = -bottomThickness)
+  |> extrude(length = bottomThickness)
+
+// Cut a hole through the entire body
+pipeHole = startSketchOn(topExtrusion, 'end')
+  |> circle(center = [0, 0], radius = pipeDia/2)
+  |> extrude(%, length = -(topTotalThickness + baseThickness + bottomThickness))
--- a/public/kcl-samples/lego/main.kcl
+++ b/public/kcl-samples/lego/main.kcl
@ -5,8 +5,8 @@
@settings(defaultLengthUnit = in)

 // Define constants
-lbumps = 5 // number of bumps long
-wbumps = 3 // number of bumps wide
+lbumps = 10 // number of bumps long
+wbumps = 5 // number of bumps wide
 pitch = 8.0
 clearance = 0.1
 bumpDiam = 4.8
@ -25,28 +25,8 @@ wSegments = totalWidth / wbumps
 assertGreaterThan(lbumps, 1, "lbumps must be greater than 1")
 assertGreaterThan(wbumps, 1, "wbumps must be greater than 1")

-// Create the plane for the pegs. This is a hack so that the pegs can be patterned along the face of the lego base.
-pegFace = {
-  plane = {
-    origin = { x = 0, y = 0, z = height },
-    xAxis = { x = 1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 1, z = 0 },
-    zAxis = { x = 0, y = 0, z = 1 }
-  }
-}
-
-// Create the plane for the tubes underneath the lego. This is a hack so that the tubes can be patterned underneath the lego.
-tubeFace = {
-  plane = {
-    origin = { x = 0, y = 0, z = height - t },
-    xAxis = { x = 1, y = 0, z = 0 },
-    yAxis = { x = 0, y = 1, z = 0 },
-    zAxis = { x = 0, y = 0, z = 1 }
-  }
-}
-
 // Make the base
-s = startSketchOn('XY')
+base = startSketchOn('XY')
  |> startProfileAt([-totalWidth / 2, -totalLength / 2], %)
  |> line(end = [totalWidth, 0])
  |> line(end = [0, totalLength])
@ -54,8 +34,8 @@ s = startSketchOn('XY')
  |> close()
  |> extrude(length = height)

-// Sketch and extrude a rectangular shape to create the shell underneath the lego. This is a hack until we have a shell function.
-shellExtrude = startSketchOn(s, "start")
+// Sketch and extrude a rectangular shape to create the shell underneath the lego. Will replace with shell function when able to call a face created from shell.
+shellExtrude = startSketchOn(base, "start")
  |> startProfileAt([
       -(totalWidth / 2 - t),
       -(totalLength / 2 - t)
@ -67,7 +47,7 @@ shellExtrude = startSketchOn(s, "start")
  |> extrude(length = -(height - t))

 // Create the pegs on the top of the base
-peg = startSketchOn(s, 'end')
+peg = startSketchOn(base, 'end')
  |> circle(
       center = [
         -(pitch * (wbumps - 1) / 2),
@ -88,7 +68,7 @@ peg = startSketchOn(s, 'end')
  |> extrude(length = bumpHeight)

 // Create the pegs on the bottom of the base
-tubePattern = startSketchOn(tubeFace)
+tubePattern = startSketchOn(shellExtrude, 'start')
  |> circle(
       center = [
         -(pitch * (wbumps - 1) / 2 - (pitch / 2)),
@ -106,4 +86,4 @@ tubePattern = startSketchOn(tubeFace)
       instances = lbumps - 1,
       distance = pitch
     )
-  |> extrude(length = -bumpHeight)
+  |> extrude(length = bumpHeight)
--- a/public/kcl-samples/manifest.json
+++ b/public/kcl-samples/manifest.json
@ -1,11 +1,4 @@
 [
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "3d-boaty/main.kcl",
-    "multipleFiles": true,
-    "title": "3D Boaty",
-    "description": "This is a slight remix of Depep1's original 3D Boaty (https://www.printables.com/model/1141963-3d-boaty). This is a tool used for benchmarking 3D FDM printers for bed adhesion, overhangs, bridging and top surface quality. The name of this file is a bit of misnomer, the shape of the object is a typical park bench."
-  },
  {
    "file": "main.kcl",
    "pathFromProjectDirectoryToFirstFile": "80-20-rail/main.kcl",
@ -27,6 +20,13 @@
    "title": "Ball Bearing",
    "description": "A ball bearing is a type of rolling-element bearing that uses balls to maintain the separation between the bearing races. The primary purpose of a ball bearing is to reduce rotational friction and support radial and axial loads."
  },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "bench/main.kcl",
+    "multipleFiles": true,
+    "title": "Bench",
+    "description": "This is a slight remix of Depep1's original 3D Boaty (https://www.printables.com/model/1141963-3d-boaty). This is a tool used for benchmarking 3D FDM printers for bed adhesion, overhangs, bridging and top surface quality. The name of this file is a bit of misnomer, the shape of the object is a typical park bench."
+  },
  {
    "file": "main.kcl",
    "pathFromProjectDirectoryToFirstFile": "bracket/main.kcl",
@ -78,18 +78,11 @@
  },
  {
    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "flange-with-patterns/main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "flange/main.kcl",
    "multipleFiles": false,
    "title": "Flange",
    "description": "A flange is a flat rim, collar, or rib, typically forged or cast, that is used to strengthen an object, guide it, or attach it to another object. Flanges are known for their use in various applications, including piping, plumbing, and mechanical engineering, among others."
  },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "flange-xy/main.kcl",
-    "multipleFiles": false,
-    "title": "Flange with XY coordinates",
-    "description": "A flange is a flat rim, collar, or rib, typically forged or cast, that is used to strengthen an object, guide it, or attach it to another object. Flanges are known for their use in various applications, including piping, plumbing, and mechanical engineering, among others."
-  },
  {
    "file": "main.kcl",
    "pathFromProjectDirectoryToFirstFile": "focusrite-scarlett-mounting-bracket/main.kcl",
--- a/public/kcl-samples/screenshots/a-parametric-bearing-pillow-block.png
+++ b/public/kcl-samples/screenshots/a-parametric-bearing-pillow-block.png
--- a/public/kcl-samples/screenshots/bench.png
+++ b/public/kcl-samples/screenshots/bench.png
--- a/public/kcl-samples/screenshots/bracket.png
+++ b/public/kcl-samples/screenshots/bracket.png
--- a/public/kcl-samples/screenshots/car-wheel-assembly.png
+++ b/public/kcl-samples/screenshots/car-wheel-assembly.png
--- a/public/kcl-samples/screenshots/flange.png
+++ b/public/kcl-samples/screenshots/flange.png
--- a/public/kcl-samples/screenshots/lego.png
+++ b/public/kcl-samples/screenshots/lego.png
--- a/public/kcl-samples/step/a-parametric-bearing-pillow-block.step
+++ b/public/kcl-samples/step/a-parametric-bearing-pillow-block.step
--- a/public/kcl-samples/step/bench.step
+++ b/public/kcl-samples/step/bench.step
--- a/public/kcl-samples/step/bracket.step
+++ b/public/kcl-samples/step/bracket.step
--- a/public/kcl-samples/step/car-wheel-assembly.step
+++ b/public/kcl-samples/step/car-wheel-assembly.step
--- a/public/kcl-samples/step/flange.step
+++ b/public/kcl-samples/step/flange.step
--- a/public/kcl-samples/step/lego.step
+++ b/public/kcl-samples/step/lego.step
--- a/public/kcl-samples/step/multi-axis-robot.step
+++ b/public/kcl-samples/step/multi-axis-robot.step