From e74eeb42653dd23d9bdd01df10badd7637ba95c6 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Wed, 17 Feb 2021 11:38:31 +0800 Subject: [PATCH] update to 3.0 --- README.md | 6 +++--- docs/images/{lib2x-pie-1.JPG => lib3x-pie-1.JPG} | Bin ...-polygon_hull-1.JPG => lib3x-polygon_hull-1.JPG} | Bin ...ib2x-polyline2d-1.JPG => lib3x-polyline2d-1.JPG} | Bin ...ib2x-polyline2d-2.JPG => lib3x-polyline2d-2.JPG} | Bin ...ib2x-polyline2d-3.JPG => lib3x-polyline2d-3.JPG} | Bin ...ib2x-polyline2d-4.JPG => lib3x-polyline2d-4.JPG} | Bin docs/{lib2x-pie.md => lib3x-pie.md} | 4 ++-- ...{lib2x-polygon_hull.md => lib3x-polygon_hull.md} | 2 +- docs/{lib2x-polyline2d.md => lib3x-polyline2d.md} | 10 +++++----- src/pie.scad | 2 +- src/polygon_hull.scad | 2 +- src/polyline2d.scad | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) rename docs/images/{lib2x-pie-1.JPG => lib3x-pie-1.JPG} (100%) rename docs/images/{lib2x-polygon_hull-1.JPG => lib3x-polygon_hull-1.JPG} (100%) rename docs/images/{lib2x-polyline2d-1.JPG => lib3x-polyline2d-1.JPG} (100%) rename docs/images/{lib2x-polyline2d-2.JPG => lib3x-polyline2d-2.JPG} (100%) rename docs/images/{lib2x-polyline2d-3.JPG => lib3x-polyline2d-3.JPG} (100%) rename docs/images/{lib2x-polyline2d-4.JPG => lib3x-polyline2d-4.JPG} (100%) rename docs/{lib2x-pie.md => lib3x-pie.md} (75%) rename docs/{lib2x-polygon_hull.md => lib3x-polygon_hull.md} (86%) rename docs/{lib2x-polyline2d.md => lib3x-polyline2d.md} (87%) diff --git a/README.md b/README.md index 331e1af3..a6b5359b 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,9 @@ These examples incubate dotSCAD and dotSCAD refactors these examples. See [examp - [hull_polyline2d](https://openhome.cc/eGossip/OpenSCAD/lib3x-hull_polyline2d.html) - [line2d](https://openhome.cc/eGossip/OpenSCAD/lib3x-line2d.html) - [multi_line_text](https://openhome.cc/eGossip/OpenSCAD/lib3x-multi_line_text.html) -- [pie](https://openhome.cc/eGossip/OpenSCAD/lib2x-pie.html) -- [polyline2d](https://openhome.cc/eGossip/OpenSCAD/lib2x-polyline2d.html) -- [polygon_hull](https://openhome.cc/eGossip/OpenSCAD/lib2x-polygon_hull.html) +- [pie](https://openhome.cc/eGossip/OpenSCAD/lib3x-pie.html) +- [polyline2d](https://openhome.cc/eGossip/OpenSCAD/lib3x-polyline2d.html) +- [polygon_hull](https://openhome.cc/eGossip/OpenSCAD/lib3x-polygon_hull.html) - [rounded_square](https://openhome.cc/eGossip/OpenSCAD/lib2x-rounded_square.html) ### 3D Module diff --git a/docs/images/lib2x-pie-1.JPG b/docs/images/lib3x-pie-1.JPG similarity index 100% rename from docs/images/lib2x-pie-1.JPG rename to docs/images/lib3x-pie-1.JPG diff --git a/docs/images/lib2x-polygon_hull-1.JPG b/docs/images/lib3x-polygon_hull-1.JPG similarity index 100% rename from docs/images/lib2x-polygon_hull-1.JPG rename to docs/images/lib3x-polygon_hull-1.JPG diff --git a/docs/images/lib2x-polyline2d-1.JPG b/docs/images/lib3x-polyline2d-1.JPG similarity index 100% rename from docs/images/lib2x-polyline2d-1.JPG rename to docs/images/lib3x-polyline2d-1.JPG diff --git a/docs/images/lib2x-polyline2d-2.JPG b/docs/images/lib3x-polyline2d-2.JPG similarity index 100% rename from docs/images/lib2x-polyline2d-2.JPG rename to docs/images/lib3x-polyline2d-2.JPG diff --git a/docs/images/lib2x-polyline2d-3.JPG b/docs/images/lib3x-polyline2d-3.JPG similarity index 100% rename from docs/images/lib2x-polyline2d-3.JPG rename to docs/images/lib3x-polyline2d-3.JPG diff --git a/docs/images/lib2x-polyline2d-4.JPG b/docs/images/lib3x-polyline2d-4.JPG similarity index 100% rename from docs/images/lib2x-polyline2d-4.JPG rename to docs/images/lib3x-polyline2d-4.JPG diff --git a/docs/lib2x-pie.md b/docs/lib3x-pie.md similarity index 75% rename from docs/lib2x-pie.md rename to docs/lib3x-pie.md index 865ff487..9f61f3a6 100644 --- a/docs/lib2x-pie.md +++ b/docs/lib3x-pie.md @@ -1,6 +1,6 @@ # pie -Creates a pie (circular sector). You can pass a 2 element vector to define the central angle. Its `$fa`, `$fs` and `$fn` parameters are consistent with the `circle` module. +Creates a pie (circular sector). Its `$fa`, `$fs` and `$fn` are consistent with the `circle` module. ## Parameters @@ -16,5 +16,5 @@ Creates a pie (circular sector). You can pass a 2 element vector to define the c translate([-15, 0, 0]) pie(radius = 20, angle = [45, 135]); translate([15, 0, 0]) pie(radius = 20, angle = [45, 135], $fn = 12); -![pie](images/lib2x-pie-1.JPG) +![pie](images/lib3x-pie-1.JPG) diff --git a/docs/lib2x-polygon_hull.md b/docs/lib3x-polygon_hull.md similarity index 86% rename from docs/lib2x-polygon_hull.md rename to docs/lib3x-polygon_hull.md index e41da526..6be1fb61 100644 --- a/docs/lib2x-polygon_hull.md +++ b/docs/lib3x-polygon_hull.md @@ -20,4 +20,4 @@ Create a convex polygon by hulling a list of points. It avoids using `hull` and [-1, -1] ]); -![polygon_hull](images/lib2x-polygon_hull-1.JPG) \ No newline at end of file +![polygon_hull](images/lib3x-polygon_hull-1.JPG) \ No newline at end of file diff --git a/docs/lib2x-polyline2d.md b/docs/lib3x-polyline2d.md similarity index 87% rename from docs/lib2x-polyline2d.md rename to docs/lib3x-polyline2d.md index f75dec80..b4c73205 100644 --- a/docs/lib2x-polyline2d.md +++ b/docs/lib3x-polyline2d.md @@ -5,7 +5,7 @@ Creates a polyline from a list of `x`, `y` coordinates. When the end points are ## Parameters - `points` : The list of `[x, y]` points of the polyline. The points are indexed from 0 to n-1. -- `width` : The line width. +- `width` : The line width. Default to 1. - `startingStyle` : The end-cap style of the starting point. The value must be `"CAP_BUTT"`, `"CAP_SQUARE"` or `"CAP_ROUND"`. The default value is `"CAP_SQUARE"`. - `endingStyle` : The end-cap style of the ending point. The value must be `"CAP_BUTT"`, `"CAP_SQUARE"` or `"CAP_ROUND"`. The default value is `"CAP_SQUARE"`. - `joinStyle`: Applies to the vertex where two lines join. The value must be `"JOIN_ROUND"`, `"JOIN_MITER"` or `"JOIN_BEVEL"`. The default value is `"JOIN_ROUND"`. Since 2.4. @@ -18,7 +18,7 @@ Creates a polyline from a list of `x`, `y` coordinates. When the end points are $fn = 24; polyline2d(points = [[1, 2], [-5, -4], [-5, 3], [5, 5]], width = 1); -![polyline2d](images/lib2x-polyline2d-1.JPG) +![polyline2d](images/lib3x-polyline2d-1.JPG) use ; @@ -26,7 +26,7 @@ Creates a polyline from a list of `x`, `y` coordinates. When the end points are polyline2d(points = [[1, 2], [-5, -4], [-5, 3], [5, 5]], width = 1, endingStyle = "CAP_ROUND"); -![polyline2d](images/lib2x-polyline2d-2.JPG) +![polyline2d](images/lib3x-polyline2d-2.JPG) use ; @@ -34,8 +34,8 @@ Creates a polyline from a list of `x`, `y` coordinates. When the end points are polyline2d(points = [[1, 2], [-5, -4], [-5, 3], [5, 5]], width = 1, startingStyle = "CAP_ROUND", endingStyle = "CAP_ROUND"); -![polyline2d](images/lib2x-polyline2d-3.JPG) +![polyline2d](images/lib3x-polyline2d-3.JPG) About `joinStyle`: -![polyline2d](images/lib2x-polyline2d-4.JPG) \ No newline at end of file +![polyline2d](images/lib3x-polyline2d-4.JPG) \ No newline at end of file diff --git a/src/pie.scad b/src/pie.scad index f3c052f9..771c7591 100644 --- a/src/pie.scad +++ b/src/pie.scad @@ -4,7 +4,7 @@ * @copyright Justin Lin, 2017 * @license https://opensource.org/licenses/lgpl-3.0.html * -* @see https://openhome.cc/eGossip/OpenSCAD/lib2x-pie.html +* @see https://openhome.cc/eGossip/OpenSCAD/lib3x-pie.html * **/ diff --git a/src/polygon_hull.scad b/src/polygon_hull.scad index 0db4efa9..ceed93dd 100644 --- a/src/polygon_hull.scad +++ b/src/polygon_hull.scad @@ -4,7 +4,7 @@ * @copyright Justin Lin, 2020 * @license https://opensource.org/licenses/lgpl-3.0.html * -* @see https://openhome.cc/eGossip/OpenSCAD/lib2x-polygon_hull.html +* @see https://openhome.cc/eGossip/OpenSCAD/lib3x-polygon_hull.html * **/ diff --git a/src/polyline2d.scad b/src/polyline2d.scad index 0c346fa3..0c1c375d 100644 --- a/src/polyline2d.scad +++ b/src/polyline2d.scad @@ -4,14 +4,14 @@ * @copyright Justin Lin, 2017 * @license https://opensource.org/licenses/lgpl-3.0.html * -* @see https://openhome.cc/eGossip/OpenSCAD/lib2x-polyline2d.html +* @see https://openhome.cc/eGossip/OpenSCAD/lib3x-polyline2d.html * **/ use ; use ; -module polyline2d(points, width, startingStyle = "CAP_SQUARE", endingStyle = "CAP_SQUARE", joinStyle = "JOIN_ROUND") { +module polyline2d(points, width = 1, startingStyle = "CAP_SQUARE", endingStyle = "CAP_SQUARE", joinStyle = "JOIN_ROUND") { leng_pts = len(points); s_styles = [startingStyle, "CAP_BUTT"];