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

Merge pull request #462 from revarbat/revarbat_dev

Browse source 
Fix rot(from=,to=,a=)...
This commit is contained in:
Revar Desmera 2021-03-08 14:59:22 -08:00 committed by GitHub
commit 26eb60f2e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/test_transforms.scad
View file

@ -304,7 +304,7 @@ module test_rot() {
for (a = angs) { for (a = angs) {
assert_equal( assert_equal(
rot(from=vec1, to=vec2, a=a), rot(from=vec1, to=vec2, a=a),
affine3d_rot_from_to(vec1,vec2) * affine3d_zrot(a), affine3d_rot_from_to(vec1,vec2) * affine3d_rot_by_axis(vec1,a),
info=str( info=str(
"from = ", vec1, ", ", "from = ", vec1, ", ",
"to = ", vec2, ", ", "to = ", vec2, ", ",
@ -314,7 +314,7 @@ module test_rot() {
assert_equal( assert_equal(
rot(from=vec1, to=vec2, a=a, p=pts3d), rot(from=vec1, to=vec2, a=a, p=pts3d),
apply( apply(
affine3d_rot_from_to(vec1,vec2) * affine3d_zrot(a), affine3d_rot_from_to(vec1,vec2) * affine3d_rot_by_axis(vec1,a),
pts3d pts3d
), ),
info=str( info=str(

2
transforms.scad
View file

@ -425,7 +425,7 @@ function rot(a=0, v, cp, from, to, reverse=false, planar=false, p, _m) =
cp = is_undef(cp)? undef : point3d(cp), cp = is_undef(cp)? undef : point3d(cp),
m1 = !is_undef(from)? ( m1 = !is_undef(from)? (
assert(is_num(a)) assert(is_num(a))
affine3d_rot_from_to(from,to) * affine3d_zrot(a) affine3d_rot_from_to(from,to) * affine3d_rot_by_axis(from,a)
) : ) :
!is_undef(v)? assert(is_num(a)) affine3d_rot_by_axis(v,a) : !is_undef(v)? assert(is_num(a)) affine3d_rot_by_axis(v,a) :
is_num(a)? affine3d_zrot(a) : is_num(a)? affine3d_zrot(a) :