From 0bce88654d9cb904c72f1b838fcf415b92e36caf Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Fri, 7 May 2021 16:45:14 -0700 Subject: [PATCH 1/2] Fixed edges.scad constants docs. --- edges.scad | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/edges.scad b/edges.scad index 72a838c..3401d63 100644 --- a/edges.scad +++ b/edges.scad @@ -51,8 +51,21 @@ // Section: Sets of Edges // Constants for specifying edges for `cuboid()`, etc. -EDGES_NONE = [[0,0,0,0], [0,0,0,0], [0,0,0,0]]; // No edges. -EDGES_ALL = [[1,1,1,1], [1,1,1,1], [1,1,1,1]]; // All edges. + +// Constant: EDGES_NONE +// Topics: Edges +// See Also: EDGES_ALL, edges() +// Description: +// The set of no edges. +EDGES_NONE = [[0,0,0,0], [0,0,0,0], [0,0,0,0]]; + + +// Constant: EDGES_ALL +// Topics: Edges +// See Also: EDGES_NONE, edges() +// Description: +// The set of all edges. +EDGES_ALL = [[1,1,1,1], [1,1,1,1], [1,1,1,1]]; // Section: Edge Helpers @@ -218,7 +231,11 @@ function edges(v, except=[]) = ); -EDGE_OFFSETS = [ // Array of XYZ offsets to the center of each edge. +// Constant: EDGES_OFFSETS +// See Also: edges() +// Description: +// Array of XYZ offsets to the center of each edge. +EDGE_OFFSETS = [ [ [ 0,-1,-1], [ 0, 1,-1], @@ -241,8 +258,19 @@ EDGE_OFFSETS = [ // Array of XYZ offsets to the center of each edge. // Section: Corner Sets // Constants for specifying corners. + +// Constant: CORNERS_NONE +// See Also: CORNERS_ALL, corners() +// Description: +// The set of no corners. CORNERS_NONE = [0,0,0,0,0,0,0,0]; // No corners. -CORNERS_ALL = [1,1,1,1,1,1,1,1]; // All corners. + + +// Constant: CORNERS_ALL +// See Also: CORNERS_NONE, corners() +// Description: +// The set of all corners. +CORNERS_ALL = [1,1,1,1,1,1,1,1]; // Section: Corner Helpers @@ -377,7 +405,11 @@ function corners(v, except=[]) = ) normalize_corners(a - b); -CORNER_OFFSETS = [ // Array of XYZ offsets to each corner. +// Constant: CORNER_OFFSETS +// See Also: corners() +// Description: +// Array of XYZ offsets to each corner. +CORNER_OFFSETS = [ [-1,-1,-1], [ 1,-1,-1], [-1, 1,-1], [ 1, 1,-1], [-1,-1, 1], [ 1,-1, 1], [-1, 1, 1], [ 1, 1, 1] ]; From 76d03aeea2b3e91d4190a33b3dd7a58021d133c4 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Fri, 7 May 2021 16:53:44 -0700 Subject: [PATCH 2/2] Correct suboid() asserts. --- shapes.scad | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shapes.scad b/shapes.scad index f0984fe..f485b5a 100644 --- a/shapes.scad +++ b/shapes.scad @@ -174,6 +174,7 @@ module cuboid( } } } else if (chamfer<0) { + assert(edges == EDGES_ALL || edges[2] == [0,0,0,0], "Cannot use negative chamfer with Z aligned edges."); ach = abs(chamfer); cube(size, center=true); @@ -260,6 +261,7 @@ module cuboid( } } } else if (rounding<0) { + assert(edges == EDGES_ALL || edges[2] == [0,0,0,0], "Cannot use negative rounding with Z aligned edges."); ard = abs(rounding); cube(size, center=true); @@ -322,6 +324,7 @@ module cuboid( } } + function cuboid( size=[1,1,1], p1, p2,