Kwargs migration: arc/arcTo (#6334)
This commit is contained in:
		@ -12,22 +12,10 @@ fn rail8020(originStart, railHeight, railLength) {
 | 
			
		||||
         originStart[0],
 | 
			
		||||
         0.1 * railHeight + originStart[1]
 | 
			
		||||
       ], %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 180,
 | 
			
		||||
         angleEnd = 270,
 | 
			
		||||
         radius = 0.1 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 180,
 | 
			
		||||
         angleEnd = 0,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 180, angleEnd = 270, radius = 0.1 * railHeight)
 | 
			
		||||
    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> xLine(length = 0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 180,
 | 
			
		||||
         angleEnd = 0,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> xLine(length = 0.06 * railHeight, tag = $edge1)
 | 
			
		||||
    |> yLine(length = 0.087 * railHeight, tag = $edge2)
 | 
			
		||||
    |> xLine(length = -0.183 * railHeight, tag = $edge3)
 | 
			
		||||
@ -37,35 +25,15 @@ fn rail8020(originStart, railHeight, railLength) {
 | 
			
		||||
    |> xLine(length = -0.183 * railHeight, tag = $edge7)
 | 
			
		||||
    |> yLine(length = -0.087 * railHeight, tag = $edge8)
 | 
			
		||||
    |> xLine(length = 0.06 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 180,
 | 
			
		||||
         angleEnd = 0,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> xLine(length = 0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 180,
 | 
			
		||||
         angleEnd = 0,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = -90,
 | 
			
		||||
         angleEnd = 0,
 | 
			
		||||
         radius = 0.1 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> arc(angleStart = -90, angleEnd = 0, radius = 0.1 * railHeight)
 | 
			
		||||
 | 
			
		||||
    // Sketch side 2 of profile
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 270,
 | 
			
		||||
         angleEnd = 90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> yLine(length = 0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 270,
 | 
			
		||||
         angleEnd = 90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> yLine(length = 0.06 * railHeight, tag = $edge9)
 | 
			
		||||
    |> xLine(length = -0.087 * railHeight, tag = $edge10)
 | 
			
		||||
    |> yLine(length = -0.183 * railHeight, tag = $edge11) // edge11
 | 
			
		||||
@ -75,35 +43,15 @@ fn rail8020(originStart, railHeight, railLength) {
 | 
			
		||||
    |> yLine(length = -0.183 * railHeight, tag = $edge15) // 15
 | 
			
		||||
    |> xLine(length = 0.087 * railHeight, tag = $edge16)
 | 
			
		||||
    |> yLine(length = 0.06 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 270,
 | 
			
		||||
         angleEnd = 90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> yLine(length = 0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 270,
 | 
			
		||||
         angleEnd = 90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
 | 
			
		||||
    // Sketch side 3 of profile
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 0,
 | 
			
		||||
         angleEnd = 90,
 | 
			
		||||
         radius = 0.1 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 0,
 | 
			
		||||
         angleEnd = -180,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 0, angleEnd = 90, radius = 0.1 * railHeight)
 | 
			
		||||
    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> xLine(length = -0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 0,
 | 
			
		||||
         angleEnd = -180,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> xLine(length = -0.06 * railHeight, tag = $edge17)
 | 
			
		||||
    |> yLine(length = -0.087 * railHeight, tag = $edge18)
 | 
			
		||||
    |> xLine(length = 0.183 * railHeight, tag = $edge19)
 | 
			
		||||
@ -113,35 +61,15 @@ fn rail8020(originStart, railHeight, railLength) {
 | 
			
		||||
    |> xLine(length = 0.183 * railHeight, tag = $edge23)
 | 
			
		||||
    |> yLine(length = 0.087 * railHeight, tag = $edge24)
 | 
			
		||||
    |> xLine(length = -0.06 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 0,
 | 
			
		||||
         angleEnd = -180,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> xLine(length = -0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 0,
 | 
			
		||||
         angleEnd = -180,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 90,
 | 
			
		||||
         angleEnd = 180,
 | 
			
		||||
         radius = 0.1 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> arc(angleStart = 90, angleEnd = 180, radius = 0.1 * railHeight)
 | 
			
		||||
 | 
			
		||||
    // Sketch side 4 of profile
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 90,
 | 
			
		||||
         angleEnd = -90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> yLine(length = -0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 90,
 | 
			
		||||
         angleEnd = -90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> yLine(length = -0.06 * railHeight, tag = $edge25)
 | 
			
		||||
    |> xLine(length = 0.087 * railHeight, tag = $edge26)
 | 
			
		||||
    |> yLine(length = 0.183 * railHeight, tag = $edge27)
 | 
			
		||||
@ -151,17 +79,9 @@ fn rail8020(originStart, railHeight, railLength) {
 | 
			
		||||
    |> yLine(length = 0.183 * railHeight, tag = $edge31)
 | 
			
		||||
    |> xLine(length = -0.087 * railHeight, tag = $edge32)
 | 
			
		||||
    |> yLine(length = -0.06 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 90,
 | 
			
		||||
         angleEnd = -90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> yLine(length = -0.1 * railHeight)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 90,
 | 
			
		||||
         angleEnd = -90,
 | 
			
		||||
         radius = 0.072 / 4 * railHeight
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
 | 
			
		||||
    |> close()
 | 
			
		||||
 | 
			
		||||
    // Sketch center hole of profile
 | 
			
		||||
 | 
			
		||||
@ -39,38 +39,34 @@ fn fanBlade(offsetHeight, startAngle) {
 | 
			
		||||
         15 * cos(toRadians(startAngle)),
 | 
			
		||||
         15 * sin(toRadians(startAngle))
 | 
			
		||||
       ], %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = startAngle,
 | 
			
		||||
         angleEnd = startAngle + 14,
 | 
			
		||||
         radius = 15
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arcTo({
 | 
			
		||||
         end = [
 | 
			
		||||
    |> arc(angleStart = startAngle, angleEnd = startAngle + 14, radius = 15)
 | 
			
		||||
    |> arc(
 | 
			
		||||
         endAbsolute = [
 | 
			
		||||
           fanSize * 22 / 50 * cos(toRadians(startAngle - 20)),
 | 
			
		||||
           fanSize * 22 / 50 * sin(toRadians(startAngle - 20))
 | 
			
		||||
         ],
 | 
			
		||||
         interior = [
 | 
			
		||||
         interiorAbsolute = [
 | 
			
		||||
           fanSize * 11 / 50 * cos(toRadians(startAngle + 3)),
 | 
			
		||||
           fanSize * 11 / 50 * sin(toRadians(startAngle + 3))
 | 
			
		||||
         ]
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arcTo({
 | 
			
		||||
         end = [
 | 
			
		||||
         ],
 | 
			
		||||
       )
 | 
			
		||||
    |> arc(
 | 
			
		||||
         endAbsolute = [
 | 
			
		||||
           fanSize * 22 / 50 * cos(toRadians(startAngle - 24)),
 | 
			
		||||
           fanSize * 22 / 50 * sin(toRadians(startAngle - 24))
 | 
			
		||||
         ],
 | 
			
		||||
         interior = [
 | 
			
		||||
         interiorAbsolute = [
 | 
			
		||||
           fanSize * 22 / 50 * cos(toRadians(startAngle - 22)),
 | 
			
		||||
           fanSize * 22 / 50 * sin(toRadians(startAngle - 22))
 | 
			
		||||
         ]
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arcTo({
 | 
			
		||||
         end = [profileStartX(%), profileStartY(%)],
 | 
			
		||||
         interior = [
 | 
			
		||||
         ],
 | 
			
		||||
       )
 | 
			
		||||
    |> arc(
 | 
			
		||||
         endAbsolute = [profileStartX(%), profileStartY(%)],
 | 
			
		||||
         interiorAbsolute = [
 | 
			
		||||
           fanSize * 11 / 50 * cos(toRadians(startAngle - 5)),
 | 
			
		||||
           fanSize * 11 / 50 * sin(toRadians(startAngle - 5))
 | 
			
		||||
         ]
 | 
			
		||||
       }, %)
 | 
			
		||||
         ],
 | 
			
		||||
       )
 | 
			
		||||
    |> close()
 | 
			
		||||
  return fanBlade
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -27,11 +27,7 @@ insideWall = extrude(insideWallSketch, length = overallThickness)
 | 
			
		||||
// Create the sketch of one of the balls
 | 
			
		||||
ballsSketch = startSketchOn(XY)
 | 
			
		||||
  |> startProfileAt([shaftDia / 2 + wallThickness, 0.001], %)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 0,
 | 
			
		||||
       angleStart = 180,
 | 
			
		||||
       radius = sphereDia / 2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 180, angleEnd = 0, radius = sphereDia / 2)
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
// Revolve the ball to make a sphere and pattern around the inside wall
 | 
			
		||||
@ -50,11 +46,7 @@ chainSketch = startSketchOn(XY)
 | 
			
		||||
       shaftDia / 2 + wallThickness + sphereDia / 2 - (chainWidth / 2),
 | 
			
		||||
       0.125 * sin(toRadians(60))
 | 
			
		||||
     ], %)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 60,
 | 
			
		||||
       angleStart = 120,
 | 
			
		||||
       radius = sphereDia / 2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 120, angleEnd = 60, radius = sphereDia / 2)
 | 
			
		||||
  |> line(end = [0, chainThickness])
 | 
			
		||||
  |> line(end = [-chainWidth, 0])
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
@ -107,11 +107,7 @@ fn armRestPath(plane) {
 | 
			
		||||
  sketch005 = startSketchOn(plane)
 | 
			
		||||
    |> startProfileAt([20, 33], %)
 | 
			
		||||
    |> xLine(length = -20)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 90,
 | 
			
		||||
         angleEnd = 180,
 | 
			
		||||
         radius = 10
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 90, angleEnd = 180, radius = 10)
 | 
			
		||||
  return sketch005
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -16,10 +16,7 @@ wallThickness = 4
 | 
			
		||||
bottleBody = startSketchOn(XY)
 | 
			
		||||
  |> startProfileAt([-bottleLength / 2, 0], %)
 | 
			
		||||
  |> yLine(length = bottleWidth / 3)
 | 
			
		||||
  |> arcTo({
 | 
			
		||||
       end = [bottleLength / 2, bottleWidth / 3],
 | 
			
		||||
       interior = [0, bottleWidth / 2]
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(endAbsolute = [bottleLength / 2, bottleWidth / 3], interiorAbsolute = [0, bottleWidth / 2])
 | 
			
		||||
  |> yLine(endAbsolute = 0)
 | 
			
		||||
  |> mirror2d(axis = X)
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
@ -14,11 +14,7 @@ fn cycloidalGear(gearPitch, gearHeight, holeDiameter, helixAngle) {
 | 
			
		||||
           gearPitch * 1.55 * cos(toRadians(helixAngleP)) + gearPitch * sin(toRadians(-helixAngleP)),
 | 
			
		||||
           gearPitch * 1.55 * sin(toRadians(helixAngleP)) + gearPitch * cos(toRadians(-helixAngleP))
 | 
			
		||||
         ], %)
 | 
			
		||||
      |> arc({
 | 
			
		||||
           angleStart = 90 + helixAngleP,
 | 
			
		||||
           angleEnd = -90 + helixAngleP,
 | 
			
		||||
           radius = gearPitch
 | 
			
		||||
         }, %)
 | 
			
		||||
      |> arc(angleStart = 90 + helixAngleP, angleEnd = -90 + helixAngleP, radius = gearPitch)
 | 
			
		||||
      |> tangentialArc(radius = gearPitch * 1.67, angle = 60)
 | 
			
		||||
      |> tangentialArc(radius = gearPitch, angle = -180)
 | 
			
		||||
      |> tangentialArc(radius = gearPitch * 1.67, angle = 60)
 | 
			
		||||
 | 
			
		||||
@ -51,11 +51,7 @@ flipperProfile = startProfileAt([-flipperLength, -32.0], flipperSketch)
 | 
			
		||||
  |> line(end = [flipperLength, 2.0])
 | 
			
		||||
  |> yLine(length = 60.0, tag = $backEdge)
 | 
			
		||||
  |> line(end = [-flipperLength, 2.0])
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 196.912390,
 | 
			
		||||
       angleStart = 163.087610,
 | 
			
		||||
       radius = 110.0
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 163.087610, angleEnd = 196.912390, radius = 110.0)
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
// Create a profile of the middle
 | 
			
		||||
@ -126,29 +122,13 @@ gripSketch = startSketchOn(handlePlane)
 | 
			
		||||
// Create a profile of the grip
 | 
			
		||||
gripProfile = startProfileAt([-26.806746, -10.0], gripSketch)
 | 
			
		||||
  |> xLine(length = gripWidth - (2 * gripFilletRadius))
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = -90.0,
 | 
			
		||||
       angleEnd = 0.0,
 | 
			
		||||
       radius = gripFilletRadius
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = -90.0, angleEnd = 0.0, radius = gripFilletRadius)
 | 
			
		||||
  |> yLine(length = gripHeight - (2 * gripFilletRadius))
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 0.0,
 | 
			
		||||
       angleEnd = 90.0,
 | 
			
		||||
       radius = gripFilletRadius
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 0.0, angleEnd = 90.0, radius = gripFilletRadius)
 | 
			
		||||
  |> xLine(length = -(gripWidth - (2 * gripFilletRadius)))
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 90.0,
 | 
			
		||||
       angleEnd = 180.0,
 | 
			
		||||
       radius = gripFilletRadius
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 90.0, angleEnd = 180.0, radius = gripFilletRadius)
 | 
			
		||||
  |> yLine(length = -(gripHeight - (2 * gripFilletRadius)), tag = $gripEdgeTop)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 180.0,
 | 
			
		||||
       angleEnd = 270.0,
 | 
			
		||||
       radius = gripFilletRadius
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 180.0, angleEnd = 270.0, radius = gripFilletRadius)
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
// Extrude the grip profile to create the grip
 | 
			
		||||
 | 
			
		||||
@ -32,43 +32,19 @@ sketch002 = startSketchOn(plane001)
 | 
			
		||||
  |> startProfileAt([carafeDiameter / 2, 5.7], %)
 | 
			
		||||
  |> xLine(length = 0.1)
 | 
			
		||||
  |> yLine(length = -5.2, tag = $edge1)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 180,
 | 
			
		||||
       angleEnd = 205,
 | 
			
		||||
       radius = 0.3
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 180, angleEnd = 205, radius = 0.3)
 | 
			
		||||
  |> angledLine(angle = -60, length = 0.6, tag = $edge2)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 30,
 | 
			
		||||
       angleEnd = -120,
 | 
			
		||||
       radius = 0.6
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 30, angleEnd = -120, radius = 0.6)
 | 
			
		||||
  |> angledLine(angle = 150, endAbsoluteY = -0.2, tag = $edge3)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 60,
 | 
			
		||||
       angleEnd = 90,
 | 
			
		||||
       radius = 0.5
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 60, angleEnd = 90, radius = 0.5)
 | 
			
		||||
  |> xLine(endAbsolute = 0.1, tag = $edgeLen)
 | 
			
		||||
  |> yLine(length = 0.1)
 | 
			
		||||
  |> xLine(length = segLen(edgeLen) + 0.035, tag = $edge4)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 90,
 | 
			
		||||
       angleEnd = 60,
 | 
			
		||||
       radius = 0.6
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 90, angleEnd = 60, radius = 0.6)
 | 
			
		||||
  |> angledLine(angle = 150, length = -segLen(edge3) + 0.035, tag = $edge5)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = -120,
 | 
			
		||||
       angleEnd = 30,
 | 
			
		||||
       radius = 0.5
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = -120, angleEnd = 30, radius = 0.5)
 | 
			
		||||
  |> angledLine(angle = -60, length = -segLen(edge2) + 0.035, tag = $edge6)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 205,
 | 
			
		||||
       angleEnd = 180,
 | 
			
		||||
       radius = 0.6
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 205, angleEnd = 180, radius = 0.6)
 | 
			
		||||
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
			
		||||
  |> close()
 | 
			
		||||
  |> extrude(length = 0.75)
 | 
			
		||||
@ -89,11 +65,7 @@ extrude001 = extrude(sketch003, length = 0.050)
 | 
			
		||||
sketch004 = startSketchOn(extrude001, face = END)
 | 
			
		||||
  |> startProfileAt([0.3, 0.17], %)
 | 
			
		||||
  |> yLine(length = 1.2)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 90,
 | 
			
		||||
       angleEnd = -30,
 | 
			
		||||
       radius = 1.2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 90, angleEnd = -30, radius = 1.2)
 | 
			
		||||
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
			
		||||
  |> close()
 | 
			
		||||
  |> patternCircular2d(
 | 
			
		||||
 | 
			
		||||
@ -63,11 +63,7 @@ fn rightInvolute(i, sg) {
 | 
			
		||||
start = startSketchOn(XY)
 | 
			
		||||
  |> startProfileAt([xs[101], ys[101]], %)
 | 
			
		||||
teeth = reduce([0..100], start, leftInvolute)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 0,
 | 
			
		||||
       angleEnd = toothAngle,
 | 
			
		||||
       radius = baseDiameter / 2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 0, angleEnd = toothAngle, radius = baseDiameter / 2)
 | 
			
		||||
  |> reduce([1..101], %, rightInvolute)
 | 
			
		||||
  |> close()
 | 
			
		||||
  |> extrude(length = gearHeight)
 | 
			
		||||
@ -95,15 +91,7 @@ keyWay = startSketchOn(body, face = END)
 | 
			
		||||
  |> xLine(length = keywayDepth)
 | 
			
		||||
  |> yLine(length = -keywayWidth)
 | 
			
		||||
  |> xLine(length = -keywayDepth)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 180,
 | 
			
		||||
       angleStart = -1 * toDegrees(startAngle) + 360,
 | 
			
		||||
       radius = holeRadius
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = toDegrees(startAngle),
 | 
			
		||||
       angleStart = 180,
 | 
			
		||||
       radius = holeRadius
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = -1 * toDegrees(startAngle) + 360, angleEnd = 180, radius = holeRadius)
 | 
			
		||||
  |> arc(angleStart = 180, angleEnd = toDegrees(startAngle), radius = holeRadius)
 | 
			
		||||
  |> close()
 | 
			
		||||
  |> extrude(length = -gearHeight)
 | 
			
		||||
 | 
			
		||||
@ -91,35 +91,19 @@ fn magnetCenterCutout(plane) {
 | 
			
		||||
         2 * magOuterDiam
 | 
			
		||||
       ], %)
 | 
			
		||||
    |> xLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 90.0,
 | 
			
		||||
         angleEnd = 0.0,
 | 
			
		||||
         radius = magOuterDiam / 2
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 90.0, angleEnd = 0.0, radius = magOuterDiam / 2)
 | 
			
		||||
    |> yLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
 | 
			
		||||
    |> xLine(length = binLength - (4 * magOuterDiam))
 | 
			
		||||
    |> yLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 180.0,
 | 
			
		||||
         angleEnd = 90.0,
 | 
			
		||||
         radius = magOuterDiam / 2
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 180.0, angleEnd = 90.0, radius = magOuterDiam / 2)
 | 
			
		||||
    |> xLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
 | 
			
		||||
    |> yLine(length = binLength - (4 * magOuterDiam))
 | 
			
		||||
    |> xLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 270.0,
 | 
			
		||||
         angleEnd = 180.0,
 | 
			
		||||
         radius = magOuterDiam / 2
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 270.0, angleEnd = 180.0, radius = magOuterDiam / 2)
 | 
			
		||||
    |> yLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
 | 
			
		||||
    |> xLine(length = -(binLength - (4 * magOuterDiam)), tag = $line012)
 | 
			
		||||
    |> yLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 360.0,
 | 
			
		||||
         angleEnd = 270.0,
 | 
			
		||||
         radius = magOuterDiam / 2
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 360.0, angleEnd = 270.0, radius = magOuterDiam / 2)
 | 
			
		||||
    |> xLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
 | 
			
		||||
    |> yLine(length = -(binLength - (4 * magOuterDiam)))
 | 
			
		||||
    |> close()
 | 
			
		||||
 | 
			
		||||
@ -179,11 +179,12 @@ fn lipFace(plane) {
 | 
			
		||||
    |> startProfileAt([0, 0], %)
 | 
			
		||||
    // |> yLine(length = lipHeight, tag = $line100)
 | 
			
		||||
    |> line(end = [0.0, 5.792893], tag = $line000)
 | 
			
		||||
    |> arc({
 | 
			
		||||
    |> arc(
 | 
			
		||||
         angleStart = 180.0,
 | 
			
		||||
         angleEnd = 45.0,
 | 
			
		||||
         radius = 0.500000
 | 
			
		||||
       }, %, $arc000)
 | 
			
		||||
         radius = 0.500000,
 | 
			
		||||
         tag = $arc000,
 | 
			
		||||
       )
 | 
			
		||||
    // |> angledLine(angle = -45, lengthY = lipStep5 )
 | 
			
		||||
    |> line(end = [1.046447, -1.046447], tag = $line001)
 | 
			
		||||
    |> yLine(length = -lipStep4)
 | 
			
		||||
 | 
			
		||||
@ -66,11 +66,7 @@ plane001 = {
 | 
			
		||||
fn keyFn(originStart, keyWidth, keyHeight, repeats, color) {
 | 
			
		||||
  sketch002 = startSketchOn(plane001)
 | 
			
		||||
  profile002 = startProfileAt([originStart[0], originStart[1]], sketch002)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 180,
 | 
			
		||||
         angleEnd = 270,
 | 
			
		||||
         radius = 0.1
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 180, angleEnd = 270, radius = 0.1)
 | 
			
		||||
    |> angledLine(angle = 0, length = keyWidth - .2, tag = $rectangleSegmentA001)
 | 
			
		||||
    |> tangentialArc(radius = 0.1, angle = 90)
 | 
			
		||||
    |> angledLine(angle = segAng(rectangleSegmentA001) + 90, length = keyHeight - .2, tag = $rectangleSegmentB001)
 | 
			
		||||
@ -167,17 +163,9 @@ fn o(origin, scale, depth) {
 | 
			
		||||
         .788 * scale + origin[0],
 | 
			
		||||
         .921 * scale + origin[1]
 | 
			
		||||
       ], %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 + 6,
 | 
			
		||||
         angleEnd = 47.15 - 6 + 180,
 | 
			
		||||
         radius = .525 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 + 6, angleEnd = 47.15 - 6 + 180, radius = .525 * scale)
 | 
			
		||||
    |> angledLine(angle = 47.15, length = .24 * scale)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 - 11 + 180,
 | 
			
		||||
         angleEnd = 47.15 + 11,
 | 
			
		||||
         radius = .288 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 - 11 + 180, angleEnd = 47.15 + 11, radius = .288 * scale)
 | 
			
		||||
    |> close()
 | 
			
		||||
    |> extrude(length = -depth)
 | 
			
		||||
    |> appearance(color = baseColor)
 | 
			
		||||
@ -187,17 +175,9 @@ fn o(origin, scale, depth) {
 | 
			
		||||
         .16 * scale + origin[0],
 | 
			
		||||
         .079 * scale + origin[1]
 | 
			
		||||
       ], %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 + 6 - 180,
 | 
			
		||||
         angleEnd = 47.15 - 6,
 | 
			
		||||
         radius = .525 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 + 6 - 180, angleEnd = 47.15 - 6, radius = .525 * scale)
 | 
			
		||||
    |> angledLine(angle = 47.15, length = -.24 * scale)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 - 11,
 | 
			
		||||
         angleEnd = 47.15 + 11 - 180,
 | 
			
		||||
         radius = .288 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 - 11, angleEnd = 47.15 + 11 - 180, radius = .288 * scale)
 | 
			
		||||
    |> close()
 | 
			
		||||
    |> extrude(length = -depth)
 | 
			
		||||
    |> appearance(color = baseColor)
 | 
			
		||||
 | 
			
		||||
@ -58,18 +58,15 @@ fn mirrorFn(plane, offsetX, offsetY, altitude, radius, tiefe, gestellR, gestellD
 | 
			
		||||
 | 
			
		||||
  archBody = startProfileAt([offsetX - gestellR, altitude], armPlane)
 | 
			
		||||
    |> xLine(length = gestellD)
 | 
			
		||||
    |> arcTo({
 | 
			
		||||
         interior = [offsetX, altitude - gestellR],
 | 
			
		||||
         end = [offsetX + gestellR, altitude]
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(interiorAbsolute = [offsetX, altitude - gestellR], endAbsolute = [offsetX + gestellR, altitude])
 | 
			
		||||
    |> xLine(length = gestellD)
 | 
			
		||||
    |> arcTo({
 | 
			
		||||
         interior = [
 | 
			
		||||
    |> arc(
 | 
			
		||||
         interiorAbsolute = [
 | 
			
		||||
           offsetX,
 | 
			
		||||
           altitude - gestellR - gestellD
 | 
			
		||||
         ],
 | 
			
		||||
         end = [profileStartX(%), profileStartY(%)]
 | 
			
		||||
       }, %)
 | 
			
		||||
         endAbsolute = [profileStartX(%), profileStartY(%)],
 | 
			
		||||
       )
 | 
			
		||||
    |> close()
 | 
			
		||||
    |> extrude(length = tiefe)
 | 
			
		||||
  return armBody
 | 
			
		||||
 | 
			
		||||
@ -11,17 +11,9 @@ sketch011 = startSketchOn(plane003)
 | 
			
		||||
       1.75 - (axisJ2ArmWidth / 2 * sin(toRadians(axisJ2))),
 | 
			
		||||
       8 + axisJ2ArmWidth / 2 * cos(toRadians(axisJ2))
 | 
			
		||||
     ], %)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 90 + axisJ2,
 | 
			
		||||
       angleEnd = 270 + axisJ2,
 | 
			
		||||
       radius = axisJ2ArmWidth / 2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 90 + axisJ2, angleEnd = 270 + axisJ2, radius = axisJ2ArmWidth / 2)
 | 
			
		||||
  |> angledLine(angle = axisJ2, length = axisJ2ArmLength)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = -90 + axisJ2,
 | 
			
		||||
       angleEnd = 90 + axisJ2,
 | 
			
		||||
       radius = axisJ2ArmWidth / 2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = -90 + axisJ2, angleEnd = 90 + axisJ2, radius = axisJ2ArmWidth / 2)
 | 
			
		||||
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
			
		||||
  |> close()
 | 
			
		||||
extrude011 = extrude(sketch011, length = -axisJ2ArmThickness)
 | 
			
		||||
 | 
			
		||||
@ -11,17 +11,9 @@ sketch017 = startSketchOn(plane002)
 | 
			
		||||
       1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)) - (axisJ3CArmWidth / 2 * sin(toRadians(axisJ3C))),
 | 
			
		||||
       8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmWidth / 2 * cos(toRadians(axisJ3C))
 | 
			
		||||
     ], %)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 90 + axisJ3C,
 | 
			
		||||
       angleEnd = 270 + axisJ3C,
 | 
			
		||||
       radius = axisJ3CArmWidth / 2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 90 + axisJ3C, angleEnd = 270 + axisJ3C, radius = axisJ3CArmWidth / 2)
 | 
			
		||||
  |> angledLine(angle = axisJ3C, length = axisJ3CArmLength)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 270 + axisJ3C,
 | 
			
		||||
       angleEnd = 90 + axisJ3C,
 | 
			
		||||
       radius = axisJ3CArmWidth / 2
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 270 + axisJ3C, angleEnd = 90 + axisJ3C, radius = axisJ3CArmWidth / 2)
 | 
			
		||||
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg01)
 | 
			
		||||
  |> close()
 | 
			
		||||
extrude017 = extrude(sketch017, length = axisJ3CArmThickness)
 | 
			
		||||
@ -97,11 +89,7 @@ sketch023 = startSketchOn(extrude022, face = START)
 | 
			
		||||
       8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C))
 | 
			
		||||
     ], %)
 | 
			
		||||
  |> angledLine(angle = axisJ3C + axisJ4 / 2, length = grabberLength / 4)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 150 + axisJ3C + axisJ4 / 2,
 | 
			
		||||
       angleEnd = 30 + axisJ3C + axisJ4 / 2,
 | 
			
		||||
       radius = grabberLength / 3
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 150 + axisJ3C + axisJ4 / 2, angleEnd = 30 + axisJ3C + axisJ4 / 2, radius = grabberLength / 3)
 | 
			
		||||
  |> angledLine(angle = axisJ3C + axisJ4 / 2, length = grabberLength / 6)
 | 
			
		||||
  |> angledLine(angle = axisJ3C + axisJ4 / 2 + 132, length = grabberLength / 3.5)
 | 
			
		||||
  |> angledLine(angle = axisJ3C + axisJ4 / 2 + 160, length = grabberLength / 3.5)
 | 
			
		||||
@ -118,11 +106,7 @@ sketch024 = startSketchOn(extrude022, face = START)
 | 
			
		||||
       8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C))
 | 
			
		||||
     ], %)
 | 
			
		||||
  |> angledLine(angle = axisJ3C - (axisJ4 / 2), length = grabberLength / 4)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 210 + axisJ3C - (axisJ4 / 2),
 | 
			
		||||
       angleEnd = 330 + axisJ3C - (axisJ4 / 2),
 | 
			
		||||
       radius = grabberLength / 3
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 210 + axisJ3C - (axisJ4 / 2), angleEnd = 330 + axisJ3C - (axisJ4 / 2), radius = grabberLength / 3)
 | 
			
		||||
  |> angledLine(angle = axisJ3C - (axisJ4 / 2), length = grabberLength / 6)
 | 
			
		||||
  |> angledLine(angle = axisJ3C - (axisJ4 / 2) - 132, length = grabberLength / 3.5)
 | 
			
		||||
  |> angledLine(angle = axisJ3C - (axisJ4 / 2) - 160, length = grabberLength / 3.5)
 | 
			
		||||
 | 
			
		||||
@ -15,11 +15,7 @@ extrude005 = extrude(sketch005, length = 1.5 - 0.1)
 | 
			
		||||
sketch006 = startSketchOn(plane002)
 | 
			
		||||
  |> startProfileAt([3.5, baseHeight], %)
 | 
			
		||||
  |> angledLine(angle = 60, length = 1.75)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = -30,
 | 
			
		||||
       angleEnd = -30 + 180,
 | 
			
		||||
       radius = 3
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = -30, angleEnd = -30 + 180, radius = 3)
 | 
			
		||||
  |> angledLine(angle = 60, endAbsoluteY = baseHeight)
 | 
			
		||||
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
@ -21,11 +21,12 @@ distanceToInsideEdge = slateWidthHalf + templateThickness + templateGap
 | 
			
		||||
sketch001 = startSketchOn(XZ)
 | 
			
		||||
  |> startProfileAt([0, depth + templateGap], %)
 | 
			
		||||
  |> xLine(length = slateWidthHalf - radius, tag = $seg01)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 0,
 | 
			
		||||
  |> arc(
 | 
			
		||||
       angleStart = 90,
 | 
			
		||||
       radius = 10 + templateGap
 | 
			
		||||
     }, %, $seg09)
 | 
			
		||||
       angleEnd = 0,
 | 
			
		||||
       radius = 10 + templateGap,
 | 
			
		||||
       tag = $seg09,
 | 
			
		||||
     )
 | 
			
		||||
  |> yLine(endAbsolute = -templateThickness, tag = $seg03)
 | 
			
		||||
  |> xLine(length = templateThickness, tag = $seg07)
 | 
			
		||||
  |> yLine(endAbsolute = (segEndY(seg01) + templateThickness) / 2 - templateThickness, tag = $seg02)
 | 
			
		||||
@ -42,11 +43,7 @@ sketch001 = startSketchOn(XZ)
 | 
			
		||||
  |> yLine(length = -segLen(seg02))
 | 
			
		||||
  |> xLine(length = segLen(seg07))
 | 
			
		||||
  |> yLine(length = segLen(seg03))
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 90,
 | 
			
		||||
       angleStart = 180,
 | 
			
		||||
       radius = 10 + templateGap
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 180, angleEnd = 90, radius = 10 + templateGap)
 | 
			
		||||
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -22,11 +22,7 @@ length002 = depth + minClampingDistance
 | 
			
		||||
sketch001 = startSketchOn(XZ)
 | 
			
		||||
  |> startProfileAt([0, depth - templateGap], %)
 | 
			
		||||
  |> xLine(length = length001, tag = $seg01)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 0,
 | 
			
		||||
       angleStart = 90,
 | 
			
		||||
       radius = radius - templateGap
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 90, angleEnd = 0, radius = radius - templateGap)
 | 
			
		||||
  |> yLine(endAbsolute = -templateGap * 2 - (templateDiameter / 2), tag = $seg05)
 | 
			
		||||
  |> xLine(endAbsolute = slateWidthHalf + templateThickness, tag = $seg04)
 | 
			
		||||
  |> yLine(length = -length002, tag = $seg03)
 | 
			
		||||
@ -36,11 +32,7 @@ sketch001 = startSketchOn(XZ)
 | 
			
		||||
  |> yLine(length = segLen(seg03))
 | 
			
		||||
  |> xLine(length = segLen(seg04))
 | 
			
		||||
  |> yLine(length = segLen(seg05))
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleEnd = 90,
 | 
			
		||||
       angleStart = 180,
 | 
			
		||||
       radius = radius - templateGap
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 180, angleEnd = 90, radius = radius - templateGap)
 | 
			
		||||
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
			
		||||
  |> close()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -12,11 +12,7 @@ startSketchOn(XZ)
 | 
			
		||||
  |> startProfileAt([0.0001, 0], %)
 | 
			
		||||
  |> xLine(length = knobDiameter / 2)
 | 
			
		||||
  |> yLine(length = knobHeight - 0.05)
 | 
			
		||||
  |> arc({
 | 
			
		||||
       angleStart = 0,
 | 
			
		||||
       angleEnd = 90,
 | 
			
		||||
       radius = .05
 | 
			
		||||
     }, %)
 | 
			
		||||
  |> arc(angleStart = 0, angleEnd = 90, radius = .05)
 | 
			
		||||
  |> xLine(endAbsolute = 0.0001)
 | 
			
		||||
  |> close()
 | 
			
		||||
  |> revolve(axis = Y)
 | 
			
		||||
 | 
			
		||||
@ -33,17 +33,9 @@ export fn oLogo(surface, origin, scale) {
 | 
			
		||||
         .788 * scale + origin[0],
 | 
			
		||||
         .921 * scale + origin[1]
 | 
			
		||||
       ], %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 + 6,
 | 
			
		||||
         angleEnd = 47.15 - 6 + 180,
 | 
			
		||||
         radius = .525 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 + 6, angleEnd = 47.15 - 6 + 180, radius = .525 * scale)
 | 
			
		||||
    |> angledLine(angle = 47.15, length = .24 * scale)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 - 11 + 180,
 | 
			
		||||
         angleEnd = 47.15 + 11,
 | 
			
		||||
         radius = .288 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 - 11 + 180, angleEnd = 47.15 + 11, radius = .288 * scale)
 | 
			
		||||
    |> close()
 | 
			
		||||
  return oSketch001
 | 
			
		||||
}
 | 
			
		||||
@ -54,17 +46,9 @@ export fn oLogo2(surface, origin, scale) {
 | 
			
		||||
         .16 * scale + origin[0],
 | 
			
		||||
         .079 * scale + origin[1]
 | 
			
		||||
       ], %)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 + 6 - 180,
 | 
			
		||||
         angleEnd = 47.15 - 6,
 | 
			
		||||
         radius = .525 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 + 6 - 180, angleEnd = 47.15 - 6, radius = .525 * scale)
 | 
			
		||||
    |> angledLine(angle = 47.15, length = -.24 * scale)
 | 
			
		||||
    |> arc({
 | 
			
		||||
         angleStart = 47.15 - 11,
 | 
			
		||||
         angleEnd = 47.15 + 11 - 180,
 | 
			
		||||
         radius = .288 * scale
 | 
			
		||||
       }, %)
 | 
			
		||||
    |> arc(angleStart = 47.15 - 11, angleEnd = 47.15 + 11 - 180, radius = .288 * scale)
 | 
			
		||||
    |> close()
 | 
			
		||||
  return oSketch002
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user