From 8a29e9e86b1a3bedf52b33fe219b5174e5de5f43 Mon Sep 17 00:00:00 2001 From: Revar Desmera Date: Mon, 2 Mar 2020 12:42:29 -0800 Subject: [PATCH] Fixed matrix form of rot(from,to,a) --- transforms.scad | 8 +++++++- version.scad | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/transforms.scad b/transforms.scad index a788bfe..59de9a8 100644 --- a/transforms.scad +++ b/transforms.scad @@ -376,7 +376,13 @@ function rot(a=0, v=undef, cp=undef, from=undef, to=undef, reverse=false, p=unde is_undef(from)? affine2d_zrot(a*rev) : affine2d_zrot(vector_angle(from,to)*sign(vector_axis(from,to)[2])*rev) ) : ( - !is_undef(from)? affine3d_rot_by_axis(vector_axis(from,to),vector_angle(from,to)*rev) : + !is_undef(from)? affine3d_chain([ + affine3d_zrot(a*rev), + affine3d_rot_by_axis( + vector_axis(from,to), + vector_angle(from,to)*rev + ) + ]) : !is_undef(v)? affine3d_rot_by_axis(v,a*rev) : is_num(a)? affine3d_zrot(a*rev) : reverse? affine3d_chain([affine3d_zrot(-a.z),affine3d_yrot(-a.y),affine3d_xrot(-a.x)]) : diff --git a/version.scad b/version.scad index b44f031..939efa6 100644 --- a/version.scad +++ b/version.scad @@ -8,7 +8,7 @@ ////////////////////////////////////////////////////////////////////// -BOSL_VERSION = [2,0,142]; +BOSL_VERSION = [2,0,143]; // Section: BOSL Library Version Functions