From 88314af127b821265ab8d225f07b5fa0c24e4140 Mon Sep 17 00:00:00 2001
From: Revar Desmera <revarbat@gmail.com>
Date: Mon, 17 Jun 2019 00:10:01 -0700
Subject: [PATCH] Moved some paths functions to geometry.scad

---
 geometry.scad            | 92 ++++++++++++++++++++++++++++++++++++++++
 paths.scad               | 92 ----------------------------------------
 scripts/make_all_docs.sh |  2 +-
 3 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/geometry.scad b/geometry.scad
index 6f88649..e8b1e7b 100644
--- a/geometry.scad
+++ b/geometry.scad
@@ -329,6 +329,98 @@ function in_front_of_plane(plane, point) =
 // Section: Paths and Polygons
 
 
+// Function: is_path()
+// Usage:
+//   is_path(x);
+// Description:
+//   Returns true if the given item looks like a path.
+function is_path(x) = is_list(x) && is_vector(x.x);
+
+
+// Function: is_closed_path()
+// Usage:
+//   is_closed_path(path, [eps]);
+// Description:
+//   Returns true if the first and last points in the given path are coincident.
+function is_closed_path(path, eps=1e-6) = approx(path[0], path[len(path)-1], eps=eps);
+
+
+// Function: close_path(path)
+// Usage:
+//   close_path(path);
+// Description:
+//   If a path's last point does not coincide with its first point, closes the path so it does.
+function close_path(path) = approx(path[0],path[len(path)-1])? path : concat(path,[path[0]]);
+
+
+// Function path_subselect()
+// Usage:
+//   path_subselect(path,s1,u1,s2,u2):
+// Description:
+//   Returns a portion of a path, from between the `u1` part of segment `s1`, to the `u2` part of
+//   segment `s2`.  Both `u1` and `u2` are values between 0.0 and 1.0, inclusive, where 0 is the start
+//   of the segment, and 1 is the end.  Both `s1` and `s2` are integers, where 0 is the first segment.
+// Arguments:
+//   s1 = The number of the starting segment.
+//   u1 = The proportion along the starting segment, between 0.0 and 1.0, inclusive.
+//   s2 = The number of the ending segment.
+//   u2 = The proportion along the ending segment, between 0.0 and 1.0, inclusive.
+function path_subselect(path,s1,u1,s2,u2) =
+	let(
+		l = len(path)-1,
+		u1 = s1<0? 0 : s1>l? 1 : u1,
+		u2 = s2<0? 0 : s2>l? 1 : u2,
+		s1 = constrain(s1,0,l),
+		s2 = constrain(s2,0,l),
+		pathout = concat(
+			(s1<l)? [lerp(path[s1],path[s1+1],u1)] : [],
+			[for (i=[s1+1:1:s2]) path[i]],
+			(s2<l)? [lerp(path[s2],path[s2+1],u2)] : []
+		)
+	) pathout;
+
+
+// Function: assemble_path_fragments()
+// Usage:
+//   assemble_path_fragments(subpaths);
+// Description:
+//   Given a list of incomplete paths, assembles them together into complete closed paths if it can.
+function assemble_path_fragments(subpaths,_finished=[]) =
+	len(subpaths)<=1? concat(_finished, subpaths) :
+	let(
+		path = subpaths[0],
+		matches = [
+			for (i=[1:1:len(subpaths)-1], rev1=[0,1], rev2=[0,1]) let(
+				idx1 = rev1? 0 : len(path)-1,
+				idx2 = rev2? len(subpaths[i])-1 : 0
+			) if (approx(path[idx1], subpaths[i][idx2])) [
+				i, concat(
+					rev1? reverse(path) : path,
+					select(rev2? reverse(subpaths[i]) : subpaths[i], 1,-1)
+				)
+			]
+		]
+	) len(matches)==0? (
+		assemble_path_fragments(
+			select(subpaths,1,-1),
+			concat(_finished, [path])
+		)
+	) : is_closed_path(matches[0][1])? (
+		assemble_path_fragments(
+			[for (i=[1:1:len(subpaths)-1]) if(i != matches[0][0]) subpaths[i]],
+			concat(_finished, [matches[0][1]])
+		)
+	) : (
+		assemble_path_fragments(
+			concat(
+				[matches[0][1]],
+				[for (i = [1:1:len(subpaths)-1]) if(i != matches[0][0]) subpaths[i]]
+			),
+			_finished
+		)
+	);
+
+
 // Function: simplify_path()
 // Description:
 //   Takes a path and removes unnecessary collinear points.
diff --git a/paths.scad b/paths.scad
index 92a75aa..be7a541 100644
--- a/paths.scad
+++ b/paths.scad
@@ -14,30 +14,6 @@ include <BOSL2/triangulation.scad>
 // Section: Functions
 
 
-// Function: is_path()
-// Usage:
-//   is_path(x);
-// Description:
-//   Returns true if the given item looks like a path.
-function is_path(x) = is_list(x) && is_vector(x.x);
-
-
-// Function: is_closed_path()
-// Usage:
-//   is_closed_path(path, [eps]);
-// Description:
-//   Returns true if the first and last points in the given path are coincident.
-function is_closed_path(path, eps=1e-6) = approx(path[0], path[len(path)-1], eps=eps);
-
-
-// Function: close_path(path)
-// Usage:
-//   close_path(path);
-// Description:
-//   If a path's last point does not coincide with its first point, closes the path so it does.
-function close_path(path) = approx(path[0],path[len(path)-1])? path : concat(path,[path[0]]);
-
-
 // Function: simplify2d_path()
 // Description:
 //   Takes a 2D polyline and removes unnecessary collinear points.
@@ -75,74 +51,6 @@ function path_length(path) =
 	sum([for (i = [0:1:len(path)-2]) norm(path[i+1]-path[i])]);
 
 
-// Function path_subselect()
-// Usage:
-//   path_subselect(path,s1,u1,s2,u2):
-// Description:
-//   Returns a portion of a path, from between the `u1` part of segment `s1`, to the `u2` part of
-//   segment `s2`.  Both `u1` and `u2` are values between 0.0 and 1.0, inclusive, where 0 is the start
-//   of the segment, and 1 is the end.  Both `s1` and `s2` are integers, where 0 is the first segment.
-// Arguments:
-//   s1 = The number of the starting segment.
-//   u1 = The proportion along the starting segment, between 0.0 and 1.0, inclusive.
-//   s2 = The number of the ending segment.
-//   u2 = The proportion along the ending segment, between 0.0 and 1.0, inclusive.
-function path_subselect(path,s1,u1,s2,u2) =
-	let(
-		l = len(path)-1,
-		u1 = s1<0? 0 : s1>l? 1 : u1,
-		u2 = s2<0? 0 : s2>l? 1 : u2,
-		s1 = constrain(s1,0,l),
-		s2 = constrain(s2,0,l),
-		pathout = concat(
-			(s1<l)? [lerp(path[s1],path[s1+1],u1)] : [],
-			[for (i=[s1+1:1:s2]) path[i]],
-			(s2<l)? [lerp(path[s2],path[s2+1],u2)] : []
-		)
-	) pathout;
-
-
-// Function: assemble_path_fragments()
-// Usage:
-//   assemble_path_fragments(subpaths);
-// Description:
-//   Given a list of incomplete paths, assembles them together into complete closed paths if it can.
-function assemble_path_fragments(subpaths,_finished=[]) =
-	len(subpaths)<=1? concat(_finished, subpaths) :
-	let(
-		path = subpaths[0],
-		matches = [
-			for (i=[1:1:len(subpaths)-1], rev1=[0,1], rev2=[0,1]) let(
-				idx1 = rev1? 0 : len(path)-1,
-				idx2 = rev2? len(subpaths[i])-1 : 0
-			) if (approx(path[idx1], subpaths[i][idx2])) [
-				i, concat(
-					rev1? reverse(path) : path,
-					select(rev2? reverse(subpaths[i]) : subpaths[i], 1,-1)
-				)
-			]
-		]
-	) len(matches)==0? (
-		assemble_path_fragments(
-			select(subpaths,1,-1),
-			concat(_finished, [path])
-		)
-	) : is_closed_path(matches[0][1])? (
-		assemble_path_fragments(
-			[for (i=[1:1:len(subpaths)-1]) if(i != matches[0][0]) subpaths[i]],
-			concat(_finished, [matches[0][1]])
-		)
-	) : (
-		assemble_path_fragments(
-			concat(
-				[matches[0][1]],
-				[for (i = [1:1:len(subpaths)-1]) if(i != matches[0][0]) subpaths[i]]
-			),
-			_finished
-		)
-	);
-
-
 // Function: path3d_spiral()
 // Description:
 //   Returns a 3D spiral path.
diff --git a/scripts/make_all_docs.sh b/scripts/make_all_docs.sh
index 24f4134..b00f93a 100755
--- a/scripts/make_all_docs.sh
+++ b/scripts/make_all_docs.sh
@@ -14,7 +14,7 @@ done
 if [[ "$FILES" != "" ]]; then
     PREVIEW_LIBS="$FILES"
 else
-    PREVIEW_LIBS="common errors attachments math arrays vectors affine coords geometry triangulation quaternions hull constants edges transforms primitives shapes masks shapes2d paths beziers roundcorners walls metric_screws threading involute_gears sliders joiners linear_bearings nema_steppers wiring phillips_drive torx_drive polyhedra debug"
+    PREVIEW_LIBS="common errors attachments math arrays vectors affine coords geometry triangulation quaternions strings structs hull constants edges transforms primitives shapes masks shapes2d paths beziers roundcorners walls metric_screws threading involute_gears sliders joiners linear_bearings nema_steppers wiring phillips_drive torx_drive polyhedra debug"
 fi
 
 dir="$(basename $PWD)"