diff --git a/.github/workflows/gen_docs.yml b/.github/workflows/gen_docs.yml index 1a07f0c..d2ae1f8 100644 --- a/.github/workflows/gen_docs.yml +++ b/.github/workflows/gen_docs.yml @@ -17,8 +17,8 @@ jobs: - name: Apt Update run: sudo apt update - - name: Install Python dev - run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil gifsicle + - name: Install Required Libraries + run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil gifsicle libfuse2 - name: Install OpenSCAD-DocsGen package. run: sudo pip3 install openscad-docsgen diff --git a/.github/workflows/gen_tutorials.yml b/.github/workflows/gen_tutorials.yml index 606e48f..0c41404 100644 --- a/.github/workflows/gen_tutorials.yml +++ b/.github/workflows/gen_tutorials.yml @@ -17,8 +17,8 @@ jobs: - name: Apt Update run: sudo apt update - - name: Install Python dev - run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil gifsicle + - name: Install Required Libraries + run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil gifsicle libfuse2 - name: Install OpenSCAD-DocsGen package. run: sudo pip3 install openscad-docsgen diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ecc79e4..a23f87b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: Install Required Libraries + run: sudo apt-get install libfuse2 + - name: Install OpenSCAD run: | cd $GITHUB_WORKSPACE @@ -36,8 +39,8 @@ jobs: - name: Apt Update run: sudo apt update - - name: Install Python dev - run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil + - name: Install Required Libraries + run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil libfuse2 - name: Install OpenSCAD-DocsGen package. run: sudo pip3 install openscad-docsgen @@ -77,8 +80,8 @@ jobs: - name: Apt Update run: sudo apt update - - name: Install Python dev - run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil + - name: Install Required Libraries + run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil libfuse2 - name: Install OpenSCAD-DocsGen package. run: sudo pip3 install openscad-docsgen diff --git a/shapes3d.scad b/shapes3d.scad index b214ab3..b6f56a9 100644 --- a/shapes3d.scad +++ b/shapes3d.scad @@ -1429,6 +1429,7 @@ function cyl( : _fromend2? abs(_chamf2) : abs(law_of_sines(a=_chamf2, A=180-chang2-(90+sign(_chamf2)*vang), B=chang2)), facelen = adj_ang_to_hyp(l, abs(vang)), + cp1 = [r1,-l/2], cp2 = [r2,+l/2], roundlen1 = round1 >= 0 ? round1/tan(45-vang/2) @@ -1437,6 +1438,7 @@ function cyl( : round2/tan(45-vang/2), dy1 = abs(_chamf1 ? chamf1l : round1 ? roundlen1 : 0), dy2 = abs(_chamf2 ? chamf2l : round2 ? roundlen2 : 0), + checks2 = assert(is_finite(round1), "rounding1 must be a number if given.") assert(is_finite(round2), "rounding2 must be a number if given.")