From 19e064fea33ef855b6650478f61b4ce379174c1f Mon Sep 17 00:00:00 2001 From: Revar Desmera Date: Thu, 2 Nov 2023 19:39:22 -0700 Subject: [PATCH] catenary_path() renamed to catenary() --- .github/workflows/main.yml | 19 ++++++------------- drawing.scad | 18 +++++++++--------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c371df3..ec3658d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,19 +5,12 @@ jobs: VersionCheck: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Fetch Origin - run: | - cd $GITHUB_WORKSPACE - git fetch origin master - - - name: Verify Version Change - run: | - cd $GITHUB_WORKSPACE - verstr=$(git diff --summary FETCH_HEAD version.scad | grep '^BOSL_VERSION') - [ "$verstr" != "" ] + - name: Check Version + uses: JJ/github-pr-contains-action@releases/v11 + with: + github-token: ${{github.token}} + diffContains: '^BOSL_VERSION' + waivedUsers: ["dependabot[bot]"] Regressions: runs-on: ubuntu-latest diff --git a/drawing.scad b/drawing.scad index 3e2f6f9..bb75ecf 100644 --- a/drawing.scad +++ b/drawing.scad @@ -863,13 +863,13 @@ module arc(n, r, angle, d, cp, points, corner, width, thickness, start, wedge=fa } -// Function: catenary_path() +// Function: catenary() // Synopsis: Returns a 2D Catenary chain or arch path. // SynTags: Path // Topics: Paths // See Also: circle(), stroke() // Usage: -// path = catenary_path(width, droop=|angle=, n=); +// path = catenary(width, droop=|angle=, n=); // Description: // Returns a 2D Catenary path, which is the path a chain held at both ends will take. // The path will have the endpoints at `[±width/2, 0]`, and the middle of the path will droop @@ -882,19 +882,19 @@ module arc(n, r, angle, d, cp, points, corner, width, thickness, start, wedge=fa // --- // angle = If given, specifies the angle that the path will droop by at the endpoints. If given a negative value, returns an arch *above* the Y axis. // Example(2D): By Droop -// stroke(catenary_path(100, droop=30)); +// stroke(catenary(100, droop=30)); // Example(2D): By Angle -// stroke(catenary_path(100, angle=30)); +// stroke(catenary(100, angle=30)); // Example(2D): Upwards Arch by Angle -// stroke(catenary_path(100, angle=30)); +// stroke(catenary(100, angle=30)); // Example(2D): Upwards Arch by Height Delta -// stroke(catenary_path(100, droop=-30)); +// stroke(catenary(100, droop=-30)); // Example(2D): Specifying Vertex Count -// stroke(catenary_path(100, angle=-85, n=11), dots="dot"); +// stroke(catenary(100, angle=-85, n=11), dots="dot"); // Example: Sweeping a Catenary Path -// path = xrot(90, p=path3d(catenary_path(100, droop=20, n=41))); +// path = xrot(90, p=path3d(catenary(100, droop=20, n=41))); // path_sweep(circle(r=1.5, $fn=24), path); -function catenary_path(width, droop, n=100, angle) = +function catenary(width, droop, n=100, angle) = assert(one_defined([droop, angle],"droop,angle")) let( sgn = is_undef(droop)? sign(angle) : sign(droop),