grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix coords.scad regressions.

Browse source
This commit is contained in:
Revar Desmera 2020-03-02 21:48:54 -08:00
parent 6de4efabe4
commit 19e6ec8093
3 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
coords.scad
View file

@ -30,11 +30,11 @@ function point2d(p, fill=0) = [for (i=[0:1]) (p[i]==undef)? fill : p[i]];
// points = A list of 2D or 3D points/vectors. // points = A list of 2D or 3D points/vectors.
// fill = Value to fill missing values in vectors with. // fill = Value to fill missing values in vectors with.
function path2d(points) = function path2d(points) =
assert(is_path(points,dim=undef,fast=true),"Input to path2d is not a path") assert(is_path(points,dim=undef,fast=true),"Input to path2d is not a path")
let (result = points * concat(ident(2), replist([0,0], len(points[0])-2))) let (result = points * concat(ident(2), replist([0,0], len(points[0])-2)))
assert(is_def(result), "Invalid input to path2d") assert(is_def(result), "Invalid input to path2d")
result; result;
// Function: point3d() // Function: point3d()
// Description: // Description:
@ -53,16 +53,16 @@ function point3d(p, fill=0) = [for (i=[0:2]) (p[i]==undef)? fill : p[i]];
// points = A list of 2D, 3D or higher dimensional points/vectors. // points = A list of 2D, 3D or higher dimensional points/vectors.
// fill = Value to fill missing values in vectors with (in the 2D case) // fill = Value to fill missing values in vectors with (in the 2D case)
function path3d(points, fill=0) = function path3d(points, fill=0) =
assert(is_num(fill)) assert(is_num(fill))
assert(is_path(points, dim=undef, fast=true), "Input to path3d is not a path") assert(is_path(points, dim=undef, fast=true), "Input to path3d is not a path")
let ( let (
change = len(points[0])-3, change = len(points[0])-3,
M = change < 0 ? [[1,0,0],[0,1,0]] : M = change < 0? [[1,0,0],[0,1,0]] :
concat(ident(3), replist([0,0,0],change)), concat(ident(3), replist([0,0,0],change)),
result = points*M result = points*M
) )
assert(is_def(result), "Input to path3d is invalid") assert(is_def(result), "Input to path3d is invalid")
fill == 0 || change>=0 ? result : result + replist([0,0,fill], len(result)); fill == 0 || change>=0 ? result : result + replist([0,0,fill], len(result));
// Function: point4d() // Function: point4d()

13
tests/test_coords.scad
View file

@ -10,7 +10,9 @@ test_point2d();
module test_path2d() { module test_path2d() {
assert(path2d([[1], [1,2], [1,2,3], [1,2,3,4], [1,2,3,4,5]])==[[1,0],[1,2],[1,2],[1,2],[1,2]]); assert(path2d([[1,2], [3,4], [5,6], [7,8]])==[[1,2],[3,4],[5,6],[7,8]]);
assert(path2d([[1,2,3], [2,3,4], [3,4,5], [4,5,6]])==[[1,2],[2,3],[3,4],[4,5]]);
assert(path2d([[1,2,3,4], [2,3,4,5], [3,4,5,6], [4,5,6,7]])==[[1,2],[2,3],[3,4],[4,5]]);
} }
test_path2d(); test_path2d();
@ -26,7 +28,9 @@ test_point3d();
module test_path3d() { module test_path3d() {
assert(path3d([[1], [1,2], [1,2,3], [1,2,3,4], [1,2,3,4,5]])==[[1,0,0],[1,2,0],[1,2,3],[1,2,3],[1,2,3]]); assert(path3d([[1,2], [3,4], [5,6], [7,8]])==[[1,2,0],[3,4,0],[5,6,0],[7,8,0]]);
assert(path3d([[1,2,3], [2,3,4], [3,4,5], [4,5,6]])==[[1,2,3],[2,3,4],[3,4,5],[4,5,6]]);
assert(path3d([[1,2,3,4], [2,3,4,5], [3,4,5,6], [4,5,6,7]])==[[1,2,3],[2,3,4],[3,4,5],[4,5,6]]);
} }
test_path3d(); test_path3d();
@ -42,7 +46,10 @@ test_point4d();
module test_path4d() { module test_path4d() {
assert(path4d([[1], [1,2], [1,2,3], [1,2,3,4], [1,2,3,4,5]])==[[1,0,0,0],[1,2,0,0],[1,2,3,0],[1,2,3,4],[1,2,3,4]]); assert(path4d([[1,2], [3,4], [5,6], [7,8]])==[[1,2,0,0],[3,4,0,0],[5,6,0,0],[7,8,0,0]]);
assert(path4d([[1,2,3], [2,3,4], [3,4,5], [4,5,6]])==[[1,2,3,0],[2,3,4,0],[3,4,5,0],[4,5,6,0]]);
assert(path4d([[1,2,3,4], [2,3,4,5], [3,4,5,6], [4,5,6,7]])==[[1,2,3,4],[2,3,4,5],[3,4,5,6],[4,5,6,7]]);
assert(path4d([[1,2,3,4,5], [2,3,4,5,6], [3,4,5,6,7], [4,5,6,7,8]])==[[1,2,3,4],[2,3,4,5],[3,4,5,6],[4,5,6,7]]);
} }
test_path4d(); test_path4d();

2
version.scad
View file

@ -8,7 +8,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
BOSL_VERSION = [2,0,149]; BOSL_VERSION = [2,0,150];
// Section: BOSL Library Version Functions // Section: BOSL Library Version Functions