openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-18 12:31:17 +02:00
Code Issues Releases Wiki Activity

avoid func name conflicting

Browse Source
This commit is contained in:
Justin Lin
2019-05-03 09:13:53 +08:00
parent 502dcdde9b
commit 3603b92258
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/m_scaling.scad
View File

@@ -8,7 +8,7 @@
* *
**/ **/
function _to_vect(s) = function _to_svect(s) =
len(s) == 3 ? s : ( len(s) == 3 ? s : (
len(s) == 2 ? [s[0], s[1], 1] : ( len(s) == 2 ? [s[0], s[1], 1] : (
len(s) == 1 ? [s[0], 1, 1] : [s, s, s] len(s) == 1 ? [s[0], 1, 1] : [s, s, s]
@@ -16,7 +16,7 @@ function _to_vect(s) =
); );
function m_scaling(s) = function m_scaling(s) =
let(v = _to_vect(s)) let(v = _to_svect(s))
[ [
[v[0], 0, 0, 0], [v[0], 0, 0, 0],
[0, v[1], 0, 0], [0, v[1], 0, 0],

4
src/m_translation.scad
View File

@@ -8,7 +8,7 @@
* *
**/ **/
function _to_vect(v) = function _to_tvect(v) =
len(v) == 3 ? v : ( len(v) == 3 ? v : (
len(v) == 2 ? [v[0], v[1], 0] : ( len(v) == 2 ? [v[0], v[1], 0] : (
len(v) == 1 ? [v[0], 0, 0] : [v, 0, 0] len(v) == 1 ? [v[0], 0, 0] : [v, 0, 0]
@@ -16,7 +16,7 @@ function _to_vect(v) =
); );
function m_translation(v) = function m_translation(v) =
let(vt = _to_vect(v)) let(vt = _to_tvect(v))
[ [
[1, 0, 0, vt[0]], [1, 0, 0, vt[0]],
[0, 1, 0, vt[1]], [0, 1, 0, vt[1]],