aboutsummaryrefslogtreecommitdiff
path: root/js/lib/math
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:00:34 -0700
committerArmen Kesablyan2012-06-20 15:00:34 -0700
commit38f571d1fdf02d36c3816637af7b2ca2493809da (patch)
tree69b97839be8b2b6fb65e9150d4dc02856041fb1d /js/lib/math
parentf7c14e54c52bce8875cde81db621dde6f4ff1e34 (diff)
parent120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff)
downloadninja-38f571d1fdf02d36c3816637af7b2ca2493809da.tar.gz
Merge branch 'refs/heads/master' into binding
Diffstat (limited to 'js/lib/math')
-rwxr-xr-xjs/lib/math/matrix.js9
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
70Matrix.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
70Matrix.flatten = function (mat) { 79Matrix.flatten = function (mat) {
71 var result = []; 80 var result = [];
72 if (this.elements.length == 0) { 81 if (this.elements.length == 0) {