Merge branch 'refs/heads/NINJAmaster' into TimelineUber

2 files changed, 72 insertions, 3 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 1c00f7ea..d6334e6c 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -139,8 +139,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
     handleCloseDocument:{
         value: function() {
             if(this.application.ninja.documentController._documents.length === 0){
-                this._eltArray = null;
-                this._planesArray = null;
+                this._eltArray.length = 0;
+                this._planesArray.length = 0;
             }
         }
     },
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js
index 3db95ab7..e6db4a8d 100755
--- a/js/helper-classes/3D/vec-utils.js
+++ b/js/helper-classes/3D/vec-utils.js
@@ -191,5 +191,74 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype,
 
             return vec;
         }
-    }
+    },
+
+        matI :
+        {
+                value: function(dimen)
+                {
+                        var mat = [];
+                        for (var i=0;  i<dimen*dimen;  i++)  mat.push(0);
+
+                        var index = 0;
+                        for (var i=0;  i<dimen;  i++)
+                        {
+                                mat[index] = 1.0;
+                                index += dimen + 1;
+                        }
+        
+                        return mat;     
+                }
+        },
+
+        matTranslation:
+        {
+                value: function (vec)
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.translate(mat, vec);
+                        return mat;
+                }
+        },
+
+        matRotationX:
+        {
+                value: function( angle )
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotateX(mat, angle);
+                        return mat;
+                }
+        },
+
+        matRotationY:
+        {
+                value: function( angle )
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotateY(mat, angle);
+                        return mat;
+                }
+        },
+
+        matRotationZ:
+        {
+                value: function( angle )
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotateZ(mat, angle);
+                        return mat;
+                }
+        },
+
+        matRotation:
+        {
+                value: function(angle, axis)
+                {
+                        var mat = Matrix.I(4);
+                        glmat4.rotate(mat, angle, axis);
+                        return mat;
+                }
+        },
+
 });
\ No newline at end of file