From 1d6aefc867cb53a4153e3fff37f4287f8d440cc8 Mon Sep 17 00:00:00 2001 From: Revar Desmera Date: Fri, 19 Apr 2019 00:25:10 -0700 Subject: [PATCH] Removed all uses and incudes. Document all includes needed for each file. Added std.scad include. --- beziers.scad | 10 +++------- constants.scad | 2 +- convex_hull.scad | 4 +--- debug.scad | 10 ++++------ involute_gears.scad | 7 ++----- joiners.scad | 9 ++------- linear_bearings.scad | 9 +++------ masks.scad | 9 +-------- math.scad | 5 +---- metric_screws.scad | 15 +++++---------- nema_steppers.scad | 9 ++------- paths.scad | 12 ++++-------- phillips_drive.scad | 10 ++-------- primitives.scad | 8 +------- quaternions.scad | 5 ++--- shapes.scad | 8 +------- sliders.scad | 8 ++------ acme_screws.scad => std.scad | 16 ++++++++++++++-- threading.scad | 8 ++------ torx_drive.scad | 9 ++------- transforms.scad | 8 +------- triangulation.scad | 5 ++--- wiring.scad | 9 ++++----- 23 files changed, 62 insertions(+), 133 deletions(-) rename acme_screws.scad => std.scad (79%) diff --git a/beziers.scad b/beziers.scad index ae4b8ee..ad80907 100644 --- a/beziers.scad +++ b/beziers.scad @@ -3,8 +3,9 @@ // Bezier functions and modules. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// include +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,11 +38,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -use -use -use - // Section: Terminology // **Polyline**: A series of points joined by straight line segements. diff --git a/constants.scad b/constants.scad index 10abc0e..6ca81dc 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 b55f56c..8d9b9a1 100644 --- a/convex_hull.scad +++ b/convex_hull.scad @@ -3,15 +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 - - // Section: Generalized Hull diff --git a/debug.scad b/debug.scad index 17b2520..827a081 100644 --- a/debug.scad +++ b/debug.scad @@ -3,8 +3,10 @@ // Helpers to make debugging OpenScad code easier. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// include +// include +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -36,10 +38,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -include -include -include // Section: Debugging Polyhedrons diff --git a/involute_gears.scad b/involute_gears.scad index 6fc14d0..b9dfdfd 100644 --- a/involute_gears.scad +++ b/involute_gears.scad @@ -19,15 +19,12 @@ // // To use, add the following line to the beginning of your file: // ``` -// include -// use +// include +// include // ``` ////////////////////////////////////////////////////////////////////////////////////////////// -use -include - // Section: Terminology // The outline of a gear is a smooth circle (the "pitch circle") which has diff --git a/joiners.scad b/joiners.scad index 9f2a0b3..938a265 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 +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,11 +37,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use -use -include -include - // Section: Half Joiners diff --git a/linear_bearings.scad b/linear_bearings.scad index 2268391..f0b31af 100644 --- a/linear_bearings.scad +++ b/linear_bearings.scad @@ -3,8 +3,9 @@ // Linear Bearing clips/holders. // To use, add these lines to the top of your file: // ``` -// include -// use +// include +// include +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,10 +38,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -include - - // Section: Functions diff --git a/masks.scad b/masks.scad index 0f63960..854f7d2 100644 --- a/masks.scad +++ b/masks.scad @@ -3,8 +3,7 @@ // Masking shapes. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,12 +36,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use -use -use -include -include - // Section: General Masks diff --git a/math.scad b/math.scad index ac3eb5e..9513732 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 // ``` ////////////////////////////////////////////////////////////////////// @@ -36,9 +36,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -include - // Section: Math Constants diff --git a/metric_screws.scad b/metric_screws.scad index 99351d2..8b80539 100644 --- a/metric_screws.scad +++ b/metric_screws.scad @@ -3,8 +3,11 @@ // Screws, Bolts, and Nuts. // To use, include the following lines at the top of your file: // ``` -// include -// use +// include +// include +// include +// include +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,14 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -use -use -use -use -use -use - // Section: Functions diff --git a/nema_steppers.scad b/nema_steppers.scad index 5a39b9e..1822a63 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 +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -36,11 +36,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -use -use -use -use // Section: Functions diff --git a/paths.scad b/paths.scad index 4df2cac..e612d06 100644 --- a/paths.scad +++ b/paths.scad @@ -3,8 +3,10 @@ // Polylines, polygons and paths. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include +// include +// include +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,12 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -use -use -use -use - // Section: Functions diff --git a/phillips_drive.scad b/phillips_drive.scad index 04364b5..c8893d5 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 +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,12 +37,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use -use -include -include - - // Section: Modules diff --git a/primitives.scad b/primitives.scad index a0a7bf8..6f02796 100644 --- a/primitives.scad +++ b/primitives.scad @@ -4,8 +4,7 @@ // other BOSL2 library shapes and utilities. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -38,11 +37,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -include -use -use - // Section: Primitive Shapes diff --git a/quaternions.scad b/quaternions.scad index 6d949d8..2f31cae 100644 --- a/quaternions.scad +++ b/quaternions.scad @@ -3,7 +3,8 @@ // Support for Quaternions. // To use, add the following line to the beginning of your file: // ``` -// use +// include +// include // ``` /////////////////////////////////////////// @@ -36,8 +37,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use - // Section: Quaternions // Quaternions are fast methods of storing and calculating arbitrary rotations. diff --git a/shapes.scad b/shapes.scad index 0ff2e25..94e0514 100644 --- a/shapes.scad +++ b/shapes.scad @@ -3,8 +3,7 @@ // Common useful shapes and structured objects. // To use, add the following lines to the beginning of your file: // ``` -// include -// use +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,11 +36,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use -use -include -include - // Section: Cuboids diff --git a/sliders.scad b/sliders.scad index dfca752..228148f 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 +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -36,10 +36,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use -use -include -include // Section: Modules diff --git a/acme_screws.scad b/std.scad similarity index 79% rename from acme_screws.scad rename to std.scad index 4580d86..822458b 100644 --- a/acme_screws.scad +++ b/std.scad @@ -1,5 +1,10 @@ ////////////////////////////////////////////////////////////////////// -// ACME Trapezoidal-threaded Screw Rods and Nuts +// LibFile: std.scad +// File that includes the standard BOSL include files. +// To use, add the following lines to the beginning of your file: +// ``` +// include +// ``` ////////////////////////////////////////////////////////////////////// /* @@ -30,8 +35,15 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include +include +include +include +include +include +include +include // vim: noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap + diff --git a/threading.scad b/threading.scad index e515765..f3e4082 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 +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -36,10 +36,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -use -use -use function _trpzd_thread_pt(thread, threads, start, starts, astep, asteps, part, parts) = diff --git a/torx_drive.scad b/torx_drive.scad index 3b0a48a..daa3f6f 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 +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -37,11 +37,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use -use -include -include - // Section: Functions diff --git a/transforms.scad b/transforms.scad index 9d5a059..ed421d5 100644 --- a/transforms.scad +++ b/transforms.scad @@ -3,8 +3,7 @@ // 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 // ``` ////////////////////////////////////////////////////////////////////// @@ -37,11 +36,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use -include -include - - ////////////////////////////////////////////////////////////////////// // Section: Translations diff --git a/triangulation.scad b/triangulation.scad index 43111f5..f824852 100644 --- a/triangulation.scad +++ b/triangulation.scad @@ -3,7 +3,8 @@ // Functions to triangulate polyhedron faces. // To use, add the following lines to the beginning of your file: // ``` -// use +// include +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -36,8 +37,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -use - // Section: Functions diff --git a/wiring.scad b/wiring.scad index 3d48c5d..3519d66 100644 --- a/wiring.scad +++ b/wiring.scad @@ -3,7 +3,10 @@ // Rendering for wiring bundles // To use, include the following line at the top of your file: // ``` -// use +// include +// include +// include +// include // ``` ////////////////////////////////////////////////////////////////////// @@ -36,10 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -include -include -include - // Section: Functions