grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-01 09:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'revarbat_dev' of github.com:revarbat/BOSL2 into revarbat_dev

Browse source
This commit is contained in:
Garth Minette 2021-03-09 12:24:04 -08:00
commit 50bd361119
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,11 +8,10 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Checkout Wiki - name: Clone Wiki
uses: actions/checkout@v2 run: |
with: cd $GITHUB_WORKSPACE
repository: ${{github.repository}}.wiki git clone https://github.com/revarbat/BOSL2.wiki.git
path: BOSL2.wiki
- name: Install OpenSCAD - name: Install OpenSCAD
run: | run: |
@ -33,11 +32,10 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Checkout Wiki - name: Clone Wiki
uses: actions/checkout@v2 run: |
with: cd $GITHUB_WORKSPACE
repository: ${{github.repository}}.wiki git clone https://github.com/revarbat/BOSL2.wiki.git
path: BOSL2.wiki
- name: Install Python dev - name: Install Python dev
run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil
@ -56,5 +54,5 @@ jobs:
run: | run: |
cd $GITHUB_WORKSPACE cd $GITHUB_WORKSPACE
export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
openscad-docsgen -T *.scad openscad-docsgen -Tm *.scad

7
shapes2d.scad
View file

@ -5,7 +5,6 @@
// include <BOSL2/std.scad> // include <BOSL2/std.scad>
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Section: 2D Drawing Helpers // Section: 2D Drawing Helpers
// Module: stroke() // Module: stroke()
@ -15,7 +14,7 @@
// Topics: Paths (2D), Paths (3D), Drawing Tools // Topics: Paths (2D), Paths (3D), Drawing Tools
// Description: // Description:
// Draws a 2D or 3D path with a given line width. Endcaps can be specified for each end individually. // Draws a 2D or 3D path with a given line width. Endcaps can be specified for each end individually.
// Figure(Med,NoAxes,VPR=[0,0,0],VPD=250): Endcap Types // Figure(Med,NoAxes,2D,VPR=[0,0,0],VPD=250): Endcap Types
// cap_pairs = [ // cap_pairs = [
// ["butt", "chisel" ], // ["butt", "chisel" ],
// ["round", "square" ], // ["round", "square" ],
@ -431,7 +430,7 @@ module stroke(
// Usage: As a Function // Usage: As a Function
// dashes = dashed_stroke(path, dashpat, width=, <closed=>); // dashes = dashed_stroke(path, dashpat, width=, <closed=>);
// Topics: Paths, Drawing Tools // Topics: Paths, Drawing Tools
// See Also: stroke(), path_cut_segs() // See Also: stroke(), path_cut()
// Description: // Description:
// Given a path and a dash pattern, creates a dashed line that follows that // Given a path and a dash pattern, creates a dashed line that follows that
// path with the given dash pattern. // path with the given dash pattern.
@ -467,7 +466,7 @@ function dashed_stroke(path, dashpat=[3,3], closed=false) =
let (st=i*step, x=st+off) let (st=i*step, x=st+off)
if (x>0 && x<plen) x if (x>0 && x<plen) x
], ],
dashes = path_cut_segs(path, cuts, closed=false), dashes = path_cut(path, cuts, closed=false),
evens = [for (i=idx(dashes)) if (i%2==0) dashes[i]] evens = [for (i=idx(dashes)) if (i%2==0) dashes[i]]
) evens; ) evens;