grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-01 09:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #528 from revarbat/revarbat_dev

Browse source 
Cuboid() asserts for negative roundings/chamferings.
This commit is contained in:
Revar Desmera 2021-05-07 16:57:53 -07:00 committed by GitHub
commit 3f25aa7d87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
edges.scad
View file

@ -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]
];

3
shapes.scad
View file

@ -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,