grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
adrianVmariano 2022-12-01 06:24:13 -05:00 committed by GitHub
commit 1e67739335
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/gen_docs.yml vendored
View file

@ -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

4
.github/workflows/gen_tutorials.yml vendored
View file

@ -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

11
.github/workflows/main.yml vendored
View file

@ -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

2
shapes3d.scad
View file

@ -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.")