mirror of
https://github.com/BelfrySCAD/BOSL2.git
synced 2024-12-29 16:29:40 +00:00
Merge branch 'revarbat_dev' of github.com:revarbat/BOSL2 into revarbat_dev
This commit is contained in:
commit
50bd361119
2 changed files with 12 additions and 15 deletions
20
.github/workflows/main.yml
vendored
20
.github/workflows/main.yml
vendored
|
@ -8,11 +8,10 @@ jobs:
|
|||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Checkout Wiki
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
repository: ${{github.repository}}.wiki
|
||||
path: BOSL2.wiki
|
||||
- name: Clone Wiki
|
||||
run: |
|
||||
cd $GITHUB_WORKSPACE
|
||||
git clone https://github.com/revarbat/BOSL2.wiki.git
|
||||
|
||||
- name: Install OpenSCAD
|
||||
run: |
|
||||
|
@ -33,11 +32,10 @@ jobs:
|
|||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Checkout Wiki
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
repository: ${{github.repository}}.wiki
|
||||
path: BOSL2.wiki
|
||||
- name: Clone Wiki
|
||||
run: |
|
||||
cd $GITHUB_WORKSPACE
|
||||
git clone https://github.com/revarbat/BOSL2.wiki.git
|
||||
|
||||
- name: Install Python dev
|
||||
run: sudo apt-get install python3-pip python3-dev python3-setuptools python3-pil
|
||||
|
@ -56,5 +54,5 @@ jobs:
|
|||
run: |
|
||||
cd $GITHUB_WORKSPACE
|
||||
export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
|
||||
openscad-docsgen -T *.scad
|
||||
openscad-docsgen -Tm *.scad
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
// include <BOSL2/std.scad>
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
// Section: 2D Drawing Helpers
|
||||
|
||||
// Module: stroke()
|
||||
|
@ -15,7 +14,7 @@
|
|||
// Topics: Paths (2D), Paths (3D), Drawing Tools
|
||||
// Description:
|
||||
// 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 = [
|
||||
// ["butt", "chisel" ],
|
||||
// ["round", "square" ],
|
||||
|
@ -431,7 +430,7 @@ module stroke(
|
|||
// Usage: As a Function
|
||||
// dashes = dashed_stroke(path, dashpat, width=, <closed=>);
|
||||
// Topics: Paths, Drawing Tools
|
||||
// See Also: stroke(), path_cut_segs()
|
||||
// See Also: stroke(), path_cut()
|
||||
// Description:
|
||||
// Given a path and a dash pattern, creates a dashed line that follows that
|
||||
// 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)
|
||||
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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue