diff --git a/README.md b/README.md index 7f3440e..e7f582c 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# BOSL -The Belfry OpenScad Library - A library of tools, shapes, and helpers to make OpenScad easier to use. +# BOSL2 +The Belfry OpenScad Library, v2 - A library of tools, shapes, and helpers to make OpenScad easier to use. This library is a set of useful tools, shapes and manipulators that I developed while working on various projects, including large ones like the Snappy-Reprap printed 3D printer. ## Terminology -For purposes of the BOSL library, the following terms apply: +For purposes of the BOSL2 library, the following terms apply: - **Left**: Towards X- - **Right**: Towards X+ - **Front**/**Forward**: Towards Y- @@ -30,7 +30,7 @@ align | Side of the origin that the part should be on. Given as a vector away ## Examples A lot of the features of this library are to allow shorter, easier-to-read, intent-based coding. For example: -[`BOSL/transforms.scad`](https://github.com/revarbat/BOSL/wiki/transforms.scad) Examples | Raw OpenSCAD Equivalent +[`BOSL2/transforms.scad`](https://github.com/revarbat/BOSL2/wiki/transforms.scad) Examples | Raw OpenSCAD Equivalent ------------------------------- | ------------------------------- `up(5)` | `translate([0,0,5])` `xrot(30,cp=[0,10,20])` | `translate([0,10,20]) rotate([30,0,0]) translate([0,-10,-20])` @@ -38,7 +38,7 @@ A lot of the features of this library are to allow shorter, easier-to-read, inte `zring(n=6,r=20)` | `for (zr=[0:5]) rotate([0,0,zr*60]) translate([20,0,0])` `skew_xy(xa=30,ya=45)` | `multmatrix([[1,0,tan(30),0],[0,1,tan(45),0],[0,0,1,0],[0,0,0,1]])` -[`BOSL/shapes.scad`](https://github.com/revarbat/BOSL/wiki/shapes.scad) Examples | Raw OpenSCAD Equivalent +[`BOSL2/shapes.scad`](https://github.com/revarbat/BOSL2/wiki/shapes.scad) Examples | Raw OpenSCAD Equivalent ---------------------------------- | ------------------------------- `upcube([10,20,30]);` | `translate([0,0,15]) cube([10,20,30], center=true);` `cuboid([20,20,30], fillet=5, edges=EDGES_Z_ALL);` | `minkowski() {cube([10,10,20], center=true); sphere(r=5, $fn=32);}` @@ -46,7 +46,7 @@ A lot of the features of this library are to allow shorter, easier-to-read, inte `xcyl(l=20,d=4);` | `rotate([0,90,0]) cylinder(h=20, d=4, center=true);` `cyl(l=100, d=40, fillet=5);` | `translate([0,0,50]) minkowski() {cylinder(h=90, d=30, center=true); sphere(r=5);}` -[`BOSL/masks.scad`](https://github.com/revarbat/BOSL/wiki/masks.scad) Examples | Raw Openscad Equivalent +[`BOSL2/masks.scad`](https://github.com/revarbat/BOSL2/wiki/masks.scad) Examples | Raw Openscad Equivalent ----------------------------------- | ------------------------------- `chamfer_mask_z(l=20,chamfer=5);` | `rotate(45) cube([5*sqrt(2), 5*sqrt(2), 20], center=true);` `fillet_mask_z(l=20,fillet=5);` | `difference() {cube([10,10,20], center=true); for(dx=[-5,5],dy=[-5,5]) translate([dx,dy,0]) cylinder(h=20.1, r=5, center=true);}` @@ -57,30 +57,30 @@ A lot of the features of this library are to allow shorter, easier-to-read, inte The library files are as follows: ### Commonly Used - - [`transforms.scad`](https://github.com/revarbat/BOSL/wiki/transforms.scad): The most commonly used transformations, manipulations, and shortcuts are in this file. - - [`shapes.scad`](https://github.com/revarbat/BOSL/wiki/shapes.scad): Common useful shapes and structured objects. - - [`masks.scad`](https://github.com/revarbat/BOSL/wiki/masks.scad): Shapes that are useful for masking with `difference()` and `intersect()`. - - [`threading.scad`](https://github.com/revarbat/BOSL/wiki/threading.scad): Modules to make triangular and trapezoidal threaded rods and nuts. - - [`paths.scad`](https://github.com/revarbat/BOSL/wiki/paths.scad): Functions and modules to work with arbitrary 3D paths. - - [`beziers.scad`](https://github.com/revarbat/BOSL/wiki/beziers.scad): Functions and modules to work with bezier curves. + - [`transforms.scad`](https://github.com/revarbat/BOSL2/wiki/transforms.scad): The most commonly used transformations, manipulations, and shortcuts are in this file. + - [`shapes.scad`](https://github.com/revarbat/BOSL2/wiki/shapes.scad): Common useful shapes and structured objects. + - [`masks.scad`](https://github.com/revarbat/BOSL2/wiki/masks.scad): Shapes that are useful for masking with `difference()` and `intersect()`. + - [`threading.scad`](https://github.com/revarbat/BOSL2/wiki/threading.scad): Modules to make triangular and trapezoidal threaded rods and nuts. + - [`paths.scad`](https://github.com/revarbat/BOSL2/wiki/paths.scad): Functions and modules to work with arbitrary 3D paths. + - [`beziers.scad`](https://github.com/revarbat/BOSL2/wiki/beziers.scad): Functions and modules to work with bezier curves. ### Standard Parts - - [`involute_gears.scad`](https://github.com/revarbat/BOSL/wiki/involute_gears.scad): Modules and functions to make involute gears and racks. - - [`joiners.scad`](https://github.com/revarbat/BOSL/wiki/joiners.scad): Modules to make joiner shapes for connecting separately printed objects. - - [`sliders.scad`](https://github.com/revarbat/BOSL/wiki/sliders.scad): Modules for creating simple sliders and rails. - - [`metric_screws.scad`](https://github.com/revarbat/BOSL/wiki/metric_screws.scad): Functions and modules to make metric screws, nuts, and screwholes. - - [`linear_bearings.scad`](https://github.com/revarbat/BOSL/wiki/linear_bearings.scad): Modules to make mounts for LMxUU style linear bearings. - - [`nema_steppers.scad`](https://github.com/revarbat/BOSL/wiki/nema_steppers.scad): Modules to make mounting holes for NEMA motors. - - [`phillips_drive.scad`](https://github.com/revarbat/BOSL/wiki/phillips_drive.scad): Modules to create Phillips screwdriver tips. - - [`torx_drive.scad`](https://github.com/revarbat/BOSL/wiki/torx_drive.scad): Functions and Modules to create Torx bit drive holes. - - [`wiring.scad`](https://github.com/revarbat/BOSL/wiki/wiring.scad): Modules to render routed bundles of wires. + - [`involute_gears.scad`](https://github.com/revarbat/BOSL2/wiki/involute_gears.scad): Modules and functions to make involute gears and racks. + - [`joiners.scad`](https://github.com/revarbat/BOSL2/wiki/joiners.scad): Modules to make joiner shapes for connecting separately printed objects. + - [`sliders.scad`](https://github.com/revarbat/BOSL2/wiki/sliders.scad): Modules for creating simple sliders and rails. + - [`metric_screws.scad`](https://github.com/revarbat/BOSL2/wiki/metric_screws.scad): Functions and modules to make metric screws, nuts, and screwholes. + - [`linear_bearings.scad`](https://github.com/revarbat/BOSL2/wiki/linear_bearings.scad): Modules to make mounts for LMxUU style linear bearings. + - [`nema_steppers.scad`](https://github.com/revarbat/BOSL2/wiki/nema_steppers.scad): Modules to make mounting holes for NEMA motors. + - [`phillips_drive.scad`](https://github.com/revarbat/BOSL2/wiki/phillips_drive.scad): Modules to create Phillips screwdriver tips. + - [`torx_drive.scad`](https://github.com/revarbat/BOSL2/wiki/torx_drive.scad): Functions and Modules to create Torx bit drive holes. + - [`wiring.scad`](https://github.com/revarbat/BOSL2/wiki/wiring.scad): Modules to render routed bundles of wires. ### Miscellaneous - - [`math.scad`](https://github.com/revarbat/BOSL/wiki/math.scad): Useful helper functions. - - [`constants.scad`](https://github.com/revarbat/BOSL/wiki/constants.scad): Useful constants for vectors, edges, etc. - - [`quaternions.scad`](https://github.com/revarbat/BOSL/wiki/quaternions.scad): Functions to work with quaternion rotations. - - [`debug.scad`](https://github.com/revarbat/BOSL/wiki/debug.scad): Modules to help debug creation of beziers, `polygons()`s and `polyhedron()`s + - [`math.scad`](https://github.com/revarbat/BOSL2/wiki/math.scad): Useful helper functions. + - [`constants.scad`](https://github.com/revarbat/BOSL2/wiki/constants.scad): Useful constants for vectors, edges, etc. + - [`quaternions.scad`](https://github.com/revarbat/BOSL2/wiki/quaternions.scad): Functions to work with quaternion rotations. + - [`debug.scad`](https://github.com/revarbat/BOSL2/wiki/debug.scad): Modules to help debug creation of beziers, `polygons()`s and `polyhedron()`s ## Documentation -The full library docs can be found at https://github.com/revarbat/BOSL/wiki +The full library docs can be found at https://github.com/revarbat/BOSL2/wiki diff --git a/beziers.scad b/beziers.scad index 3e55428..ae4b8ee 100644 --- a/beziers.scad +++ b/beziers.scad @@ -3,8 +3,8 @@ // Bezier functions and modules. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// @@ -830,7 +830,7 @@ function bezier_triangle(tri, splinesteps=16, vertices=[], faces=[]) = // Arguments: // size = 2D XY size of the patch. // N = Degree of the patch to generate. Since this is flat, a degree of 1 should usually be sufficient. -// orient = The orientation to rotate the edge patch into. Use the `ORIENT` constants in `BOSL/constants.scad`. +// orient = The orientation to rotate the edge patch into. Use the `ORIENT` constants in `constants.scad`. // trans = Amount to translate patch, after rotating to `orient`. // Example(3D): // patch = bezier_patch_flat(size=[100,100], N=3); diff --git a/constants.scad b/constants.scad index f854a76..10abc0e 100644 --- a/constants.scad +++ b/constants.scad @@ -3,7 +3,7 @@ // Useful Constants. // To use this, add the following line to the top of your file. // ``` -// include +// include // ``` ////////////////////////////////////////////////////////////////////// diff --git a/convex_hull.scad b/convex_hull.scad index 4b5270e..b55f56c 100644 --- a/convex_hull.scad +++ b/convex_hull.scad @@ -3,13 +3,13 @@ // Functions to create 2D and 3D convex hulls. // To use, add the following line to the beginning of your file: // ``` -// include +// include // ``` // Derived from Linde's Hull: // - https://github.com/openscad/scad-utils ////////////////////////////////////////////////////////////////////// -include +include diff --git a/debug.scad b/debug.scad index 6f95c24..17b2520 100644 --- a/debug.scad +++ b/debug.scad @@ -3,8 +3,8 @@ // Helpers to make debugging OpenScad code easier. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/examples/attachments.scad b/examples/attachments.scad index 9eab546..8c116de 100644 --- a/examples/attachments.scad +++ b/examples/attachments.scad @@ -1,8 +1,8 @@ -include -include -include -include -include +include +include +include +include +include cuboid([60,40,40], fillet=5, edges=EDGES_Z_ALL, align="bottom") { attach("top") rounded_prismoid([60,40],[20,20], h=50, r1=5, r2=10) { diff --git a/examples/bezier_patches.scad b/examples/bezier_patches.scad index 0033cd2..72266e6 100644 --- a/examples/bezier_patches.scad +++ b/examples/bezier_patches.scad @@ -1,7 +1,7 @@ -include -use -use -use +include +use +use +use function CR_corner(size, orient=[0,0,0], trans=[0,0,0]) = diff --git a/examples/cylinder_connectors.scad b/examples/cylinder_connectors.scad index 9bdd2e3..50cc58e 100644 --- a/examples/cylinder_connectors.scad +++ b/examples/cylinder_connectors.scad @@ -1,6 +1,6 @@ -include -include -include +include +include +include cylinder(h=30, d1=50, d2=30) show_connectors("cylinder"); diff --git a/examples/fractal_tree.scad b/examples/fractal_tree.scad index bbe81d4..c1aad91 100644 --- a/examples/fractal_tree.scad +++ b/examples/fractal_tree.scad @@ -1,7 +1,7 @@ -include -include -include -include +include +include +include +include module leaf(s) { path = [ diff --git a/examples/orientations.scad b/examples/orientations.scad index 6437ea5..b1a55a0 100644 --- a/examples/orientations.scad +++ b/examples/orientations.scad @@ -1,6 +1,6 @@ -use -use -include +use +use +include // Shows all the orientations on cubes in their correct rotations. diff --git a/examples/prismoid_connectors.scad b/examples/prismoid_connectors.scad index e27b5bc..b9104e0 100644 --- a/examples/prismoid_connectors.scad +++ b/examples/prismoid_connectors.scad @@ -1,6 +1,6 @@ -include -include -include +include +include +include prismoid([60,40], [30,20], h=40) show_connectors(); diff --git a/examples/tagged_diff.scad b/examples/tagged_diff.scad index 84b8be0..3ebbbbc 100644 --- a/examples/tagged_diff.scad +++ b/examples/tagged_diff.scad @@ -1,7 +1,7 @@ -include -include -include -include +include +include +include +include diff("hole", "body pole") diff --git a/involute_gears.scad b/involute_gears.scad index b3f1604..6fc14d0 100644 --- a/involute_gears.scad +++ b/involute_gears.scad @@ -19,8 +19,8 @@ // // To use, add the following line to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/joiners.scad b/joiners.scad index dca51da..9f2a0b3 100644 --- a/joiners.scad +++ b/joiners.scad @@ -3,8 +3,8 @@ // Snap-together joiners. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/linear_bearings.scad b/linear_bearings.scad index 0f14fbf..2268391 100644 --- a/linear_bearings.scad +++ b/linear_bearings.scad @@ -3,8 +3,8 @@ // Linear Bearing clips/holders. // To use, add these lines to the top of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/masks.scad b/masks.scad index 7bcc750..0f63960 100644 --- a/masks.scad +++ b/masks.scad @@ -3,8 +3,8 @@ // Masking shapes. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/math.scad b/math.scad index 086c67b..ac3eb5e 100644 --- a/math.scad +++ b/math.scad @@ -3,7 +3,7 @@ // Math helper functions. // To use, add the following lines to the beginning of your file: // ``` -// use +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/metric_screws.scad b/metric_screws.scad index 313a051..99351d2 100644 --- a/metric_screws.scad +++ b/metric_screws.scad @@ -3,8 +3,8 @@ // Screws, Bolts, and Nuts. // To use, include the following lines at the top of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/nema_steppers.scad b/nema_steppers.scad index c2fec76..5a39b9e 100644 --- a/nema_steppers.scad +++ b/nema_steppers.scad @@ -3,8 +3,8 @@ // Masks and models for NEMA stepper motors. // To use, add these lines to the top of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/paths.scad b/paths.scad index 7ef018d..4df2cac 100644 --- a/paths.scad +++ b/paths.scad @@ -3,8 +3,8 @@ // Polylines, polygons and paths. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/phillips_drive.scad b/phillips_drive.scad index bcc59e5..04364b5 100644 --- a/phillips_drive.scad +++ b/phillips_drive.scad @@ -3,8 +3,8 @@ // Phillips driver bits // To use, add these lines to the top of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/primitives.scad b/primitives.scad index 63279cf..a0a7bf8 100644 --- a/primitives.scad +++ b/primitives.scad @@ -1,11 +1,11 @@ ////////////////////////////////////////////////////////////////////// // LibFile: primitives.scad // The basic built-in shapes, reworked to integrate better with -// other BOSL library shapes and utilities. +// other BOSL2 library shapes and utilities. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/quaternions.scad b/quaternions.scad index 7ffb26d..6d949d8 100644 --- a/quaternions.scad +++ b/quaternions.scad @@ -3,7 +3,7 @@ // Support for Quaternions. // To use, add the following line to the beginning of your file: // ``` -// use +// use // ``` /////////////////////////////////////////// diff --git a/scripts/docs_gen.py b/scripts/docs_gen.py index aa41559..3109260 100755 --- a/scripts/docs_gen.py +++ b/scripts/docs_gen.py @@ -101,9 +101,9 @@ class ImageProcessing(object): stdlibs = ["constants.scad", "math.scad", "transforms.scad", "shapes.scad", "debug.scad"] script = "" for lib in stdlibs: - script += "include \n" % lib + script += "include \n" % lib if libfile not in stdlibs: - script += "include \n" % libfile + script += "include \n" % libfile for line in self.commoncode: script += line+"\n" for line in code: diff --git a/scripts/make_all_docs.sh b/scripts/make_all_docs.sh index 02a70b7..cac43ef 100755 --- a/scripts/make_all_docs.sh +++ b/scripts/make_all_docs.sh @@ -3,10 +3,10 @@ PREVIEW_LIBS="constants compat transforms shapes masks paths beziers math metric_screws threading involute_gears sliders joiners linear_bearings nema_steppers wiring triangulation quaternions phillips_drive torx_drive debug" dir="$(basename $PWD)" -if [ "$dir" = "BOSL" ]; then - cd BOSL.wiki -elif [ "$dir" != "BOSL.wiki" ]; then - echo "Must run this script from the BOSL or BOSL/BOSL.wiki directories." +if [ "$dir" = "BOSL2" ]; then + cd BOSL2.wiki +elif [ "$dir" != "BOSL2.wiki" ]; then + echo "Must run this script from the BOSL2 or BOSL2/BOSL2.wiki directories." exit 1 fi diff --git a/shapes.scad b/shapes.scad index addc04d..0ff2e25 100644 --- a/shapes.scad +++ b/shapes.scad @@ -3,8 +3,8 @@ // Common useful shapes and structured objects. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/sliders.scad b/sliders.scad index 9a0210b..dfca752 100644 --- a/sliders.scad +++ b/sliders.scad @@ -3,8 +3,8 @@ // Simple V-groove based sliders and rails. // To use, add these lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/tests/test_convex_hull.scad b/tests/test_convex_hull.scad index d43ffac..1b7a33d 100644 --- a/tests/test_convex_hull.scad +++ b/tests/test_convex_hull.scad @@ -1,5 +1,5 @@ -include -include +include +include testpoints_on_sphere = [ for(p = diff --git a/tests/test_math.scad b/tests/test_math.scad index dcbad7d..97f8499 100644 --- a/tests/test_math.scad +++ b/tests/test_math.scad @@ -1,7 +1,6 @@ -include -include +include +include -eps = 1e-9; // Simple Calculations @@ -112,61 +111,61 @@ test_hypot(); module test_sinh() { - assert(abs(sinh(-2)+3.6268604078) < eps); - assert(abs(sinh(-1)+1.1752011936) < eps); - assert(abs(sinh(0)) < eps); - assert(abs(sinh(1)-1.1752011936) < eps); - assert(abs(sinh(2)-3.6268604078) < eps); + assert(abs(sinh(-2)+3.6268604078) < EPSILON); + assert(abs(sinh(-1)+1.1752011936) < EPSILON); + assert(abs(sinh(0)) < EPSILON); + assert(abs(sinh(1)-1.1752011936) < EPSILON); + assert(abs(sinh(2)-3.6268604078) < EPSILON); } test_sinh(); module test_cosh() { - assert(abs(cosh(-2)-3.7621956911) < eps); - assert(abs(cosh(-1)-1.5430806348) < eps); - assert(abs(cosh(0)-1) < eps); - assert(abs(cosh(1)-1.5430806348) < eps); - assert(abs(cosh(2)-3.7621956911) < eps); + assert(abs(cosh(-2)-3.7621956911) < EPSILON); + assert(abs(cosh(-1)-1.5430806348) < EPSILON); + assert(abs(cosh(0)-1) < EPSILON); + assert(abs(cosh(1)-1.5430806348) < EPSILON); + assert(abs(cosh(2)-3.7621956911) < EPSILON); } test_cosh(); module test_tanh() { - assert(abs(tanh(-2)+0.9640275801) < eps); - assert(abs(tanh(-1)+0.761594156) < eps); - assert(abs(tanh(0)) < eps); - assert(abs(tanh(1)-0.761594156) < eps); - assert(abs(tanh(2)-0.9640275801) < eps); + assert(abs(tanh(-2)+0.9640275801) < EPSILON); + assert(abs(tanh(-1)+0.761594156) < EPSILON); + assert(abs(tanh(0)) < EPSILON); + assert(abs(tanh(1)-0.761594156) < EPSILON); + assert(abs(tanh(2)-0.9640275801) < EPSILON); } test_tanh(); module test_asinh() { - assert(abs(asinh(sinh(-2))+2) < eps); - assert(abs(asinh(sinh(-1))+1) < eps); - assert(abs(asinh(sinh(0))) < eps); - assert(abs(asinh(sinh(1))-1) < eps); - assert(abs(asinh(sinh(2))-2) < eps); + assert(abs(asinh(sinh(-2))+2) < EPSILON); + assert(abs(asinh(sinh(-1))+1) < EPSILON); + assert(abs(asinh(sinh(0))) < EPSILON); + assert(abs(asinh(sinh(1))-1) < EPSILON); + assert(abs(asinh(sinh(2))-2) < EPSILON); } test_asinh(); module test_acosh() { - assert(abs(acosh(cosh(-2))-2) < eps); - assert(abs(acosh(cosh(-1))-1) < eps); - assert(abs(acosh(cosh(0))) < eps); - assert(abs(acosh(cosh(1))-1) < eps); - assert(abs(acosh(cosh(2))-2) < eps); + assert(abs(acosh(cosh(-2))-2) < EPSILON); + assert(abs(acosh(cosh(-1))-1) < EPSILON); + assert(abs(acosh(cosh(0))) < EPSILON); + assert(abs(acosh(cosh(1))-1) < EPSILON); + assert(abs(acosh(cosh(2))-2) < EPSILON); } test_acosh(); module test_atanh() { - assert(abs(atanh(tanh(-2))+2) < eps); - assert(abs(atanh(tanh(-1))+1) < eps); - assert(abs(atanh(tanh(0))) < eps); - assert(abs(atanh(tanh(1))-1) < eps); - assert(abs(atanh(tanh(2))-2) < eps); + assert(abs(atanh(tanh(-2))+2) < EPSILON); + assert(abs(atanh(tanh(-1))+1) < EPSILON); + assert(abs(atanh(tanh(0))) < EPSILON); + assert(abs(atanh(tanh(1))-1) < EPSILON); + assert(abs(atanh(tanh(2))-2) < EPSILON); } test_atanh(); @@ -519,11 +518,11 @@ module test_normalize() { assert(normalize([10,0,0]) == [1,0,0]); assert(normalize([0,10,0]) == [0,1,0]); assert(normalize([0,0,10]) == [0,0,1]); - assert(abs(norm(normalize([10,10,10]))-1) < eps); - assert(abs(norm(normalize([-10,-10,-10]))-1) < eps); - assert(abs(norm(normalize([-10,0,0]))-1) < eps); - assert(abs(norm(normalize([0,-10,0]))-1) < eps); - assert(abs(norm(normalize([0,0,-10]))-1) < eps); + assert(abs(norm(normalize([10,10,10]))-1) < EPSILON); + assert(abs(norm(normalize([-10,-10,-10]))-1) < EPSILON); + assert(abs(norm(normalize([-10,0,0]))-1) < EPSILON); + assert(abs(norm(normalize([0,-10,0]))-1) < EPSILON); + assert(abs(norm(normalize([0,0,-10]))-1) < EPSILON); } test_normalize(); @@ -539,18 +538,18 @@ module test_vector_angle() { assert(vector_angle(a,b)==90); } } - assert(abs(vector_angle([10,10,0],[10,0,0])-45) < eps); + assert(abs(vector_angle([10,10,0],[10,0,0])-45) < EPSILON); } test_vector_angle(); module test_vector_axis() { - assert(norm(vector_axis([10,0,0],[10,10,0]) - [0,0,1]) < eps); - assert(norm(vector_axis([10,0,0],[0,10,0]) - [0,0,1]) < eps); - assert(norm(vector_axis([0,10,0],[10,0,0]) - [0,0,-1]) < eps); - assert(norm(vector_axis([0,0,10],[10,0,0]) - [0,1,0]) < eps); - assert(norm(vector_axis([10,0,0],[0,0,10]) - [0,-1,0]) < eps); - assert(norm(vector_axis([10,0,10],[0,-10,0]) - [sin(45),0,-sin(45)]) < eps); + assert(norm(vector_axis([10,0,0],[10,10,0]) - [0,0,1]) < EPSILON); + assert(norm(vector_axis([10,0,0],[0,10,0]) - [0,0,1]) < EPSILON); + assert(norm(vector_axis([0,10,0],[10,0,0]) - [0,0,-1]) < EPSILON); + assert(norm(vector_axis([0,0,10],[10,0,0]) - [0,1,0]) < EPSILON); + assert(norm(vector_axis([10,0,0],[0,0,10]) - [0,-1,0]) < EPSILON); + assert(norm(vector_axis([10,0,10],[0,-10,0]) - [sin(45),0,-sin(45)]) < EPSILON); } test_vector_axis(); diff --git a/threading.scad b/threading.scad index c91b31c..e515765 100644 --- a/threading.scad +++ b/threading.scad @@ -3,8 +3,8 @@ // Triangular and Trapezoidal-Threaded Screw Rods and Nuts. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/torx_drive.scad b/torx_drive.scad index 3220334..3b0a48a 100644 --- a/torx_drive.scad +++ b/torx_drive.scad @@ -3,8 +3,8 @@ // Torx driver bits // To use, add these lines to the top of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/transforms.scad b/transforms.scad index b5c5d88..9d5a059 100644 --- a/transforms.scad +++ b/transforms.scad @@ -3,8 +3,8 @@ // This is the file that the most commonly used transformations, distributors, and mutator are in. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/triangulation.scad b/triangulation.scad index 7b39e9b..43111f5 100644 --- a/triangulation.scad +++ b/triangulation.scad @@ -3,7 +3,7 @@ // Functions to triangulate polyhedron faces. // To use, add the following lines to the beginning of your file: // ``` -// use +// use // ``` ////////////////////////////////////////////////////////////////////// diff --git a/wiring.scad b/wiring.scad index dd16f84..3d48c5d 100644 --- a/wiring.scad +++ b/wiring.scad @@ -3,7 +3,7 @@ // Rendering for wiring bundles // To use, include the following line at the top of your file: // ``` -// use +// use // ``` //////////////////////////////////////////////////////////////////////