Remove unneeded % pipeline substitution in kcl-samples (#7791)

* Remove unneeded % pipeline substitution in kcl-samples

* Update output

* Remove more percents

* Update output and format

Author: jtran

public/kcl-samples/ball-joint-rod-end/main.kcl

@@ -39,7 +39,7 @@ ballProfile = startProfile(ballSketch, at = polar(angle = sketchStartAngle + 90,
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 ballRevolve = revolve(ballProfile, angle = 360, axis = X)
-  |> appearance(%, color = "#519afb")
+  |> appearance(color = "#519afb")
 
 // next the retaining loop that keep the ball in place
 retainingLoopSketch = startSketchOn(YZ)

public/kcl-samples/bottle/main.kcl

@@ -29,4 +29,4 @@ bottleNeck = startSketchOn(bottleBody, face = END)
 
 // Define a shell operation so that the entire body and neck are hollow, with only the top face opened
 bottleShell = shell(bottleNeck, faces = [END], thickness = wallThickness)
-  |> appearance(%, color = "#0078c2")
+  |> appearance(color = "#0078c2")

public/kcl-samples/bracket/main.kcl

@@ -40,7 +40,7 @@ bracketBody = startSketchOn(XZ)
   |> xLine(length = thickness, tag = $seg05)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg06)
   |> close()
-  |> extrude(%, length = width)
+  |> extrude(length = width)
 
 // Add mounting holes to mount to the shelf
 shelfMountingHoles = startSketchOn(bracketBody, face = seg03)
@@ -53,7 +53,7 @@ shelfMountingHoles = startSketchOn(bracketBody, face = seg03)
      )
   |> patternLinear2d(instances = 2, distance = -(extBendRadius + shelfMountingHolePlacementOffset) + shelfMountLength - shelfMountingHolePlacementOffset, axis = [-1, 0])
   |> patternLinear2d(instances = 2, distance = width - (shelfMountingHolePlacementOffset * 2), axis = [0, 1])
-  |> extrude(%, length = -thickness - .01)
+  |> extrude(length = -thickness - .01)
 
 // Add mounting holes to mount to the wall
 wallMountingHoles = startSketchOn(bracketBody, face = seg04)
@@ -65,7 +65,7 @@ wallMountingHoles = startSketchOn(bracketBody, face = seg04)
        radius = wallMountingHoleDiameter / 2,
      )
   |> patternLinear2d(instances = 2, distance = width - (wallMountingHolePlacementOffset * 2), axis = [0, 1])
-  |> extrude(%, length = -thickness - 0.1)
+  |> extrude(length = -thickness - 0.1)
 
 // Apply bends
 fillet(bracketBody, radius = extBendRadius, tags = [getNextAdjacentEdge(seg03)])

public/kcl-samples/brake-rotor/main.kcl

@@ -149,27 +149,21 @@ bodyDiscBell = startProfile(
          tDiscHalf * 2 + tVent
        ],
      )
-  |> arc(
-       %,
-       angleStart = -180,
-       angleEnd = 0,
-       radius = wUndercut / 2,
-     )
+  |> arc(angleStart = -180, angleEnd = 0, radius = wUndercut / 2)
   |> line(end = [lDraftExterior, hBellAboveDiscFace])
   |> xLine(length = rOuter, tag = $seg04)
   |> yLine(length = -tBell)
   |> xLine(length = -rInner)
   |> line(end = [-lDraftInterior, -hBellAboveDiscFace])
   |> line(end = [0, -2]) // Wall thickness.
   |> xLine(length = -1 * (tBell + wUndercut))
-  |> close(%)
+  |> close()
   |> revolve(axis = Y)
 
 // Drill lug holes.
 sketchLugs = startSketchOn(bodyDiscBell, face = seg04)
 profileStud = circle(sketchLugs, center = [0, dPitchCircle / 2], radius = dStudDrilling / 2)
   |> patternCircular2d(
-       %,
        instances = nStuds,
        center = [0, 0],
        arcDegrees = 360,

public/kcl-samples/car-wheel-assembly/car-rotor.kcl

@@ -24,13 +24,13 @@ lugHoles = startSketchOn(rotorBump, face = END)
        instances = lugCount,
        rotateDuplicates = true,
      )
-  |> extrude(%, length = -(rotorInnerDiameterThickness + rotorSinglePlateThickness))
+  |> extrude(length = -(rotorInnerDiameterThickness + rotorSinglePlateThickness))
   |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
 
 // (update when boolean is available)
 centerSpacer = startSketchOn(rotor, face = START)
-  |> circle(%, center = [0, 0], radius = .25)
-  |> extrude(%, length = spacerLength)
+  |> circle(center = [0, 0], radius = .25)
+  |> extrude(length = spacerLength)
 
 secondaryRotorSketch = startSketchOn(centerSpacer, face = END)
   |> circle(center = [0, 0], radius = rotorDiameter / 2)

public/kcl-samples/clock/main.kcl

@@ -65,7 +65,7 @@ clockRidge = extrude(profile002, length = ridgeThickness, tagEnd = $capEnd001)
          getCommonEdge(faces = [seg01, capEnd001])
        ],
      )
-  |> appearance(%, color = "#ab4321")
+  |> appearance(color = "#ab4321")
 
 // Create an object that has all of the x and y starting positions of every number
 numberObject = {
@@ -205,19 +205,16 @@ fn letterI(startX, startY) {
   iWidth = 8
   iLength = 40
   return startSketchOn(offsetPlane(XY, offset = 50))
-    |> startProfile(
-         %,
-         at = [
-           startX - (iWidth / 2),
-           startY + iLength / 2
-         ],
-       )
-    |> xLine(%, length = iWidth)
-    |> yLine(%, length = -iLength)
-    |> xLine(%, length = -iWidth)
-    |> close(%)
-    |> extrude(%, length = numberThickness)
-    |> appearance(%, color = "#140f0f")
+    |> startProfile(at = [
+         startX - (iWidth / 2),
+         startY + iLength / 2
+       ])
+    |> xLine(length = iWidth)
+    |> yLine(length = -iLength)
+    |> xLine(length = -iWidth)
+    |> close()
+    |> extrude(length = numberThickness)
+    |> appearance(color = "#140f0f")
 }
 
 // Function for the letter X
@@ -226,49 +223,43 @@ fn letterX(startX, startY) {
   xLength = 40
 
   return startSketchOn(offsetPlane(XY, offset = 50))
-    |> startProfile(
-         %,
-         at = [
-           startX - (xWidth / 2),
-           startY + xLength / 2
-         ],
-       )
-    |> xLine(%, length = xWidth / 6)
-    |> angledLine(%, angle = -70, lengthY = xLength * 1 / 3)
-    |> angledLine(%, angle = 70, lengthY = xLength * 1 / 3)
-    |> xLine(%, length = xWidth / 6)
-    |> angledLine(%, angle = 70 + 180, lengthY = xLength * 1 / 2)
-    |> angledLine(%, angle = -70, lengthY = xLength * 1 / 2)
-    |> xLine(%, length = -xWidth / 6)
-    |> angledLine(%, angle = -70 - 180, lengthY = xLength * 1 / 3)
-    |> angledLine(%, angle = 70 + 180, lengthY = xLength * 1 / 3)
-    |> xLine(%, length = -xWidth / 6)
-    |> angledLine(%, angle = 70, lengthY = xLength * 1 / 2)
-    |> close(%)
-    |> extrude(%, length = numberThickness)
-    |> appearance(%, color = "#140f0f")
+    |> startProfile(at = [
+         startX - (xWidth / 2),
+         startY + xLength / 2
+       ])
+    |> xLine(length = xWidth / 6)
+    |> angledLine(angle = -70, lengthY = xLength * 1 / 3)
+    |> angledLine(angle = 70, lengthY = xLength * 1 / 3)
+    |> xLine(length = xWidth / 6)
+    |> angledLine(angle = 70 + 180, lengthY = xLength * 1 / 2)
+    |> angledLine(angle = -70, lengthY = xLength * 1 / 2)
+    |> xLine(length = -xWidth / 6)
+    |> angledLine(angle = -70 - 180, lengthY = xLength * 1 / 3)
+    |> angledLine(angle = 70 + 180, lengthY = xLength * 1 / 3)
+    |> xLine(length = -xWidth / 6)
+    |> angledLine(angle = 70, lengthY = xLength * 1 / 2)
+    |> close()
+    |> extrude(length = numberThickness)
+    |> appearance(color = "#140f0f")
 }
 
 // Function for the letter V
 fn letterV(startX, startY) {
   vWidth = 25
   vLength = 40
   return startSketchOn(offsetPlane(XY, offset = 50))
-    |> startProfile(
-         %,
-         at = [
-           startX - (vWidth / 2),
-           startY + vLength / 2
-         ],
-       )
-    |> xLine(%, length = vWidth * 1 / 3)
-    |> line(%, end = [vWidth / 6, -vLength / 2])
-    |> line(%, end = [vWidth / 6, vLength / 2])
-    |> xLine(%, length = vWidth * 1 / 3)
-    |> line(%, end = [-vWidth * 1 / 2, -vLength])
-    |> close(%)
-    |> extrude(%, length = numberThickness)
-    |> appearance(%, color = "#140f0f")
+    |> startProfile(at = [
+         startX - (vWidth / 2),
+         startY + vLength / 2
+       ])
+    |> xLine(length = vWidth * 1 / 3)
+    |> line(end = [vWidth / 6, -vLength / 2])
+    |> line(end = [vWidth / 6, vLength / 2])
+    |> xLine(length = vWidth * 1 / 3)
+    |> line(end = [-vWidth * 1 / 2, -vLength])
+    |> close()
+    |> extrude(length = numberThickness)
+    |> appearance(color = "#140f0f")
 }
 
 // Create the numbers on the face of the clock
@@ -326,7 +317,7 @@ letterI(startX = numberObject.twelve.i2[0], startY = numberObject.twelve.i2[1])
 // Create nub for the minute and hour hands
 startSketchOn(clockBody, face = END)
   |> circle(center = [0, 0], diameter = nubDiameter)
-  |> extrude(%, length = numHeight)
+  |> extrude(length = numHeight)
 
 // Create the hour hand
 sketch005 = startSketchOn(offsetPlane(XY, offset = 55))
@@ -338,7 +329,6 @@ profile007 = startProfile(
        ],
      )
   |> arc(
-       %,
        interiorAbsolute = [
          nubDiameter / 2 * 1.375 * cos(hourHandAngle + 180),
          nubDiameter / 2 * 1.375 * sin(hourHandAngle + 180)
@@ -348,30 +338,24 @@ profile007 = startProfile(
          nubDiameter / 2 * 1.375 * sin(hourHandAngle + 340)
        ],
      )
-  |> angledLine(%, angle = hourHandAngle, length = hourHandArmLength)
-  |> angledLine(
-       %,
-       angle = hourHandAngle - 90,
-       length = hourHandWidth / 2,
-       tag = $seg004,
-     )
+  |> angledLine(angle = hourHandAngle, length = hourHandArmLength)
+  |> angledLine(angle = hourHandAngle - 90, length = hourHandWidth / 2, tag = $seg004)
   |> line(
-       %,
        endAbsolute = [
          hourHandLargeDiameter / 2 * cos(hourHandAngle),
          hourHandLargeDiameter / 2 * sin(hourHandAngle)
        ],
        tag = $seg002,
      )
-  |> angledLine(%, angle = segAng(seg002) + 120, length = segLen(seg002))
-  // |> angledLineThatIntersects(%, angle = segAng(seg002) + hourHandAngle - 90, intersectTag = seg004)
-  |> angledLine(%, angle = hourHandAngle - 90, length = segLen(seg004))
-  |> line(%, endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close(%)
+  |> angledLine(angle = segAng(seg002) + 120, length = segLen(seg002))
+  // |> angledLineThatIntersects(angle = segAng(seg002) + hourHandAngle - 90, intersectTag = seg004)
+  |> angledLine(angle = hourHandAngle - 90, length = segLen(seg004))
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
 profile008 = circle(sketch005, center = [0, 0], diameter = nubDiameter)
 subtract2d(profile007, tool = profile008)
-  |> extrude(%, length = 5)
-  |> appearance(%, color = "#404040")
+  |> extrude(length = 5)
+  |> appearance(color = "#404040")
 
 // create the minute hand
 sketch006 = startSketchOn(offsetPlane(XY, offset = 50))
@@ -383,7 +367,6 @@ profile009 = startProfile(
        ],
      )
   |> arc(
-       %,
        interiorAbsolute = [
          nubDiameter / 2 * 1.375 * cos(minuteHandAngle + 180),
          nubDiameter / 2 * 1.375 * sin(minuteHandAngle + 180)
@@ -393,29 +376,23 @@ profile009 = startProfile(
          nubDiameter / 2 * 1.375 * sin(minuteHandAngle + 340)
        ],
      )
-  |> angledLine(%, angle = minuteHandAngle, length = minuteHandArmLength)
-  |> angledLine(
-       %,
-       angle = minuteHandAngle - 90,
-       length = minuteHandWidth / 2,
-       tag = $seg003,
-     )
+  |> angledLine(angle = minuteHandAngle, length = minuteHandArmLength)
+  |> angledLine(angle = minuteHandAngle - 90, length = minuteHandWidth / 2, tag = $seg003)
   |> line(
-       %,
        endAbsolute = [
          minuteHandLargeDiameter / 2 * cos(minuteHandAngle),
          minuteHandLargeDiameter / 2 * sin(minuteHandAngle)
        ],
        tag = $seg005,
      )
-  |> angledLine(%, angle = segAng(seg005) + 120, length = segLen(seg005))
-  |> angledLine(%, angle = minuteHandAngle - 90, length = segLen(seg003))
-  |> line(%, endAbsolute = [profileStartX(%), profileStartY(%)])
-  |> close(%)
+  |> angledLine(angle = segAng(seg005) + 120, length = segLen(seg005))
+  |> angledLine(angle = minuteHandAngle - 90, length = segLen(seg003))
+  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+  |> close()
 profile010 = circle(sketch006, center = [0, 0], diameter = 30)
 subtract2d(profile009, tool = profile010)
-  |> extrude(%, length = 5)
-  |> appearance(%, color = "#404040")
+  |> extrude(length = 5)
+  |> appearance(color = "#404040")
 
 // Define parameters of the screw slot for hanging the clock
 screwHeadDiameter = 9.53
@@ -427,15 +404,10 @@ slotLength = 40
 sketch003 = startSketchOn(clockBody, face = START)
 profile004 = startProfile(sketch003, at = [-slotWidth / 2, 200])
   |> yLine(length = -slotLength)
-  |> arc(
-       %,
-       radius = screwHeadDiameter / 2 + screwTolerance,
-       angleStart = 120,
-       angleEnd = 420,
-     )
-  |> yLine(%, length = slotLength)
+  |> arc(radius = screwHeadDiameter / 2 + screwTolerance, angleStart = 120, angleEnd = 420)
+  |> yLine(length = slotLength)
   |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-  |> extrude(%, length = -20)
+  |> extrude(length = -20)
 
 // todo: create cavity for the screw to slide into (need csg update)

public/kcl-samples/cold-plate/main.kcl

@@ -44,7 +44,7 @@ copperTubePath = startSketchOn(offsetPlane(XY, offset = tubeDiameter))
 // Create the profile for the inner and outer diameter of the hollow copper tube
 tubeWall = startSketchOn(offsetPlane(YZ, offset = -7.35))
   |> circle(center = [-bendRadius * 3, tubeDiameter], radius = tubeDiameter / 2)
-  |> subtract2d(%, tool = circle(center = [-bendRadius * 3, tubeDiameter], radius = tubeDiameter / 2 - wallThickness))
+  |> subtract2d(tool = circle(center = [-bendRadius * 3, tubeDiameter], radius = tubeDiameter / 2 - wallThickness))
   |> sweep(path = copperTubePath)
   |> appearance(color = "#b81b0a")
 

public/kcl-samples/countersunk-plate/main.kcl

@@ -33,7 +33,7 @@ plateBody = startSketchOn(XY)
   |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
   |> subtract2d(tool = circle(center = [0, 0], radius = centerHoleDiameter / 2 * 1.5))
-  |> extrude(%, length = plateThickness)
+  |> extrude(length = plateThickness)
 
 // Function to create a countersunk hole
 fn countersink(@holePosition) {

public/kcl-samples/cpu-cooler/fan.kcl

@@ -10,7 +10,7 @@ import * from "parameters.kcl"
 // Model the center of the fan
 fanCenter = startSketchOn(YZ)
   |> circle(center = [0, 0], radius = fanHeight / 2, tag = $centerBend)
-  |> extrude(%, length = fanHeight)
+  |> extrude(length = fanHeight)
   |> fillet(radius = 1.5, tags = [getOppositeEdge(centerBend)])
 
 // Create a function for a lofted fan blade cross section that rotates about the center hub of the fan

public/kcl-samples/cpu-cooler/heat-sink.kcl

@@ -23,7 +23,6 @@ endTube = startSketchOn(offsetPlane(XY, offset = fanSize + 38))
   |> subtract2d(tool = circle(center = [-20, fanSize / 4], radius = 2.5))
   |> sweep(path = endTubePath)
   |> patternCircular3d(
-       %,
        instances = 2,
        axis = [0, 0, 1],
        center = [0, 0, 0],
@@ -50,19 +49,13 @@ centerTube = startSketchOn(offsetPlane(XY, offset = fanSize + 38))
   |> subtract2d(tool = circle(center = [-4, fanSize / 2.67], radius = 2.5))
   |> sweep(path = centerTubePath)
   |> patternCircular3d(
-       %,
        instances = 2,
        axis = [0, 0, 1],
        center = [-4 * 2, 0, 0],
        arcDegrees = 360,
        rotateDuplicates = true,
      )
-  |> patternLinear3d(
-       %,
-       instances = 2,
-       distance = 4 * 4,
-       axis = [1, 0, 0],
-     )
+  |> patternLinear3d(instances = 2, distance = 4 * 4, axis = [1, 0, 0])
 
 // Draw a heat fin with built-in clips to secure the mounting wire. Pattern the fin upwards by the height of the fan
 heatFins = startSketchOn(offsetPlane(XY, offset = 45))
@@ -80,12 +73,7 @@ heatFins = startSketchOn(offsetPlane(XY, offset = 45))
   |> mirror2d(axis = Y)
   |> close()
   |> extrude(length = 1)
-  |> patternLinear3d(
-       %,
-       instances = 31,
-       distance = (fanSize - 10) / 30,
-       axis = [0, 0, 1],
-     )
+  |> patternLinear3d(instances = 31, distance = (fanSize - 10) / 30, axis = [0, 0, 1])
 
 // Create the mounting base for the CPU cooler. The base should consist of two pieces that secure around each of the tubes at the bottom
 coolerBase = startSketchOn(-XZ)