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

Split apply() to be more efficient.

Browse source
This commit is contained in:
Garth Minette 2021-10-10 19:46:00 -07:00
parent 45daab05df
commit d6e24a8815
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
transforms.scad
View file

@ -1301,35 +1301,41 @@ function is_2d_transform(t) = // z-parameters are zero, except we allow t[2][
// stroke(path2,closed=true); // stroke(path2,closed=true);
function apply(transform,points) = function apply(transform,points) =
points==[] ? [] points==[] ? []
: is_vector(points) ? apply(transform, [points])[0] // point : is_vector(points) ? _apply(transform, [points])[0] // point
: is_vnf(points) ? // vnf : is_vnf(points) ? // vnf
let( let(
newvnf = [apply(transform, points[0]), points[1]], newvnf = [_apply(transform, points[0]), points[1]],
reverse = (len(transform)==len(transform[0])) && determinant(transform)<0 reverse = (len(transform)==len(transform[0])) && determinant(transform)<0
) )
reverse ? vnf_reverse_faces(newvnf) : newvnf reverse ? vnf_reverse_faces(newvnf) : newvnf
: is_list(points) && is_list(points[0]) && is_vector(points[0][0]) // bezier patch : is_list(points) && is_list(points[0]) && is_vector(points[0][0]) // bezier patch
? [for (x=points) apply(transform,x)] ? [for (x=points) _apply(transform,x)]
: assert(is_matrix(transform),"Invalid transformation matrix") // Assuming point list : _apply(transform,points);
function _apply(transform,points) =
assert(is_matrix(transform),"Invalid transformation matrix")
assert(is_matrix(points),"Invalid points list")
let( let(
tdim = len(transform[0])-1, tdim = len(transform[0])-1,
datadim = len(points[0]), datadim = len(points[0]),
outdim = min(datadim,len(transform)), outdim = min(datadim,len(transform)),
matrix = [for(i=[0:1:tdim]) [for(j=[0:1:outdim-1]) transform[j][i]]] matrix = [for(i=[0:1:tdim]) [for(j=[0:1:outdim-1]) transform[j][i]]]
) )
tdim==datadim && (datadim==3 || datadim==2) ? [for(p=points) concat(p,1)] * matrix tdim==datadim && (datadim==3 || datadim==2)
: tdim == 3 && datadim == 2 ? ? [for(p=points) concat(p,1)] * matrix
assert(is_2d_transform(transform), str("Transforms is 3d but points are 2d")) : tdim == 3 && datadim == 2 ?
[for(p=points) concat(p,[0,1])]*matrix assert(is_2d_transform(transform), str("Transforms is 3d but points are 2d"))
: tdim == 2 && datadim == 3 ? [for(p=points) concat(p,[0,1])]*matrix
let( : tdim == 2 && datadim == 3 ?
matrix3d =[[ matrix[0][0], matrix[0][1], 0], let(
[ matrix[1][0], matrix[1][1], 0], matrix3d =[[ matrix[0][0], matrix[0][1], 0],
[ 0, 0, 1], [ matrix[1][0], matrix[1][1], 0],
[ matrix[2][0], matrix[2][1], 0]] [ 0, 0, 1],
) [ matrix[2][0], matrix[2][1], 0]]
[for(p=points) concat(p,1)] * matrix3d )
: assert(false, str("Unsupported combination: transform with dimension ",tdim,", data of dimension ",datadim)); [for(p=points) concat(p,1)] * matrix3d
: assert(false, str("Unsupported combination: transform with dimension ",tdim,", data of dimension ",datadim));