diff options
author | Armen Kesablyan | 2012-06-20 15:00:19 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:00:19 -0700 |
commit | 120e31dcf1e11eed11ee430d77c438e7b073e9f8 (patch) | |
tree | 8c07b1203de42f6efdeebfc8663072fffb4a567b /js/lib/math | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
parent | 52833c3d8a485944c42acc6ac0ae5139b3427da8 (diff) | |
download | ninja-120e31dcf1e11eed11ee430d77c438e7b073e9f8.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/lib/math')
-rwxr-xr-x | js/lib/math/matrix.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/js/lib/math/matrix.js b/js/lib/math/matrix.js index 77a0966d..3a5a8215 100755 --- a/js/lib/math/matrix.js +++ b/js/lib/math/matrix.js | |||
@@ -67,6 +67,15 @@ Matrix.Rotation = function(angle, axis) { | |||
67 | return mat; | 67 | return mat; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | Matrix.Scale = function( scaleVec ) { | ||
71 | var mat = Matrix.I(4); | ||
72 | mat[ 0] = scaleVec[0]; | ||
73 | mat[ 5] = scaleVec[1]; | ||
74 | mat[10] = scaleVec[2]; | ||
75 | |||
76 | return mat; | ||
77 | }; | ||
78 | |||
70 | Matrix.flatten = function (mat) { | 79 | Matrix.flatten = function (mat) { |
71 | var result = []; | 80 | var result = []; |
72 | if (this.elements.length == 0) { | 81 | if (this.elements.length == 0) { |