From f8f7adbb45ba840e1c2ef6469b23f454ba9827c8 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Wed, 15 May 2019 19:14:21 +0800 Subject: [PATCH] refactor --- src/__private__/__to_ang_vector.scad | 7 +++++++ src/m_rotation.scad | 11 ++--------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 src/__private__/__to_ang_vector.scad diff --git a/src/__private__/__to_ang_vector.scad b/src/__private__/__to_ang_vector.scad new file mode 100644 index 00000000..41de7e99 --- /dev/null +++ b/src/__private__/__to_ang_vector.scad @@ -0,0 +1,7 @@ +function __to_3_elems_vect(a) = + let(leng = len(a)) + leng == 3 ? a : ( + leng == 2 ? [a[0], a[1], 0] : [a[0], 0, 0] + ); + +function __to_ang_vect(a) = __is_float(a) ? [0, 0, a] : __to_3_elems_vect (a); \ No newline at end of file diff --git a/src/m_rotation.scad b/src/m_rotation.scad index 5a450de9..fa48b2ba 100644 --- a/src/m_rotation.scad +++ b/src/m_rotation.scad @@ -9,6 +9,7 @@ **/ include <__private__/__is_float.scad>; +include <__private__/__to_ang_vector.scad>; function _q_rotation(a, v) = let( @@ -68,16 +69,8 @@ function _m_zRotation(a) = [0, 0, 0, 1] ]; -function _to_3_elems_vect(a) = - let(leng = len(a)) - leng == 3 ? a : ( - leng == 2 ? [a[0], a[1], 0] : [a[0], 0, 0] - ); - -function _to_ang_vect(a) = __is_float(a) ? [0, 0, a] : _to_3_elems_vect(a); - function _xyz_rotation(a) = - let(ang = _to_ang_vect(a)) + let(ang = __to_ang_vect(a)) _m_zRotation(ang[2]) * _m_yRotation(ang[1]) * _m_xRotation(ang[0]); function m_rotation(a, v) =