gl-matrix-rails 0.1.1 → 0.1.2

data/lib/gl-matrix/version.rb

@@ -1,6 +1,6 @@
 module GLMatrix
   module Version
-    MAJOR, MINOR, TINY = 0, 1, 1
+    MAJOR, MINOR, TINY = 0, 1, 2
     STRING = [MAJOR, MINOR, TINY].join '.'
   end
 

data/vendor/assets/javascripts/gl-matrix.js

@@ -1,24 +1,24 @@
 /**
-* @fileoverview gl-matrix - High performance matrix and vector operations
-* @author Brandon Jones
-* @author Colin MacKenzie IV
-* @version 2.1.0
-*/
+ * @fileoverview gl-matrix - High performance matrix and vector operations
+ * @author Brandon Jones
+ * @author Colin MacKenzie IV
+ * @version 2.1.0
+ */
 
 /* Copyright (c) 2013, Brandon Jones, Colin MacKenzie IV. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
     } else {
       // gl-matrix lives in a browser, define its namespaces in global
       shim.exports = window;
-    }
+    }    
   }
   else {
     // gl-matrix lives in commonjs, define its namespaces in exports
@@ -54,15 +54,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -81,16 +81,16 @@ if(!GLMAT_ARRAY_TYPE) {
 }
 
 /**
-* @class Common utilities
-* @name glMatrix
-*/
+ * @class Common utilities
+ * @name glMatrix
+ */
 var glMatrix = {};
 
 /**
-* Sets the type of array used when creating new vectors and matricies
-*
-* @param {Type} type Array type, such as Float32Array or Array
-*/
+ * Sets the type of array used when creating new vectors and matricies
+ *
+ * @param {Type} type Array type, such as Float32Array or Array
+ */
 glMatrix.setMatrixArrayType = function(type) {
     GLMAT_ARRAY_TYPE = type;
 }
@@ -104,15 +104,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -122,17 +122,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class 2 Dimensional Vector
-* @name vec2
-*/
+ * @class 2 Dimensional Vector
+ * @name vec2
+ */
 
 var vec2 = {};
 
 /**
-* Creates a new, empty vec2
-*
-* @returns {vec2} a new 2D vector
-*/
+ * Creates a new, empty vec2
+ *
+ * @returns {vec2} a new 2D vector
+ */
 vec2.create = function() {
     var out = new GLMAT_ARRAY_TYPE(2);
     out[0] = 0;
@@ -141,11 +141,11 @@ vec2.create = function() {
 };
 
 /**
-* Creates a new vec2 initialized with values from an existing vector
-*
-* @param {vec2} a vector to clone
-* @returns {vec2} a new 2D vector
-*/
+ * Creates a new vec2 initialized with values from an existing vector
+ *
+ * @param {vec2} a vector to clone
+ * @returns {vec2} a new 2D vector
+ */
 vec2.clone = function(a) {
     var out = new GLMAT_ARRAY_TYPE(2);
     out[0] = a[0];
@@ -154,12 +154,12 @@ vec2.clone = function(a) {
 };
 
 /**
-* Creates a new vec2 initialized with the given values
-*
-* @param {Number} x X component
-* @param {Number} y Y component
-* @returns {vec2} a new 2D vector
-*/
+ * Creates a new vec2 initialized with the given values
+ *
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @returns {vec2} a new 2D vector
+ */
 vec2.fromValues = function(x, y) {
     var out = new GLMAT_ARRAY_TYPE(2);
     out[0] = x;
@@ -168,12 +168,12 @@ vec2.fromValues = function(x, y) {
 };
 
 /**
-* Copy the values from one vec2 to another
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the source vector
-* @returns {vec2} out
-*/
+ * Copy the values from one vec2 to another
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the source vector
+ * @returns {vec2} out
+ */
 vec2.copy = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -181,13 +181,13 @@ vec2.copy = function(out, a) {
 };
 
 /**
-* Set the components of a vec2 to the given values
-*
-* @param {vec2} out the receiving vector
-* @param {Number} x X component
-* @param {Number} y Y component
-* @returns {vec2} out
-*/
+ * Set the components of a vec2 to the given values
+ *
+ * @param {vec2} out the receiving vector
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @returns {vec2} out
+ */
 vec2.set = function(out, x, y) {
     out[0] = x;
     out[1] = y;
@@ -195,13 +195,13 @@ vec2.set = function(out, x, y) {
 };
 
 /**
-* Adds two vec2's
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {vec2} out
-*/
+ * Adds two vec2's
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {vec2} out
+ */
 vec2.add = function(out, a, b) {
     out[0] = a[0] + b[0];
     out[1] = a[1] + b[1];
@@ -209,13 +209,13 @@ vec2.add = function(out, a, b) {
 };
 
 /**
-* Subtracts two vec2's
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {vec2} out
-*/
+ * Subtracts vector b from vector a
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {vec2} out
+ */
 vec2.subtract = function(out, a, b) {
     out[0] = a[0] - b[0];
     out[1] = a[1] - b[1];
@@ -223,19 +223,19 @@ vec2.subtract = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec2.subtract}
-* @function
-*/
+ * Alias for {@link vec2.subtract}
+ * @function
+ */
 vec2.sub = vec2.subtract;
 
 /**
-* Multiplies two vec2's
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {vec2} out
-*/
+ * Multiplies two vec2's
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {vec2} out
+ */
 vec2.multiply = function(out, a, b) {
     out[0] = a[0] * b[0];
     out[1] = a[1] * b[1];
@@ -243,19 +243,19 @@ vec2.multiply = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec2.multiply}
-* @function
-*/
+ * Alias for {@link vec2.multiply}
+ * @function
+ */
 vec2.mul = vec2.multiply;
 
 /**
-* Divides two vec2's
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {vec2} out
-*/
+ * Divides two vec2's
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {vec2} out
+ */
 vec2.divide = function(out, a, b) {
     out[0] = a[0] / b[0];
     out[1] = a[1] / b[1];
@@ -263,19 +263,19 @@ vec2.divide = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec2.divide}
-* @function
-*/
+ * Alias for {@link vec2.divide}
+ * @function
+ */
 vec2.div = vec2.divide;
 
 /**
-* Returns the minimum of two vec2's
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {vec2} out
-*/
+ * Returns the minimum of two vec2's
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {vec2} out
+ */
 vec2.min = function(out, a, b) {
     out[0] = Math.min(a[0], b[0]);
     out[1] = Math.min(a[1], b[1]);
@@ -283,13 +283,13 @@ vec2.min = function(out, a, b) {
 };
 
 /**
-* Returns the maximum of two vec2's
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {vec2} out
-*/
+ * Returns the maximum of two vec2's
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {vec2} out
+ */
 vec2.max = function(out, a, b) {
     out[0] = Math.max(a[0], b[0]);
     out[1] = Math.max(a[1], b[1]);
@@ -297,13 +297,13 @@ vec2.max = function(out, a, b) {
 };
 
 /**
-* Scales a vec2 by a scalar number
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the vector to scale
-* @param {Number} b amount to scale the vector by
-* @returns {vec2} out
-*/
+ * Scales a vec2 by a scalar number
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the vector to scale
+ * @param {Number} b amount to scale the vector by
+ * @returns {vec2} out
+ */
 vec2.scale = function(out, a, b) {
     out[0] = a[0] * b;
     out[1] = a[1] * b;
@@ -311,12 +311,27 @@ vec2.scale = function(out, a, b) {
 };
 
 /**
-* Calculates the euclidian distance between two vec2's
-*
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {Number} distance between a and b
-*/
+ * Adds two vec2's after scaling the second operand by a scalar value
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @param {Number} scale the amount to scale b by before adding
+ * @returns {vec2} out
+ */
+vec2.scaleAndAdd = function(out, a, b, scale) {
+    out[0] = a[0] + (b[0] * scale);
+    out[1] = a[1] + (b[1] * scale);
+    return out;
+};
+
+/**
+ * Calculates the euclidian distance between two vec2's
+ *
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {Number} distance between a and b
+ */
 vec2.distance = function(a, b) {
     var x = b[0] - a[0],
         y = b[1] - a[1];
@@ -324,18 +339,18 @@ vec2.distance = function(a, b) {
 };
 
 /**
-* Alias for {@link vec2.distance}
-* @function
-*/
+ * Alias for {@link vec2.distance}
+ * @function
+ */
 vec2.dist = vec2.distance;
 
 /**
-* Calculates the squared euclidian distance between two vec2's
-*
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {Number} squared distance between a and b
-*/
+ * Calculates the squared euclidian distance between two vec2's
+ *
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {Number} squared distance between a and b
+ */
 vec2.squaredDistance = function(a, b) {
     var x = b[0] - a[0],
         y = b[1] - a[1];
@@ -343,17 +358,17 @@ vec2.squaredDistance = function(a, b) {
 };
 
 /**
-* Alias for {@link vec2.squaredDistance}
-* @function
-*/
+ * Alias for {@link vec2.squaredDistance}
+ * @function
+ */
 vec2.sqrDist = vec2.squaredDistance;
 
 /**
-* Calculates the length of a vec2
-*
-* @param {vec2} a vector to calculate length of
-* @returns {Number} length of a
-*/
+ * Calculates the length of a vec2
+ *
+ * @param {vec2} a vector to calculate length of
+ * @returns {Number} length of a
+ */
 vec2.length = function (a) {
     var x = a[0],
         y = a[1];
@@ -361,17 +376,17 @@ vec2.length = function (a) {
 };
 
 /**
-* Alias for {@link vec2.length}
-* @function
-*/
+ * Alias for {@link vec2.length}
+ * @function
+ */
 vec2.len = vec2.length;
 
 /**
-* Calculates the squared length of a vec2
-*
-* @param {vec2} a vector to calculate squared length of
-* @returns {Number} squared length of a
-*/
+ * Calculates the squared length of a vec2
+ *
+ * @param {vec2} a vector to calculate squared length of
+ * @returns {Number} squared length of a
+ */
 vec2.squaredLength = function (a) {
     var x = a[0],
         y = a[1];
@@ -379,18 +394,18 @@ vec2.squaredLength = function (a) {
 };
 
 /**
-* Alias for {@link vec2.squaredLength}
-* @function
-*/
+ * Alias for {@link vec2.squaredLength}
+ * @function
+ */
 vec2.sqrLen = vec2.squaredLength;
 
 /**
-* Negates the components of a vec2
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a vector to negate
-* @returns {vec2} out
-*/
+ * Negates the components of a vec2
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a vector to negate
+ * @returns {vec2} out
+ */
 vec2.negate = function(out, a) {
     out[0] = -a[0];
     out[1] = -a[1];
@@ -398,12 +413,12 @@ vec2.negate = function(out, a) {
 };
 
 /**
-* Normalize a vec2
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a vector to normalize
-* @returns {vec2} out
-*/
+ * Normalize a vec2
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a vector to normalize
+ * @returns {vec2} out
+ */
 vec2.normalize = function(out, a) {
     var x = a[0],
         y = a[1];
@@ -418,25 +433,25 @@ vec2.normalize = function(out, a) {
 };
 
 /**
-* Calculates the dot product of two vec2's
-*
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {Number} dot product of a and b
-*/
+ * Calculates the dot product of two vec2's
+ *
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {Number} dot product of a and b
+ */
 vec2.dot = function (a, b) {
     return a[0] * b[0] + a[1] * b[1];
 };
 
 /**
-* Computes the cross product of two vec2's
-* Note that the cross product must by definition produce a 3D vector
-*
-* @param {vec3} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @returns {vec3} out
-*/
+ * Computes the cross product of two vec2's
+ * Note that the cross product must by definition produce a 3D vector
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @returns {vec3} out
+ */
 vec2.cross = function(out, a, b) {
     var z = a[0] * b[1] - a[1] * b[0];
     out[0] = out[1] = 0;
@@ -445,14 +460,14 @@ vec2.cross = function(out, a, b) {
 };
 
 /**
-* Performs a linear interpolation between two vec2's
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the first operand
-* @param {vec2} b the second operand
-* @param {Number} t interpolation amount between the two inputs
-* @returns {vec2} out
-*/
+ * Performs a linear interpolation between two vec2's
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the first operand
+ * @param {vec2} b the second operand
+ * @param {Number} t interpolation amount between the two inputs
+ * @returns {vec2} out
+ */
 vec2.lerp = function (out, a, b, t) {
     var ax = a[0],
         ay = a[1];
@@ -462,13 +477,13 @@ vec2.lerp = function (out, a, b, t) {
 };
 
 /**
-* Transforms the vec2 with a mat2
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the vector to transform
-* @param {mat2} m matrix to transform with
-* @returns {vec2} out
-*/
+ * Transforms the vec2 with a mat2
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the vector to transform
+ * @param {mat2} m matrix to transform with
+ * @returns {vec2} out
+ */
 vec2.transformMat2 = function(out, a, m) {
     var x = a[0],
         y = a[1];
@@ -478,13 +493,13 @@ vec2.transformMat2 = function(out, a, m) {
 };
 
 /**
-* Transforms the vec2 with a mat2d
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the vector to transform
-* @param {mat2d} m matrix to transform with
-* @returns {vec2} out
-*/
+ * Transforms the vec2 with a mat2d
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the vector to transform
+ * @param {mat2d} m matrix to transform with
+ * @returns {vec2} out
+ */
 vec2.transformMat2d = function(out, a, m) {
     var x = a[0],
         y = a[1];
@@ -494,14 +509,14 @@ vec2.transformMat2d = function(out, a, m) {
 };
 
 /**
-* Transforms the vec2 with a mat3
-* 3rd vector component is implicitly '1'
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the vector to transform
-* @param {mat3} m matrix to transform with
-* @returns {vec2} out
-*/
+ * Transforms the vec2 with a mat3
+ * 3rd vector component is implicitly '1'
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the vector to transform
+ * @param {mat3} m matrix to transform with
+ * @returns {vec2} out
+ */
 vec2.transformMat3 = function(out, a, m) {
     var x = a[0],
         y = a[1];
@@ -511,17 +526,17 @@ vec2.transformMat3 = function(out, a, m) {
 };
 
 /**
-* Transforms the vec2 with a mat4
-* 3rd vector component is implicitly '0'
-* 4th vector component is implicitly '1'
-*
-* @param {vec2} out the receiving vector
-* @param {vec2} a the vector to transform
-* @param {mat4} m matrix to transform with
-* @returns {vec2} out
-*/
+ * Transforms the vec2 with a mat4
+ * 3rd vector component is implicitly '0'
+ * 4th vector component is implicitly '1'
+ *
+ * @param {vec2} out the receiving vector
+ * @param {vec2} a the vector to transform
+ * @param {mat4} m matrix to transform with
+ * @returns {vec2} out
+ */
 vec2.transformMat4 = function(out, a, m) {
-    var x = a[0],
+    var x = a[0], 
         y = a[1];
     out[0] = m[0] * x + m[4] * y + m[12];
     out[1] = m[1] * x + m[5] * y + m[13];
@@ -529,17 +544,17 @@ vec2.transformMat4 = function(out, a, m) {
 };
 
 /**
-* Perform some operation over an array of vec2s.
-*
-* @param {Array} a the array of vectors to iterate over
-* @param {Number} stride Number of elements between the start of each vec2. If 0 assumes tightly packed
-* @param {Number} offset Number of elements to skip at the beginning of the array
-* @param {Number} count Number of vec2s to iterate over. If 0 iterates over entire array
-* @param {Function} fn Function to call for each vector in the array
-* @param {Object} [arg] additional argument to pass to fn
-* @returns {Array} a
-* @function
-*/
+ * Perform some operation over an array of vec2s.
+ *
+ * @param {Array} a the array of vectors to iterate over
+ * @param {Number} stride Number of elements between the start of each vec2. If 0 assumes tightly packed
+ * @param {Number} offset Number of elements to skip at the beginning of the array
+ * @param {Number} count Number of vec2s to iterate over. If 0 iterates over entire array
+ * @param {Function} fn Function to call for each vector in the array
+ * @param {Object} [arg] additional argument to pass to fn
+ * @returns {Array} a
+ * @function
+ */
 vec2.forEach = (function() {
     var vec = vec2.create();
 
@@ -570,11 +585,11 @@ vec2.forEach = (function() {
 })();
 
 /**
-* Returns a string representation of a vector
-*
-* @param {vec2} vec vector to represent as a string
-* @returns {String} string representation of the vector
-*/
+ * Returns a string representation of a vector
+ *
+ * @param {vec2} vec vector to represent as a string
+ * @returns {String} string representation of the vector
+ */
 vec2.str = function (a) {
     return 'vec2(' + a[0] + ', ' + a[1] + ')';
 };
@@ -588,15 +603,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -606,17 +621,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class 3 Dimensional Vector
-* @name vec3
-*/
+ * @class 3 Dimensional Vector
+ * @name vec3
+ */
 
 var vec3 = {};
 
 /**
-* Creates a new, empty vec3
-*
-* @returns {vec3} a new 3D vector
-*/
+ * Creates a new, empty vec3
+ *
+ * @returns {vec3} a new 3D vector
+ */
 vec3.create = function() {
     var out = new GLMAT_ARRAY_TYPE(3);
     out[0] = 0;
@@ -626,11 +641,11 @@ vec3.create = function() {
 };
 
 /**
-* Creates a new vec3 initialized with values from an existing vector
-*
-* @param {vec3} a vector to clone
-* @returns {vec3} a new 3D vector
-*/
+ * Creates a new vec3 initialized with values from an existing vector
+ *
+ * @param {vec3} a vector to clone
+ * @returns {vec3} a new 3D vector
+ */
 vec3.clone = function(a) {
     var out = new GLMAT_ARRAY_TYPE(3);
     out[0] = a[0];
@@ -640,13 +655,13 @@ vec3.clone = function(a) {
 };
 
 /**
-* Creates a new vec3 initialized with the given values
-*
-* @param {Number} x X component
-* @param {Number} y Y component
-* @param {Number} z Z component
-* @returns {vec3} a new 3D vector
-*/
+ * Creates a new vec3 initialized with the given values
+ *
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @param {Number} z Z component
+ * @returns {vec3} a new 3D vector
+ */
 vec3.fromValues = function(x, y, z) {
     var out = new GLMAT_ARRAY_TYPE(3);
     out[0] = x;
@@ -656,12 +671,12 @@ vec3.fromValues = function(x, y, z) {
 };
 
 /**
-* Copy the values from one vec3 to another
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the source vector
-* @returns {vec3} out
-*/
+ * Copy the values from one vec3 to another
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the source vector
+ * @returns {vec3} out
+ */
 vec3.copy = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -670,14 +685,14 @@ vec3.copy = function(out, a) {
 };
 
 /**
-* Set the components of a vec3 to the given values
-*
-* @param {vec3} out the receiving vector
-* @param {Number} x X component
-* @param {Number} y Y component
-* @param {Number} z Z component
-* @returns {vec3} out
-*/
+ * Set the components of a vec3 to the given values
+ *
+ * @param {vec3} out the receiving vector
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @param {Number} z Z component
+ * @returns {vec3} out
+ */
 vec3.set = function(out, x, y, z) {
     out[0] = x;
     out[1] = y;
@@ -686,13 +701,13 @@ vec3.set = function(out, x, y, z) {
 };
 
 /**
-* Adds two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {vec3} out
-*/
+ * Adds two vec3's
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {vec3} out
+ */
 vec3.add = function(out, a, b) {
     out[0] = a[0] + b[0];
     out[1] = a[1] + b[1];
@@ -701,13 +716,13 @@ vec3.add = function(out, a, b) {
 };
 
 /**
-* Subtracts two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {vec3} out
-*/
+ * Subtracts vector b from vector a
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {vec3} out
+ */
 vec3.subtract = function(out, a, b) {
     out[0] = a[0] - b[0];
     out[1] = a[1] - b[1];
@@ -716,19 +731,19 @@ vec3.subtract = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec3.subtract}
-* @function
-*/
+ * Alias for {@link vec3.subtract}
+ * @function
+ */
 vec3.sub = vec3.subtract;
 
 /**
-* Multiplies two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {vec3} out
-*/
+ * Multiplies two vec3's
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {vec3} out
+ */
 vec3.multiply = function(out, a, b) {
     out[0] = a[0] * b[0];
     out[1] = a[1] * b[1];
@@ -737,19 +752,19 @@ vec3.multiply = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec3.multiply}
-* @function
-*/
+ * Alias for {@link vec3.multiply}
+ * @function
+ */
 vec3.mul = vec3.multiply;
 
 /**
-* Divides two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {vec3} out
-*/
+ * Divides two vec3's
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {vec3} out
+ */
 vec3.divide = function(out, a, b) {
     out[0] = a[0] / b[0];
     out[1] = a[1] / b[1];
@@ -758,19 +773,19 @@ vec3.divide = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec3.divide}
-* @function
-*/
+ * Alias for {@link vec3.divide}
+ * @function
+ */
 vec3.div = vec3.divide;
 
 /**
-* Returns the minimum of two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {vec3} out
-*/
+ * Returns the minimum of two vec3's
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {vec3} out
+ */
 vec3.min = function(out, a, b) {
     out[0] = Math.min(a[0], b[0]);
     out[1] = Math.min(a[1], b[1]);
@@ -779,13 +794,13 @@ vec3.min = function(out, a, b) {
 };
 
 /**
-* Returns the maximum of two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {vec3} out
-*/
+ * Returns the maximum of two vec3's
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {vec3} out
+ */
 vec3.max = function(out, a, b) {
     out[0] = Math.max(a[0], b[0]);
     out[1] = Math.max(a[1], b[1]);
@@ -794,13 +809,13 @@ vec3.max = function(out, a, b) {
 };
 
 /**
-* Scales a vec3 by a scalar number
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the vector to scale
-* @param {Number} b amount to scale the vector by
-* @returns {vec3} out
-*/
+ * Scales a vec3 by a scalar number
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the vector to scale
+ * @param {Number} b amount to scale the vector by
+ * @returns {vec3} out
+ */
 vec3.scale = function(out, a, b) {
     out[0] = a[0] * b;
     out[1] = a[1] * b;
@@ -809,12 +824,28 @@ vec3.scale = function(out, a, b) {
 };
 
 /**
-* Calculates the euclidian distance between two vec3's
-*
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {Number} distance between a and b
-*/
+ * Adds two vec3's after scaling the second operand by a scalar value
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @param {Number} scale the amount to scale b by before adding
+ * @returns {vec3} out
+ */
+vec3.scaleAndAdd = function(out, a, b, scale) {
+    out[0] = a[0] + (b[0] * scale);
+    out[1] = a[1] + (b[1] * scale);
+    out[2] = a[2] + (b[2] * scale);
+    return out;
+};
+
+/**
+ * Calculates the euclidian distance between two vec3's
+ *
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {Number} distance between a and b
+ */
 vec3.distance = function(a, b) {
     var x = b[0] - a[0],
         y = b[1] - a[1],
@@ -823,18 +854,18 @@ vec3.distance = function(a, b) {
 };
 
 /**
-* Alias for {@link vec3.distance}
-* @function
-*/
+ * Alias for {@link vec3.distance}
+ * @function
+ */
 vec3.dist = vec3.distance;
 
 /**
-* Calculates the squared euclidian distance between two vec3's
-*
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {Number} squared distance between a and b
-*/
+ * Calculates the squared euclidian distance between two vec3's
+ *
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {Number} squared distance between a and b
+ */
 vec3.squaredDistance = function(a, b) {
     var x = b[0] - a[0],
         y = b[1] - a[1],
@@ -843,17 +874,17 @@ vec3.squaredDistance = function(a, b) {
 };
 
 /**
-* Alias for {@link vec3.squaredDistance}
-* @function
-*/
+ * Alias for {@link vec3.squaredDistance}
+ * @function
+ */
 vec3.sqrDist = vec3.squaredDistance;
 
 /**
-* Calculates the length of a vec3
-*
-* @param {vec3} a vector to calculate length of
-* @returns {Number} length of a
-*/
+ * Calculates the length of a vec3
+ *
+ * @param {vec3} a vector to calculate length of
+ * @returns {Number} length of a
+ */
 vec3.length = function (a) {
     var x = a[0],
         y = a[1],
@@ -862,17 +893,17 @@ vec3.length = function (a) {
 };
 
 /**
-* Alias for {@link vec3.length}
-* @function
-*/
+ * Alias for {@link vec3.length}
+ * @function
+ */
 vec3.len = vec3.length;
 
 /**
-* Calculates the squared length of a vec3
-*
-* @param {vec3} a vector to calculate squared length of
-* @returns {Number} squared length of a
-*/
+ * Calculates the squared length of a vec3
+ *
+ * @param {vec3} a vector to calculate squared length of
+ * @returns {Number} squared length of a
+ */
 vec3.squaredLength = function (a) {
     var x = a[0],
         y = a[1],
@@ -881,18 +912,18 @@ vec3.squaredLength = function (a) {
 };
 
 /**
-* Alias for {@link vec3.squaredLength}
-* @function
-*/
+ * Alias for {@link vec3.squaredLength}
+ * @function
+ */
 vec3.sqrLen = vec3.squaredLength;
 
 /**
-* Negates the components of a vec3
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a vector to negate
-* @returns {vec3} out
-*/
+ * Negates the components of a vec3
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a vector to negate
+ * @returns {vec3} out
+ */
 vec3.negate = function(out, a) {
     out[0] = -a[0];
     out[1] = -a[1];
@@ -901,12 +932,12 @@ vec3.negate = function(out, a) {
 };
 
 /**
-* Normalize a vec3
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a vector to normalize
-* @returns {vec3} out
-*/
+ * Normalize a vec3
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a vector to normalize
+ * @returns {vec3} out
+ */
 vec3.normalize = function(out, a) {
     var x = a[0],
         y = a[1],
@@ -923,24 +954,24 @@ vec3.normalize = function(out, a) {
 };
 
 /**
-* Calculates the dot product of two vec3's
-*
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {Number} dot product of a and b
-*/
+ * Calculates the dot product of two vec3's
+ *
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {Number} dot product of a and b
+ */
 vec3.dot = function (a, b) {
     return a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
 };
 
 /**
-* Computes the cross product of two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @returns {vec3} out
-*/
+ * Computes the cross product of two vec3's
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @returns {vec3} out
+ */
 vec3.cross = function(out, a, b) {
     var ax = a[0], ay = a[1], az = a[2],
         bx = b[0], by = b[1], bz = b[2];
@@ -952,14 +983,14 @@ vec3.cross = function(out, a, b) {
 };
 
 /**
-* Performs a linear interpolation between two vec3's
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the first operand
-* @param {vec3} b the second operand
-* @param {Number} t interpolation amount between the two inputs
-* @returns {vec3} out
-*/
+ * Performs a linear interpolation between two vec3's
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the first operand
+ * @param {vec3} b the second operand
+ * @param {Number} t interpolation amount between the two inputs
+ * @returns {vec3} out
+ */
 vec3.lerp = function (out, a, b, t) {
     var ax = a[0],
         ay = a[1],
@@ -971,14 +1002,14 @@ vec3.lerp = function (out, a, b, t) {
 };
 
 /**
-* Transforms the vec3 with a mat4.
-* 4th vector component is implicitly '1'
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the vector to transform
-* @param {mat4} m matrix to transform with
-* @returns {vec3} out
-*/
+ * Transforms the vec3 with a mat4.
+ * 4th vector component is implicitly '1'
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the vector to transform
+ * @param {mat4} m matrix to transform with
+ * @returns {vec3} out
+ */
 vec3.transformMat4 = function(out, a, m) {
     var x = a[0], y = a[1], z = a[2];
     out[0] = m[0] * x + m[4] * y + m[8] * z + m[12];
@@ -988,13 +1019,29 @@ vec3.transformMat4 = function(out, a, m) {
 };
 
 /**
-* Transforms the vec3 with a quat
-*
-* @param {vec3} out the receiving vector
-* @param {vec3} a the vector to transform
-* @param {quat} q quaternion to transform with
-* @returns {vec3} out
-*/
+ * Transforms the vec3 with a mat3.
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the vector to transform
+ * @param {mat4} m the 3x3 matrix to transform with
+ * @returns {vec3} out
+ */
+vec3.transformMat3 = function(out, a, m) {
+    var x = a[0], y = a[1], z = a[2];
+    out[0] = x * m[0] + y * m[3] + z * m[6];
+    out[1] = x * m[1] + y * m[4] + z * m[7];
+    out[2] = x * m[2] + y * m[5] + z * m[8];
+    return out;
+};
+
+/**
+ * Transforms the vec3 with a quat
+ *
+ * @param {vec3} out the receiving vector
+ * @param {vec3} a the vector to transform
+ * @param {quat} q quaternion to transform with
+ * @returns {vec3} out
+ */
 vec3.transformQuat = function(out, a, q) {
     var x = a[0], y = a[1], z = a[2],
         qx = q[0], qy = q[1], qz = q[2], qw = q[3],
@@ -1013,17 +1060,17 @@ vec3.transformQuat = function(out, a, q) {
 };
 
 /**
-* Perform some operation over an array of vec3s.
-*
-* @param {Array} a the array of vectors to iterate over
-* @param {Number} stride Number of elements between the start of each vec3. If 0 assumes tightly packed
-* @param {Number} offset Number of elements to skip at the beginning of the array
-* @param {Number} count Number of vec3s to iterate over. If 0 iterates over entire array
-* @param {Function} fn Function to call for each vector in the array
-* @param {Object} [arg] additional argument to pass to fn
-* @returns {Array} a
-* @function
-*/
+ * Perform some operation over an array of vec3s.
+ *
+ * @param {Array} a the array of vectors to iterate over
+ * @param {Number} stride Number of elements between the start of each vec3. If 0 assumes tightly packed
+ * @param {Number} offset Number of elements to skip at the beginning of the array
+ * @param {Number} count Number of vec3s to iterate over. If 0 iterates over entire array
+ * @param {Function} fn Function to call for each vector in the array
+ * @param {Object} [arg] additional argument to pass to fn
+ * @returns {Array} a
+ * @function
+ */
 vec3.forEach = (function() {
     var vec = vec3.create();
 
@@ -1054,11 +1101,11 @@ vec3.forEach = (function() {
 })();
 
 /**
-* Returns a string representation of a vector
-*
-* @param {vec3} vec vector to represent as a string
-* @returns {String} string representation of the vector
-*/
+ * Returns a string representation of a vector
+ *
+ * @param {vec3} vec vector to represent as a string
+ * @returns {String} string representation of the vector
+ */
 vec3.str = function (a) {
     return 'vec3(' + a[0] + ', ' + a[1] + ', ' + a[2] + ')';
 };
@@ -1072,15 +1119,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -1090,17 +1137,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class 4 Dimensional Vector
-* @name vec4
-*/
+ * @class 4 Dimensional Vector
+ * @name vec4
+ */
 
 var vec4 = {};
 
 /**
-* Creates a new, empty vec4
-*
-* @returns {vec4} a new 4D vector
-*/
+ * Creates a new, empty vec4
+ *
+ * @returns {vec4} a new 4D vector
+ */
 vec4.create = function() {
     var out = new GLMAT_ARRAY_TYPE(4);
     out[0] = 0;
@@ -1111,11 +1158,11 @@ vec4.create = function() {
 };
 
 /**
-* Creates a new vec4 initialized with values from an existing vector
-*
-* @param {vec4} a vector to clone
-* @returns {vec4} a new 4D vector
-*/
+ * Creates a new vec4 initialized with values from an existing vector
+ *
+ * @param {vec4} a vector to clone
+ * @returns {vec4} a new 4D vector
+ */
 vec4.clone = function(a) {
     var out = new GLMAT_ARRAY_TYPE(4);
     out[0] = a[0];
@@ -1126,14 +1173,14 @@ vec4.clone = function(a) {
 };
 
 /**
-* Creates a new vec4 initialized with the given values
-*
-* @param {Number} x X component
-* @param {Number} y Y component
-* @param {Number} z Z component
-* @param {Number} w W component
-* @returns {vec4} a new 4D vector
-*/
+ * Creates a new vec4 initialized with the given values
+ *
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @param {Number} z Z component
+ * @param {Number} w W component
+ * @returns {vec4} a new 4D vector
+ */
 vec4.fromValues = function(x, y, z, w) {
     var out = new GLMAT_ARRAY_TYPE(4);
     out[0] = x;
@@ -1144,12 +1191,12 @@ vec4.fromValues = function(x, y, z, w) {
 };
 
 /**
-* Copy the values from one vec4 to another
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the source vector
-* @returns {vec4} out
-*/
+ * Copy the values from one vec4 to another
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the source vector
+ * @returns {vec4} out
+ */
 vec4.copy = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -1159,15 +1206,15 @@ vec4.copy = function(out, a) {
 };
 
 /**
-* Set the components of a vec4 to the given values
-*
-* @param {vec4} out the receiving vector
-* @param {Number} x X component
-* @param {Number} y Y component
-* @param {Number} z Z component
-* @param {Number} w W component
-* @returns {vec4} out
-*/
+ * Set the components of a vec4 to the given values
+ *
+ * @param {vec4} out the receiving vector
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @param {Number} z Z component
+ * @param {Number} w W component
+ * @returns {vec4} out
+ */
 vec4.set = function(out, x, y, z, w) {
     out[0] = x;
     out[1] = y;
@@ -1177,13 +1224,13 @@ vec4.set = function(out, x, y, z, w) {
 };
 
 /**
-* Adds two vec4's
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {vec4} out
-*/
+ * Adds two vec4's
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {vec4} out
+ */
 vec4.add = function(out, a, b) {
     out[0] = a[0] + b[0];
     out[1] = a[1] + b[1];
@@ -1193,13 +1240,13 @@ vec4.add = function(out, a, b) {
 };
 
 /**
-* Subtracts two vec4's
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {vec4} out
-*/
+ * Subtracts vector b from vector a
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {vec4} out
+ */
 vec4.subtract = function(out, a, b) {
     out[0] = a[0] - b[0];
     out[1] = a[1] - b[1];
@@ -1209,19 +1256,19 @@ vec4.subtract = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec4.subtract}
-* @function
-*/
+ * Alias for {@link vec4.subtract}
+ * @function
+ */
 vec4.sub = vec4.subtract;
 
 /**
-* Multiplies two vec4's
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {vec4} out
-*/
+ * Multiplies two vec4's
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {vec4} out
+ */
 vec4.multiply = function(out, a, b) {
     out[0] = a[0] * b[0];
     out[1] = a[1] * b[1];
@@ -1231,19 +1278,19 @@ vec4.multiply = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec4.multiply}
-* @function
-*/
+ * Alias for {@link vec4.multiply}
+ * @function
+ */
 vec4.mul = vec4.multiply;
 
 /**
-* Divides two vec4's
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {vec4} out
-*/
+ * Divides two vec4's
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {vec4} out
+ */
 vec4.divide = function(out, a, b) {
     out[0] = a[0] / b[0];
     out[1] = a[1] / b[1];
@@ -1253,19 +1300,19 @@ vec4.divide = function(out, a, b) {
 };
 
 /**
-* Alias for {@link vec4.divide}
-* @function
-*/
+ * Alias for {@link vec4.divide}
+ * @function
+ */
 vec4.div = vec4.divide;
 
 /**
-* Returns the minimum of two vec4's
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {vec4} out
-*/
+ * Returns the minimum of two vec4's
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {vec4} out
+ */
 vec4.min = function(out, a, b) {
     out[0] = Math.min(a[0], b[0]);
     out[1] = Math.min(a[1], b[1]);
@@ -1275,13 +1322,13 @@ vec4.min = function(out, a, b) {
 };
 
 /**
-* Returns the maximum of two vec4's
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {vec4} out
-*/
+ * Returns the maximum of two vec4's
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {vec4} out
+ */
 vec4.max = function(out, a, b) {
     out[0] = Math.max(a[0], b[0]);
     out[1] = Math.max(a[1], b[1]);
@@ -1291,13 +1338,13 @@ vec4.max = function(out, a, b) {
 };
 
 /**
-* Scales a vec4 by a scalar number
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the vector to scale
-* @param {Number} b amount to scale the vector by
-* @returns {vec4} out
-*/
+ * Scales a vec4 by a scalar number
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the vector to scale
+ * @param {Number} b amount to scale the vector by
+ * @returns {vec4} out
+ */
 vec4.scale = function(out, a, b) {
     out[0] = a[0] * b;
     out[1] = a[1] * b;
@@ -1307,12 +1354,29 @@ vec4.scale = function(out, a, b) {
 };
 
 /**
-* Calculates the euclidian distance between two vec4's
-*
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {Number} distance between a and b
-*/
+ * Adds two vec4's after scaling the second operand by a scalar value
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @param {Number} scale the amount to scale b by before adding
+ * @returns {vec4} out
+ */
+vec4.scaleAndAdd = function(out, a, b, scale) {
+    out[0] = a[0] + (b[0] * scale);
+    out[1] = a[1] + (b[1] * scale);
+    out[2] = a[2] + (b[2] * scale);
+    out[3] = a[3] + (b[3] * scale);
+    return out;
+};
+
+/**
+ * Calculates the euclidian distance between two vec4's
+ *
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {Number} distance between a and b
+ */
 vec4.distance = function(a, b) {
     var x = b[0] - a[0],
         y = b[1] - a[1],
@@ -1322,18 +1386,18 @@ vec4.distance = function(a, b) {
 };
 
 /**
-* Alias for {@link vec4.distance}
-* @function
-*/
+ * Alias for {@link vec4.distance}
+ * @function
+ */
 vec4.dist = vec4.distance;
 
 /**
-* Calculates the squared euclidian distance between two vec4's
-*
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {Number} squared distance between a and b
-*/
+ * Calculates the squared euclidian distance between two vec4's
+ *
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {Number} squared distance between a and b
+ */
 vec4.squaredDistance = function(a, b) {
     var x = b[0] - a[0],
         y = b[1] - a[1],
@@ -1343,17 +1407,17 @@ vec4.squaredDistance = function(a, b) {
 };
 
 /**
-* Alias for {@link vec4.squaredDistance}
-* @function
-*/
+ * Alias for {@link vec4.squaredDistance}
+ * @function
+ */
 vec4.sqrDist = vec4.squaredDistance;
 
 /**
-* Calculates the length of a vec4
-*
-* @param {vec4} a vector to calculate length of
-* @returns {Number} length of a
-*/
+ * Calculates the length of a vec4
+ *
+ * @param {vec4} a vector to calculate length of
+ * @returns {Number} length of a
+ */
 vec4.length = function (a) {
     var x = a[0],
         y = a[1],
@@ -1363,17 +1427,17 @@ vec4.length = function (a) {
 };
 
 /**
-* Alias for {@link vec4.length}
-* @function
-*/
+ * Alias for {@link vec4.length}
+ * @function
+ */
 vec4.len = vec4.length;
 
 /**
-* Calculates the squared length of a vec4
-*
-* @param {vec4} a vector to calculate squared length of
-* @returns {Number} squared length of a
-*/
+ * Calculates the squared length of a vec4
+ *
+ * @param {vec4} a vector to calculate squared length of
+ * @returns {Number} squared length of a
+ */
 vec4.squaredLength = function (a) {
     var x = a[0],
         y = a[1],
@@ -1383,18 +1447,18 @@ vec4.squaredLength = function (a) {
 };
 
 /**
-* Alias for {@link vec4.squaredLength}
-* @function
-*/
+ * Alias for {@link vec4.squaredLength}
+ * @function
+ */
 vec4.sqrLen = vec4.squaredLength;
 
 /**
-* Negates the components of a vec4
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a vector to negate
-* @returns {vec4} out
-*/
+ * Negates the components of a vec4
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a vector to negate
+ * @returns {vec4} out
+ */
 vec4.negate = function(out, a) {
     out[0] = -a[0];
     out[1] = -a[1];
@@ -1404,12 +1468,12 @@ vec4.negate = function(out, a) {
 };
 
 /**
-* Normalize a vec4
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a vector to normalize
-* @returns {vec4} out
-*/
+ * Normalize a vec4
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a vector to normalize
+ * @returns {vec4} out
+ */
 vec4.normalize = function(out, a) {
     var x = a[0],
         y = a[1],
@@ -1427,25 +1491,25 @@ vec4.normalize = function(out, a) {
 };
 
 /**
-* Calculates the dot product of two vec4's
-*
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @returns {Number} dot product of a and b
-*/
+ * Calculates the dot product of two vec4's
+ *
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @returns {Number} dot product of a and b
+ */
 vec4.dot = function (a, b) {
     return a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + a[3] * b[3];
 };
 
 /**
-* Performs a linear interpolation between two vec4's
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the first operand
-* @param {vec4} b the second operand
-* @param {Number} t interpolation amount between the two inputs
-* @returns {vec4} out
-*/
+ * Performs a linear interpolation between two vec4's
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the first operand
+ * @param {vec4} b the second operand
+ * @param {Number} t interpolation amount between the two inputs
+ * @returns {vec4} out
+ */
 vec4.lerp = function (out, a, b, t) {
     var ax = a[0],
         ay = a[1],
@@ -1459,13 +1523,13 @@ vec4.lerp = function (out, a, b, t) {
 };
 
 /**
-* Transforms the vec4 with a mat4.
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the vector to transform
-* @param {mat4} m matrix to transform with
-* @returns {vec4} out
-*/
+ * Transforms the vec4 with a mat4.
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the vector to transform
+ * @param {mat4} m matrix to transform with
+ * @returns {vec4} out
+ */
 vec4.transformMat4 = function(out, a, m) {
     var x = a[0], y = a[1], z = a[2], w = a[3];
     out[0] = m[0] * x + m[4] * y + m[8] * z + m[12] * w;
@@ -1476,13 +1540,13 @@ vec4.transformMat4 = function(out, a, m) {
 };
 
 /**
-* Transforms the vec4 with a quat
-*
-* @param {vec4} out the receiving vector
-* @param {vec4} a the vector to transform
-* @param {quat} q quaternion to transform with
-* @returns {vec4} out
-*/
+ * Transforms the vec4 with a quat
+ *
+ * @param {vec4} out the receiving vector
+ * @param {vec4} a the vector to transform
+ * @param {quat} q quaternion to transform with
+ * @returns {vec4} out
+ */
 vec4.transformQuat = function(out, a, q) {
     var x = a[0], y = a[1], z = a[2],
         qx = q[0], qy = q[1], qz = q[2], qw = q[3],
@@ -1501,17 +1565,17 @@ vec4.transformQuat = function(out, a, q) {
 };
 
 /**
-* Perform some operation over an array of vec4s.
-*
-* @param {Array} a the array of vectors to iterate over
-* @param {Number} stride Number of elements between the start of each vec4. If 0 assumes tightly packed
-* @param {Number} offset Number of elements to skip at the beginning of the array
-* @param {Number} count Number of vec2s to iterate over. If 0 iterates over entire array
-* @param {Function} fn Function to call for each vector in the array
-* @param {Object} [arg] additional argument to pass to fn
-* @returns {Array} a
-* @function
-*/
+ * Perform some operation over an array of vec4s.
+ *
+ * @param {Array} a the array of vectors to iterate over
+ * @param {Number} stride Number of elements between the start of each vec4. If 0 assumes tightly packed
+ * @param {Number} offset Number of elements to skip at the beginning of the array
+ * @param {Number} count Number of vec2s to iterate over. If 0 iterates over entire array
+ * @param {Function} fn Function to call for each vector in the array
+ * @param {Object} [arg] additional argument to pass to fn
+ * @returns {Array} a
+ * @function
+ */
 vec4.forEach = (function() {
     var vec = vec4.create();
 
@@ -1542,11 +1606,11 @@ vec4.forEach = (function() {
 })();
 
 /**
-* Returns a string representation of a vector
-*
-* @param {vec4} vec vector to represent as a string
-* @returns {String} string representation of the vector
-*/
+ * Returns a string representation of a vector
+ *
+ * @param {vec4} vec vector to represent as a string
+ * @returns {String} string representation of the vector
+ */
 vec4.str = function (a) {
     return 'vec4(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + a[3] + ')';
 };
@@ -1560,15 +1624,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -1578,22 +1642,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class 2x2 Matrix
-* @name mat2
-*/
+ * @class 2x2 Matrix
+ * @name mat2
+ */
 
 var mat2 = {};
 
-var mat2Identity = new Float32Array([
-    1, 0,
-    0, 1
-]);
-
 /**
-* Creates a new identity mat2
-*
-* @returns {mat2} a new 2x2 matrix
-*/
+ * Creates a new identity mat2
+ *
+ * @returns {mat2} a new 2x2 matrix
+ */
 mat2.create = function() {
     var out = new GLMAT_ARRAY_TYPE(4);
     out[0] = 1;
@@ -1604,11 +1663,11 @@ mat2.create = function() {
 };
 
 /**
-* Creates a new mat2 initialized with values from an existing matrix
-*
-* @param {mat2} a matrix to clone
-* @returns {mat2} a new 2x2 matrix
-*/
+ * Creates a new mat2 initialized with values from an existing matrix
+ *
+ * @param {mat2} a matrix to clone
+ * @returns {mat2} a new 2x2 matrix
+ */
 mat2.clone = function(a) {
     var out = new GLMAT_ARRAY_TYPE(4);
     out[0] = a[0];
@@ -1619,12 +1678,12 @@ mat2.clone = function(a) {
 };
 
 /**
-* Copy the values from one mat2 to another
-*
-* @param {mat2} out the receiving matrix
-* @param {mat2} a the source matrix
-* @returns {mat2} out
-*/
+ * Copy the values from one mat2 to another
+ *
+ * @param {mat2} out the receiving matrix
+ * @param {mat2} a the source matrix
+ * @returns {mat2} out
+ */
 mat2.copy = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -1634,11 +1693,11 @@ mat2.copy = function(out, a) {
 };
 
 /**
-* Set a mat2 to the identity matrix
-*
-* @param {mat2} out the receiving matrix
-* @returns {mat2} out
-*/
+ * Set a mat2 to the identity matrix
+ *
+ * @param {mat2} out the receiving matrix
+ * @returns {mat2} out
+ */
 mat2.identity = function(out) {
     out[0] = 1;
     out[1] = 0;
@@ -1648,12 +1707,12 @@ mat2.identity = function(out) {
 };
 
 /**
-* Transpose the values of a mat2
-*
-* @param {mat2} out the receiving matrix
-* @param {mat2} a the source matrix
-* @returns {mat2} out
-*/
+ * Transpose the values of a mat2
+ *
+ * @param {mat2} out the receiving matrix
+ * @param {mat2} a the source matrix
+ * @returns {mat2} out
+ */
 mat2.transpose = function(out, a) {
     // If we are transposing ourselves we can skip a few steps but have to cache some values
     if (out === a) {
@@ -1671,12 +1730,12 @@ mat2.transpose = function(out, a) {
 };
 
 /**
-* Inverts a mat2
-*
-* @param {mat2} out the receiving matrix
-* @param {mat2} a the source matrix
-* @returns {mat2} out
-*/
+ * Inverts a mat2
+ *
+ * @param {mat2} out the receiving matrix
+ * @param {mat2} a the source matrix
+ * @returns {mat2} out
+ */
 mat2.invert = function(out, a) {
     var a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3],
 
@@ -1688,50 +1747,50 @@ mat2.invert = function(out, a) {
     }
     det = 1.0 / det;
     
-    out[0] = a3 * det;
+    out[0] =  a3 * det;
     out[1] = -a1 * det;
     out[2] = -a2 * det;
-    out[3] = a0 * det;
+    out[3] =  a0 * det;
 
     return out;
 };
 
 /**
-* Calculates the adjugate of a mat2
-*
-* @param {mat2} out the receiving matrix
-* @param {mat2} a the source matrix
-* @returns {mat2} out
-*/
+ * Calculates the adjugate of a mat2
+ *
+ * @param {mat2} out the receiving matrix
+ * @param {mat2} a the source matrix
+ * @returns {mat2} out
+ */
 mat2.adjoint = function(out, a) {
     // Caching this value is nessecary if out == a
     var a0 = a[0];
-    out[0] = a[3];
+    out[0] =  a[3];
     out[1] = -a[1];
     out[2] = -a[2];
-    out[3] = a0;
+    out[3] =  a0;
 
     return out;
 };
 
 /**
-* Calculates the determinant of a mat2
-*
-* @param {mat2} a the source matrix
-* @returns {Number} determinant of a
-*/
+ * Calculates the determinant of a mat2
+ *
+ * @param {mat2} a the source matrix
+ * @returns {Number} determinant of a
+ */
 mat2.determinant = function (a) {
     return a[0] * a[3] - a[2] * a[1];
 };
 
 /**
-* Multiplies two mat2's
-*
-* @param {mat2} out the receiving matrix
-* @param {mat2} a the first operand
-* @param {mat2} b the second operand
-* @returns {mat2} out
-*/
+ * Multiplies two mat2's
+ *
+ * @param {mat2} out the receiving matrix
+ * @param {mat2} a the first operand
+ * @param {mat2} b the second operand
+ * @returns {mat2} out
+ */
 mat2.multiply = function (out, a, b) {
     var a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3];
     var b0 = b[0], b1 = b[1], b2 = b[2], b3 = b[3];
@@ -1743,38 +1802,38 @@ mat2.multiply = function (out, a, b) {
 };
 
 /**
-* Alias for {@link mat2.multiply}
-* @function
-*/
+ * Alias for {@link mat2.multiply}
+ * @function
+ */
 mat2.mul = mat2.multiply;
 
 /**
-* Rotates a mat2 by the given angle
-*
-* @param {mat2} out the receiving matrix
-* @param {mat2} a the matrix to rotate
-* @param {Number} rad the angle to rotate the matrix by
-* @returns {mat2} out
-*/
+ * Rotates a mat2 by the given angle
+ *
+ * @param {mat2} out the receiving matrix
+ * @param {mat2} a the matrix to rotate
+ * @param {Number} rad the angle to rotate the matrix by
+ * @returns {mat2} out
+ */
 mat2.rotate = function (out, a, rad) {
     var a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3],
         s = Math.sin(rad),
         c = Math.cos(rad);
-    out[0] = a0 * c + a1 * s;
+    out[0] = a0 *  c + a1 * s;
     out[1] = a0 * -s + a1 * c;
-    out[2] = a2 * c + a3 * s;
+    out[2] = a2 *  c + a3 * s;
     out[3] = a2 * -s + a3 * c;
     return out;
 };
 
 /**
-* Scales the mat2 by the dimensions in the given vec2
-*
-* @param {mat2} out the receiving matrix
-* @param {mat2} a the matrix to rotate
-* @param {vec2} v the vec2 to scale the matrix by
-* @returns {mat2} out
-**/
+ * Scales the mat2 by the dimensions in the given vec2
+ *
+ * @param {mat2} out the receiving matrix
+ * @param {mat2} a the matrix to rotate
+ * @param {vec2} v the vec2 to scale the matrix by
+ * @returns {mat2} out
+ **/
 mat2.scale = function(out, a, v) {
     var a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3],
         v0 = v[0], v1 = v[1];
@@ -1786,11 +1845,11 @@ mat2.scale = function(out, a, v) {
 };
 
 /**
-* Returns a string representation of a mat2
-*
-* @param {mat2} mat matrix to represent as a string
-* @returns {String} string representation of the matrix
-*/
+ * Returns a string representation of a mat2
+ *
+ * @param {mat2} mat matrix to represent as a string
+ * @returns {String} string representation of the matrix
+ */
 mat2.str = function (a) {
     return 'mat2(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + a[3] + ')';
 };
@@ -1804,15 +1863,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -1822,38 +1881,32 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class 2x3 Matrix
-* @name mat2d
-*
-* @description
-* A mat2d contains six elements defined as:
-* <pre>
-* [a, b,
-* c, d,
-* tx,ty]
-* </pre>
-* This is a short form for the 3x3 matrix:
-* <pre>
-* [a, b, 0
-* c, d, 0
-* tx,ty,1]
-* </pre>
-* The last column is ignored so the array is shorter and operations are faster.
-*/
+ * @class 2x3 Matrix
+ * @name mat2d
+ * 
+ * @description 
+ * A mat2d contains six elements defined as:
+ * <pre>
+ * [a, b,
+ *  c, d,
+ *  tx,ty]
+ * </pre>
+ * This is a short form for the 3x3 matrix:
+ * <pre>
+ * [a, b, 0
+ *  c, d, 0
+ *  tx,ty,1]
+ * </pre>
+ * The last column is ignored so the array is shorter and operations are faster.
+ */
 
 var mat2d = {};
 
-var mat2dIdentity = new Float32Array([
-    1, 0,
-    0, 1,
-    0, 0
-]);
-
 /**
-* Creates a new identity mat2d
-*
-* @returns {mat2d} a new 2x3 matrix
-*/
+ * Creates a new identity mat2d
+ *
+ * @returns {mat2d} a new 2x3 matrix
+ */
 mat2d.create = function() {
     var out = new GLMAT_ARRAY_TYPE(6);
     out[0] = 1;
@@ -1866,11 +1919,11 @@ mat2d.create = function() {
 };
 
 /**
-* Creates a new mat2d initialized with values from an existing matrix
-*
-* @param {mat2d} a matrix to clone
-* @returns {mat2d} a new 2x3 matrix
-*/
+ * Creates a new mat2d initialized with values from an existing matrix
+ *
+ * @param {mat2d} a matrix to clone
+ * @returns {mat2d} a new 2x3 matrix
+ */
 mat2d.clone = function(a) {
     var out = new GLMAT_ARRAY_TYPE(6);
     out[0] = a[0];
@@ -1883,12 +1936,12 @@ mat2d.clone = function(a) {
 };
 
 /**
-* Copy the values from one mat2d to another
-*
-* @param {mat2d} out the receiving matrix
-* @param {mat2d} a the source matrix
-* @returns {mat2d} out
-*/
+ * Copy the values from one mat2d to another
+ *
+ * @param {mat2d} out the receiving matrix
+ * @param {mat2d} a the source matrix
+ * @returns {mat2d} out
+ */
 mat2d.copy = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -1900,11 +1953,11 @@ mat2d.copy = function(out, a) {
 };
 
 /**
-* Set a mat2d to the identity matrix
-*
-* @param {mat2d} out the receiving matrix
-* @returns {mat2d} out
-*/
+ * Set a mat2d to the identity matrix
+ *
+ * @param {mat2d} out the receiving matrix
+ * @returns {mat2d} out
+ */
 mat2d.identity = function(out) {
     out[0] = 1;
     out[1] = 0;
@@ -1916,12 +1969,12 @@ mat2d.identity = function(out) {
 };
 
 /**
-* Inverts a mat2d
-*
-* @param {mat2d} out the receiving matrix
-* @param {mat2d} a the source matrix
-* @returns {mat2d} out
-*/
+ * Inverts a mat2d
+ *
+ * @param {mat2d} out the receiving matrix
+ * @param {mat2d} a the source matrix
+ * @returns {mat2d} out
+ */
 mat2d.invert = function(out, a) {
     var aa = a[0], ab = a[1], ac = a[2], ad = a[3],
         atx = a[4], aty = a[5];
@@ -1942,23 +1995,23 @@ mat2d.invert = function(out, a) {
 };
 
 /**
-* Calculates the determinant of a mat2d
-*
-* @param {mat2d} a the source matrix
-* @returns {Number} determinant of a
-*/
+ * Calculates the determinant of a mat2d
+ *
+ * @param {mat2d} a the source matrix
+ * @returns {Number} determinant of a
+ */
 mat2d.determinant = function (a) {
     return a[0] * a[3] - a[1] * a[2];
 };
 
 /**
-* Multiplies two mat2d's
-*
-* @param {mat2d} out the receiving matrix
-* @param {mat2d} a the first operand
-* @param {mat2d} b the second operand
-* @returns {mat2d} out
-*/
+ * Multiplies two mat2d's
+ *
+ * @param {mat2d} out the receiving matrix
+ * @param {mat2d} a the first operand
+ * @param {mat2d} b the second operand
+ * @returns {mat2d} out
+ */
 mat2d.multiply = function (out, a, b) {
     var aa = a[0], ab = a[1], ac = a[2], ad = a[3],
         atx = a[4], aty = a[5],
@@ -1975,20 +2028,20 @@ mat2d.multiply = function (out, a, b) {
 };
 
 /**
-* Alias for {@link mat2d.multiply}
-* @function
-*/
+ * Alias for {@link mat2d.multiply}
+ * @function
+ */
 mat2d.mul = mat2d.multiply;
 
 
 /**
-* Rotates a mat2d by the given angle
-*
-* @param {mat2d} out the receiving matrix
-* @param {mat2d} a the matrix to rotate
-* @param {Number} rad the angle to rotate the matrix by
-* @returns {mat2d} out
-*/
+ * Rotates a mat2d by the given angle
+ *
+ * @param {mat2d} out the receiving matrix
+ * @param {mat2d} a the matrix to rotate
+ * @param {Number} rad the angle to rotate the matrix by
+ * @returns {mat2d} out
+ */
 mat2d.rotate = function (out, a, rad) {
     var aa = a[0],
         ab = a[1],
@@ -2009,13 +2062,13 @@ mat2d.rotate = function (out, a, rad) {
 };
 
 /**
-* Scales the mat2d by the dimensions in the given vec2
-*
-* @param {mat2d} out the receiving matrix
-* @param {mat2d} a the matrix to translate
-* @param {mat2d} v the vec2 to scale the matrix by
-* @returns {mat2d} out
-**/
+ * Scales the mat2d by the dimensions in the given vec2
+ *
+ * @param {mat2d} out the receiving matrix
+ * @param {mat2d} a the matrix to translate
+ * @param {vec2} v the vec2 to scale the matrix by
+ * @returns {mat2d} out
+ **/
 mat2d.scale = function(out, a, v) {
     var vx = v[0], vy = v[1];
     out[0] = a[0] * vx;
@@ -2028,13 +2081,13 @@ mat2d.scale = function(out, a, v) {
 };
 
 /**
-* Translates the mat2d by the dimensions in the given vec2
-*
-* @param {mat2d} out the receiving matrix
-* @param {mat2d} a the matrix to translate
-* @param {mat2d} v the vec2 to translate the matrix by
-* @returns {mat2d} out
-**/
+ * Translates the mat2d by the dimensions in the given vec2
+ *
+ * @param {mat2d} out the receiving matrix
+ * @param {mat2d} a the matrix to translate
+ * @param {vec2} v the vec2 to translate the matrix by
+ * @returns {mat2d} out
+ **/
 mat2d.translate = function(out, a, v) {
     out[0] = a[0];
     out[1] = a[1];
@@ -2046,13 +2099,13 @@ mat2d.translate = function(out, a, v) {
 };
 
 /**
-* Returns a string representation of a mat2d
-*
-* @param {mat2d} a matrix to represent as a string
-* @returns {String} string representation of the matrix
-*/
+ * Returns a string representation of a mat2d
+ *
+ * @param {mat2d} a matrix to represent as a string
+ * @returns {String} string representation of the matrix
+ */
 mat2d.str = function (a) {
-    return 'mat2d(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' +
+    return 'mat2d(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + 
                     a[3] + ', ' + a[4] + ', ' + a[5] + ')';
 };
 
@@ -2065,15 +2118,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -2083,23 +2136,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class 3x3 Matrix
-* @name mat3
-*/
+ * @class 3x3 Matrix
+ * @name mat3
+ */
 
 var mat3 = {};
 
-var mat3Identity = new Float32Array([
-    1, 0, 0,
-    0, 1, 0,
-    0, 0, 1
-]);
-
 /**
-* Creates a new identity mat3
-*
-* @returns {mat3} a new 3x3 matrix
-*/
+ * Creates a new identity mat3
+ *
+ * @returns {mat3} a new 3x3 matrix
+ */
 mat3.create = function() {
     var out = new GLMAT_ARRAY_TYPE(9);
     out[0] = 1;
@@ -2115,11 +2162,31 @@ mat3.create = function() {
 };
 
 /**
-* Creates a new mat3 initialized with values from an existing matrix
-*
-* @param {mat3} a matrix to clone
-* @returns {mat3} a new 3x3 matrix
-*/
+ * Copies the upper-left 3x3 values into the given mat3.
+ *
+ * @param {mat3} out the receiving 3x3 matrix
+ * @param {mat4} a   the source 4x4 matrix
+ * @returns {mat3} out
+ */
+mat3.fromMat4 = function(out, a) {
+    out[0] = a[0];
+    out[1] = a[1];
+    out[2] = a[2];
+    out[3] = a[4];
+    out[4] = a[5];
+    out[5] = a[6];
+    out[6] = a[8];
+    out[7] = a[9];
+    out[8] = a[10];
+    return out;
+};
+
+/**
+ * Creates a new mat3 initialized with values from an existing matrix
+ *
+ * @param {mat3} a matrix to clone
+ * @returns {mat3} a new 3x3 matrix
+ */
 mat3.clone = function(a) {
     var out = new GLMAT_ARRAY_TYPE(9);
     out[0] = a[0];
@@ -2135,12 +2202,12 @@ mat3.clone = function(a) {
 };
 
 /**
-* Copy the values from one mat3 to another
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the source matrix
-* @returns {mat3} out
-*/
+ * Copy the values from one mat3 to another
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the source matrix
+ * @returns {mat3} out
+ */
 mat3.copy = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -2155,11 +2222,11 @@ mat3.copy = function(out, a) {
 };
 
 /**
-* Set a mat3 to the identity matrix
-*
-* @param {mat3} out the receiving matrix
-* @returns {mat3} out
-*/
+ * Set a mat3 to the identity matrix
+ *
+ * @param {mat3} out the receiving matrix
+ * @returns {mat3} out
+ */
 mat3.identity = function(out) {
     out[0] = 1;
     out[1] = 0;
@@ -2174,12 +2241,12 @@ mat3.identity = function(out) {
 };
 
 /**
-* Transpose the values of a mat3
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the source matrix
-* @returns {mat3} out
-*/
+ * Transpose the values of a mat3
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the source matrix
+ * @returns {mat3} out
+ */
 mat3.transpose = function(out, a) {
     // If we are transposing ourselves we can skip a few steps but have to cache some values
     if (out === a) {
@@ -2206,12 +2273,12 @@ mat3.transpose = function(out, a) {
 };
 
 /**
-* Inverts a mat3
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the source matrix
-* @returns {mat3} out
-*/
+ * Inverts a mat3
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the source matrix
+ * @returns {mat3} out
+ */
 mat3.invert = function(out, a) {
     var a00 = a[0], a01 = a[1], a02 = a[2],
         a10 = a[3], a11 = a[4], a12 = a[5],
@@ -2224,8 +2291,8 @@ mat3.invert = function(out, a) {
         // Calculate the determinant
         det = a00 * b01 + a01 * b11 + a02 * b21;
 
-    if (!det) {
-        return null;
+    if (!det) { 
+        return null; 
     }
     det = 1.0 / det;
 
@@ -2242,12 +2309,12 @@ mat3.invert = function(out, a) {
 };
 
 /**
-* Calculates the adjugate of a mat3
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the source matrix
-* @returns {mat3} out
-*/
+ * Calculates the adjugate of a mat3
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the source matrix
+ * @returns {mat3} out
+ */
 mat3.adjoint = function(out, a) {
     var a00 = a[0], a01 = a[1], a02 = a[2],
         a10 = a[3], a11 = a[4], a12 = a[5],
@@ -2266,11 +2333,11 @@ mat3.adjoint = function(out, a) {
 };
 
 /**
-* Calculates the determinant of a mat3
-*
-* @param {mat3} a the source matrix
-* @returns {Number} determinant of a
-*/
+ * Calculates the determinant of a mat3
+ *
+ * @param {mat3} a the source matrix
+ * @returns {Number} determinant of a
+ */
 mat3.determinant = function (a) {
     var a00 = a[0], a01 = a[1], a02 = a[2],
         a10 = a[3], a11 = a[4], a12 = a[5],
@@ -2280,13 +2347,13 @@ mat3.determinant = function (a) {
 };
 
 /**
-* Multiplies two mat3's
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the first operand
-* @param {mat3} b the second operand
-* @returns {mat3} out
-*/
+ * Multiplies two mat3's
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the first operand
+ * @param {mat3} b the second operand
+ * @returns {mat3} out
+ */
 mat3.multiply = function (out, a, b) {
     var a00 = a[0], a01 = a[1], a02 = a[2],
         a10 = a[3], a11 = a[4], a12 = a[5],
@@ -2311,19 +2378,19 @@ mat3.multiply = function (out, a, b) {
 };
 
 /**
-* Alias for {@link mat3.multiply}
-* @function
-*/
+ * Alias for {@link mat3.multiply}
+ * @function
+ */
 mat3.mul = mat3.multiply;
 
 /**
-* Translate a mat3 by the given vector
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the matrix to translate
-* @param {vec2} v vector to translate by
-* @returns {mat3} out
-*/
+ * Translate a mat3 by the given vector
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the matrix to translate
+ * @param {vec2} v vector to translate by
+ * @returns {mat3} out
+ */
 mat3.translate = function(out, a, v) {
     var a00 = a[0], a01 = a[1], a02 = a[2],
         a10 = a[3], a11 = a[4], a12 = a[5],
@@ -2345,13 +2412,13 @@ mat3.translate = function(out, a, v) {
 };
 
 /**
-* Rotates a mat3 by the given angle
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the matrix to rotate
-* @param {Number} rad the angle to rotate the matrix by
-* @returns {mat3} out
-*/
+ * Rotates a mat3 by the given angle
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the matrix to rotate
+ * @param {Number} rad the angle to rotate the matrix by
+ * @returns {mat3} out
+ */
 mat3.rotate = function (out, a, rad) {
     var a00 = a[0], a01 = a[1], a02 = a[2],
         a10 = a[3], a11 = a[4], a12 = a[5],
@@ -2375,15 +2442,15 @@ mat3.rotate = function (out, a, rad) {
 };
 
 /**
-* Scales the mat3 by the dimensions in the given vec2
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the matrix to rotate
-* @param {vec2} v the vec2 to scale the matrix by
-* @returns {mat3} out
-**/
+ * Scales the mat3 by the dimensions in the given vec2
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat3} a the matrix to rotate
+ * @param {vec2} v the vec2 to scale the matrix by
+ * @returns {mat3} out
+ **/
 mat3.scale = function(out, a, v) {
-    var x = v[0], y = v[2];
+    var x = v[0], y = v[1];
 
     out[0] = x * a[0];
     out[1] = x * a[1];
@@ -2400,13 +2467,12 @@ mat3.scale = function(out, a, v) {
 };
 
 /**
-* Copies the values from a mat2d into a mat3
-*
-* @param {mat3} out the receiving matrix
-* @param {mat3} a the matrix to rotate
-* @param {vec2} v the vec2 to scale the matrix by
-* @returns {mat3} out
-**/
+ * Copies the values from a mat2d into a mat3
+ *
+ * @param {mat3} out the receiving matrix
+ * @param {mat2d} a the matrix to copy
+ * @returns {mat3} out
+ **/
 mat3.fromMat2d = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -2462,14 +2528,14 @@ mat3.fromQuat = function (out, q) {
 };
 
 /**
-* Returns a string representation of a mat3
-*
-* @param {mat3} mat matrix to represent as a string
-* @returns {String} string representation of the matrix
-*/
+ * Returns a string representation of a mat3
+ *
+ * @param {mat3} mat matrix to represent as a string
+ * @returns {String} string representation of the matrix
+ */
 mat3.str = function (a) {
-    return 'mat3(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' +
-                    a[3] + ', ' + a[4] + ', ' + a[5] + ', ' +
+    return 'mat3(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + 
+                    a[3] + ', ' + a[4] + ', ' + a[5] + ', ' + 
                     a[6] + ', ' + a[7] + ', ' + a[8] + ')';
 };
 
@@ -2482,15 +2548,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -2500,24 +2566,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class 4x4 Matrix
-* @name mat4
-*/
+ * @class 4x4 Matrix
+ * @name mat4
+ */
 
 var mat4 = {};
 
-var mat4Identity = new Float32Array([
-    1, 0, 0, 0,
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1
-]);
-
 /**
-* Creates a new identity mat4
-*
-* @returns {mat4} a new 4x4 matrix
-*/
+ * Creates a new identity mat4
+ *
+ * @returns {mat4} a new 4x4 matrix
+ */
 mat4.create = function() {
     var out = new GLMAT_ARRAY_TYPE(16);
     out[0] = 1;
@@ -2540,11 +2599,11 @@ mat4.create = function() {
 };
 
 /**
-* Creates a new mat4 initialized with values from an existing matrix
-*
-* @param {mat4} a matrix to clone
-* @returns {mat4} a new 4x4 matrix
-*/
+ * Creates a new mat4 initialized with values from an existing matrix
+ *
+ * @param {mat4} a matrix to clone
+ * @returns {mat4} a new 4x4 matrix
+ */
 mat4.clone = function(a) {
     var out = new GLMAT_ARRAY_TYPE(16);
     out[0] = a[0];
@@ -2567,12 +2626,12 @@ mat4.clone = function(a) {
 };
 
 /**
-* Copy the values from one mat4 to another
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the source matrix
-* @returns {mat4} out
-*/
+ * Copy the values from one mat4 to another
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the source matrix
+ * @returns {mat4} out
+ */
 mat4.copy = function(out, a) {
     out[0] = a[0];
     out[1] = a[1];
@@ -2594,11 +2653,11 @@ mat4.copy = function(out, a) {
 };
 
 /**
-* Set a mat4 to the identity matrix
-*
-* @param {mat4} out the receiving matrix
-* @returns {mat4} out
-*/
+ * Set a mat4 to the identity matrix
+ *
+ * @param {mat4} out the receiving matrix
+ * @returns {mat4} out
+ */
 mat4.identity = function(out) {
     out[0] = 1;
     out[1] = 0;
@@ -2620,12 +2679,12 @@ mat4.identity = function(out) {
 };
 
 /**
-* Transpose the values of a mat4
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the source matrix
-* @returns {mat4} out
-*/
+ * Transpose the values of a mat4
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the source matrix
+ * @returns {mat4} out
+ */
 mat4.transpose = function(out, a) {
     // If we are transposing ourselves we can skip a few steps but have to cache some values
     if (out === a) {
@@ -2668,12 +2727,12 @@ mat4.transpose = function(out, a) {
 };
 
 /**
-* Inverts a mat4
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the source matrix
-* @returns {mat4} out
-*/
+ * Inverts a mat4
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the source matrix
+ * @returns {mat4} out
+ */
 mat4.invert = function(out, a) {
     var a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3],
         a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7],
@@ -2696,8 +2755,8 @@ mat4.invert = function(out, a) {
         // Calculate the determinant
         det = b00 * b11 - b01 * b10 + b02 * b09 + b03 * b08 - b04 * b07 + b05 * b06;
 
-    if (!det) {
-        return null;
+    if (!det) { 
+        return null; 
     }
     det = 1.0 / det;
 
@@ -2722,43 +2781,43 @@ mat4.invert = function(out, a) {
 };
 
 /**
-* Calculates the adjugate of a mat4
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the source matrix
-* @returns {mat4} out
-*/
+ * Calculates the adjugate of a mat4
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the source matrix
+ * @returns {mat4} out
+ */
 mat4.adjoint = function(out, a) {
     var a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3],
         a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7],
         a20 = a[8], a21 = a[9], a22 = a[10], a23 = a[11],
         a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15];
 
-    out[0] = (a11 * (a22 * a33 - a23 * a32) - a21 * (a12 * a33 - a13 * a32) + a31 * (a12 * a23 - a13 * a22));
-    out[1] = -(a01 * (a22 * a33 - a23 * a32) - a21 * (a02 * a33 - a03 * a32) + a31 * (a02 * a23 - a03 * a22));
-    out[2] = (a01 * (a12 * a33 - a13 * a32) - a11 * (a02 * a33 - a03 * a32) + a31 * (a02 * a13 - a03 * a12));
-    out[3] = -(a01 * (a12 * a23 - a13 * a22) - a11 * (a02 * a23 - a03 * a22) + a21 * (a02 * a13 - a03 * a12));
-    out[4] = -(a10 * (a22 * a33 - a23 * a32) - a20 * (a12 * a33 - a13 * a32) + a30 * (a12 * a23 - a13 * a22));
-    out[5] = (a00 * (a22 * a33 - a23 * a32) - a20 * (a02 * a33 - a03 * a32) + a30 * (a02 * a23 - a03 * a22));
-    out[6] = -(a00 * (a12 * a33 - a13 * a32) - a10 * (a02 * a33 - a03 * a32) + a30 * (a02 * a13 - a03 * a12));
-    out[7] = (a00 * (a12 * a23 - a13 * a22) - a10 * (a02 * a23 - a03 * a22) + a20 * (a02 * a13 - a03 * a12));
-    out[8] = (a10 * (a21 * a33 - a23 * a31) - a20 * (a11 * a33 - a13 * a31) + a30 * (a11 * a23 - a13 * a21));
-    out[9] = -(a00 * (a21 * a33 - a23 * a31) - a20 * (a01 * a33 - a03 * a31) + a30 * (a01 * a23 - a03 * a21));
-    out[10] = (a00 * (a11 * a33 - a13 * a31) - a10 * (a01 * a33 - a03 * a31) + a30 * (a01 * a13 - a03 * a11));
+    out[0]  =  (a11 * (a22 * a33 - a23 * a32) - a21 * (a12 * a33 - a13 * a32) + a31 * (a12 * a23 - a13 * a22));
+    out[1]  = -(a01 * (a22 * a33 - a23 * a32) - a21 * (a02 * a33 - a03 * a32) + a31 * (a02 * a23 - a03 * a22));
+    out[2]  =  (a01 * (a12 * a33 - a13 * a32) - a11 * (a02 * a33 - a03 * a32) + a31 * (a02 * a13 - a03 * a12));
+    out[3]  = -(a01 * (a12 * a23 - a13 * a22) - a11 * (a02 * a23 - a03 * a22) + a21 * (a02 * a13 - a03 * a12));
+    out[4]  = -(a10 * (a22 * a33 - a23 * a32) - a20 * (a12 * a33 - a13 * a32) + a30 * (a12 * a23 - a13 * a22));
+    out[5]  =  (a00 * (a22 * a33 - a23 * a32) - a20 * (a02 * a33 - a03 * a32) + a30 * (a02 * a23 - a03 * a22));
+    out[6]  = -(a00 * (a12 * a33 - a13 * a32) - a10 * (a02 * a33 - a03 * a32) + a30 * (a02 * a13 - a03 * a12));
+    out[7]  =  (a00 * (a12 * a23 - a13 * a22) - a10 * (a02 * a23 - a03 * a22) + a20 * (a02 * a13 - a03 * a12));
+    out[8]  =  (a10 * (a21 * a33 - a23 * a31) - a20 * (a11 * a33 - a13 * a31) + a30 * (a11 * a23 - a13 * a21));
+    out[9]  = -(a00 * (a21 * a33 - a23 * a31) - a20 * (a01 * a33 - a03 * a31) + a30 * (a01 * a23 - a03 * a21));
+    out[10] =  (a00 * (a11 * a33 - a13 * a31) - a10 * (a01 * a33 - a03 * a31) + a30 * (a01 * a13 - a03 * a11));
     out[11] = -(a00 * (a11 * a23 - a13 * a21) - a10 * (a01 * a23 - a03 * a21) + a20 * (a01 * a13 - a03 * a11));
     out[12] = -(a10 * (a21 * a32 - a22 * a31) - a20 * (a11 * a32 - a12 * a31) + a30 * (a11 * a22 - a12 * a21));
-    out[13] = (a00 * (a21 * a32 - a22 * a31) - a20 * (a01 * a32 - a02 * a31) + a30 * (a01 * a22 - a02 * a21));
+    out[13] =  (a00 * (a21 * a32 - a22 * a31) - a20 * (a01 * a32 - a02 * a31) + a30 * (a01 * a22 - a02 * a21));
     out[14] = -(a00 * (a11 * a32 - a12 * a31) - a10 * (a01 * a32 - a02 * a31) + a30 * (a01 * a12 - a02 * a11));
-    out[15] = (a00 * (a11 * a22 - a12 * a21) - a10 * (a01 * a22 - a02 * a21) + a20 * (a01 * a12 - a02 * a11));
+    out[15] =  (a00 * (a11 * a22 - a12 * a21) - a10 * (a01 * a22 - a02 * a21) + a20 * (a01 * a12 - a02 * a11));
     return out;
 };
 
 /**
-* Calculates the determinant of a mat4
-*
-* @param {mat4} a the source matrix
-* @returns {Number} determinant of a
-*/
+ * Calculates the determinant of a mat4
+ *
+ * @param {mat4} a the source matrix
+ * @returns {Number} determinant of a
+ */
 mat4.determinant = function (a) {
     var a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3],
         a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7],
@@ -2783,13 +2842,13 @@ mat4.determinant = function (a) {
 };
 
 /**
-* Multiplies two mat4's
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the first operand
-* @param {mat4} b the second operand
-* @returns {mat4} out
-*/
+ * Multiplies two mat4's
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the first operand
+ * @param {mat4} b the second operand
+ * @returns {mat4} out
+ */
 mat4.multiply = function (out, a, b) {
     var a00 = a[0], a01 = a[1], a02 = a[2], a03 = a[3],
         a10 = a[4], a11 = a[5], a12 = a[6], a13 = a[7],
@@ -2797,7 +2856,7 @@ mat4.multiply = function (out, a, b) {
         a30 = a[12], a31 = a[13], a32 = a[14], a33 = a[15];
 
     // Cache only the current line of the second matrix
-    var b0 = b[0], b1 = b[1], b2 = b[2], b3 = b[3];
+    var b0  = b[0], b1 = b[1], b2 = b[2], b3 = b[3];  
     out[0] = b0*a00 + b1*a10 + b2*a20 + b3*a30;
     out[1] = b0*a01 + b1*a11 + b2*a21 + b3*a31;
     out[2] = b0*a02 + b1*a12 + b2*a22 + b3*a32;
@@ -2824,19 +2883,19 @@ mat4.multiply = function (out, a, b) {
 };
 
 /**
-* Alias for {@link mat4.multiply}
-* @function
-*/
+ * Alias for {@link mat4.multiply}
+ * @function
+ */
 mat4.mul = mat4.multiply;
 
 /**
-* Translate a mat4 by the given vector
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the matrix to translate
-* @param {vec3} v vector to translate by
-* @returns {mat4} out
-*/
+ * Translate a mat4 by the given vector
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the matrix to translate
+ * @param {vec3} v vector to translate by
+ * @returns {mat4} out
+ */
 mat4.translate = function (out, a, v) {
     var x = v[0], y = v[1], z = v[2],
         a00, a01, a02, a03,
@@ -2867,13 +2926,13 @@ mat4.translate = function (out, a, v) {
 };
 
 /**
-* Scales the mat4 by the dimensions in the given vec3
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the matrix to scale
-* @param {vec3} v the vec3 to scale the matrix by
-* @returns {mat4} out
-**/
+ * Scales the mat4 by the dimensions in the given vec3
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the matrix to scale
+ * @param {vec3} v the vec3 to scale the matrix by
+ * @returns {mat4} out
+ **/
 mat4.scale = function(out, a, v) {
     var x = v[0], y = v[1], z = v[2];
 
@@ -2897,14 +2956,14 @@ mat4.scale = function(out, a, v) {
 };
 
 /**
-* Rotates a mat4 by the given angle
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the matrix to rotate
-* @param {Number} rad the angle to rotate the matrix by
-* @param {vec3} axis the axis to rotate around
-* @returns {mat4} out
-*/
+ * Rotates a mat4 by the given angle
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the matrix to rotate
+ * @param {Number} rad the angle to rotate the matrix by
+ * @param {vec3} axis the axis to rotate around
+ * @returns {mat4} out
+ */
 mat4.rotate = function (out, a, rad, axis) {
     var x = axis[0], y = axis[1], z = axis[2],
         len = Math.sqrt(x * x + y * y + z * z),
@@ -2960,13 +3019,13 @@ mat4.rotate = function (out, a, rad, axis) {
 };
 
 /**
-* Rotates a matrix by the given angle around the X axis
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the matrix to rotate
-* @param {Number} rad the angle to rotate the matrix by
-* @returns {mat4} out
-*/
+ * Rotates a matrix by the given angle around the X axis
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the matrix to rotate
+ * @param {Number} rad the angle to rotate the matrix by
+ * @returns {mat4} out
+ */
 mat4.rotateX = function (out, a, rad) {
     var s = Math.sin(rad),
         c = Math.cos(rad),
@@ -2980,10 +3039,10 @@ mat4.rotateX = function (out, a, rad) {
         a23 = a[11];
 
     if (a !== out) { // If the source and destination differ, copy the unchanged rows
-        out[0] = a[0];
-        out[1] = a[1];
-        out[2] = a[2];
-        out[3] = a[3];
+        out[0]  = a[0];
+        out[1]  = a[1];
+        out[2]  = a[2];
+        out[3]  = a[3];
         out[12] = a[12];
         out[13] = a[13];
         out[14] = a[14];
@@ -3003,13 +3062,13 @@ mat4.rotateX = function (out, a, rad) {
 };
 
 /**
-* Rotates a matrix by the given angle around the Y axis
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the matrix to rotate
-* @param {Number} rad the angle to rotate the matrix by
-* @returns {mat4} out
-*/
+ * Rotates a matrix by the given angle around the Y axis
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the matrix to rotate
+ * @param {Number} rad the angle to rotate the matrix by
+ * @returns {mat4} out
+ */
 mat4.rotateY = function (out, a, rad) {
     var s = Math.sin(rad),
         c = Math.cos(rad),
@@ -3023,10 +3082,10 @@ mat4.rotateY = function (out, a, rad) {
         a23 = a[11];
 
     if (a !== out) { // If the source and destination differ, copy the unchanged rows
-        out[4] = a[4];
-        out[5] = a[5];
-        out[6] = a[6];
-        out[7] = a[7];
+        out[4]  = a[4];
+        out[5]  = a[5];
+        out[6]  = a[6];
+        out[7]  = a[7];
         out[12] = a[12];
         out[13] = a[13];
         out[14] = a[14];
@@ -3046,13 +3105,13 @@ mat4.rotateY = function (out, a, rad) {
 };
 
 /**
-* Rotates a matrix by the given angle around the Z axis
-*
-* @param {mat4} out the receiving matrix
-* @param {mat4} a the matrix to rotate
-* @param {Number} rad the angle to rotate the matrix by
-* @returns {mat4} out
-*/
+ * Rotates a matrix by the given angle around the Z axis
+ *
+ * @param {mat4} out the receiving matrix
+ * @param {mat4} a the matrix to rotate
+ * @param {Number} rad the angle to rotate the matrix by
+ * @returns {mat4} out
+ */
 mat4.rotateZ = function (out, a, rad) {
     var s = Math.sin(rad),
         c = Math.cos(rad),
@@ -3066,8 +3125,8 @@ mat4.rotateZ = function (out, a, rad) {
         a13 = a[7];
 
     if (a !== out) { // If the source and destination differ, copy the unchanged last row
-        out[8] = a[8];
-        out[9] = a[9];
+        out[8]  = a[8];
+        out[9]  = a[9];
         out[10] = a[10];
         out[11] = a[11];
         out[12] = a[12];
@@ -3089,20 +3148,20 @@ mat4.rotateZ = function (out, a, rad) {
 };
 
 /**
-* Creates a matrix from a quaternion rotation and vector translation
-* This is equivalent to (but much faster than):
-*
-* mat4.identity(dest);
-* mat4.translate(dest, vec);
-* var quatMat = mat4.create();
-* quat4.toMat4(quat, quatMat);
-* mat4.multiply(dest, quatMat);
-*
-* @param {mat4} out mat4 receiving operation result
-* @param {quat4} q Rotation quaternion
-* @param {vec3} v Translation vector
-* @returns {mat4} out
-*/
+ * Creates a matrix from a quaternion rotation and vector translation
+ * This is equivalent to (but much faster than):
+ *
+ *     mat4.identity(dest);
+ *     mat4.translate(dest, vec);
+ *     var quatMat = mat4.create();
+ *     quat4.toMat4(quat, quatMat);
+ *     mat4.multiply(dest, quatMat);
+ *
+ * @param {mat4} out mat4 receiving operation result
+ * @param {quat4} q Rotation quaternion
+ * @param {vec3} v Translation vector
+ * @returns {mat4} out
+ */
 mat4.fromRotationTranslation = function (out, q, v) {
     // Quaternion math
     var x = q[0], y = q[1], z = q[2], w = q[3],
@@ -3188,17 +3247,17 @@ mat4.fromQuat = function (out, q) {
 };
 
 /**
-* Generates a frustum matrix with the given bounds
-*
-* @param {mat4} out mat4 frustum matrix will be written into
-* @param {Number} left Left bound of the frustum
-* @param {Number} right Right bound of the frustum
-* @param {Number} bottom Bottom bound of the frustum
-* @param {Number} top Top bound of the frustum
-* @param {Number} near Near bound of the frustum
-* @param {Number} far Far bound of the frustum
-* @returns {mat4} out
-*/
+ * Generates a frustum matrix with the given bounds
+ *
+ * @param {mat4} out mat4 frustum matrix will be written into
+ * @param {Number} left Left bound of the frustum
+ * @param {Number} right Right bound of the frustum
+ * @param {Number} bottom Bottom bound of the frustum
+ * @param {Number} top Top bound of the frustum
+ * @param {Number} near Near bound of the frustum
+ * @param {Number} far Far bound of the frustum
+ * @returns {mat4} out
+ */
 mat4.frustum = function (out, left, right, bottom, top, near, far) {
     var rl = 1 / (right - left),
         tb = 1 / (top - bottom),
@@ -3223,15 +3282,15 @@ mat4.frustum = function (out, left, right, bottom, top, near, far) {
 };
 
 /**
-* Generates a perspective projection matrix with the given bounds
-*
-* @param {mat4} out mat4 frustum matrix will be written into
-* @param {number} fovy Vertical field of view in radians
-* @param {number} aspect Aspect ratio. typically viewport width/height
-* @param {number} near Near bound of the frustum
-* @param {number} far Far bound of the frustum
-* @returns {mat4} out
-*/
+ * Generates a perspective projection matrix with the given bounds
+ *
+ * @param {mat4} out mat4 frustum matrix will be written into
+ * @param {number} fovy Vertical field of view in radians
+ * @param {number} aspect Aspect ratio. typically viewport width/height
+ * @param {number} near Near bound of the frustum
+ * @param {number} far Far bound of the frustum
+ * @returns {mat4} out
+ */
 mat4.perspective = function (out, fovy, aspect, near, far) {
     var f = 1.0 / Math.tan(fovy / 2),
         nf = 1 / (near - far);
@@ -3255,17 +3314,17 @@ mat4.perspective = function (out, fovy, aspect, near, far) {
 };
 
 /**
-* Generates a orthogonal projection matrix with the given bounds
-*
-* @param {mat4} out mat4 frustum matrix will be written into
-* @param {number} left Left bound of the frustum
-* @param {number} right Right bound of the frustum
-* @param {number} bottom Bottom bound of the frustum
-* @param {number} top Top bound of the frustum
-* @param {number} near Near bound of the frustum
-* @param {number} far Far bound of the frustum
-* @returns {mat4} out
-*/
+ * Generates a orthogonal projection matrix with the given bounds
+ *
+ * @param {mat4} out mat4 frustum matrix will be written into
+ * @param {number} left Left bound of the frustum
+ * @param {number} right Right bound of the frustum
+ * @param {number} bottom Bottom bound of the frustum
+ * @param {number} top Top bound of the frustum
+ * @param {number} near Near bound of the frustum
+ * @param {number} far Far bound of the frustum
+ * @returns {mat4} out
+ */
 mat4.ortho = function (out, left, right, bottom, top, near, far) {
     var lr = 1 / (left - right),
         bt = 1 / (bottom - top),
@@ -3290,14 +3349,14 @@ mat4.ortho = function (out, left, right, bottom, top, near, far) {
 };
 
 /**
-* Generates a look-at matrix with the given eye position, focal point, and up axis
-*
-* @param {mat4} out mat4 frustum matrix will be written into
-* @param {vec3} eye Position of the viewer
-* @param {vec3} center Point the viewer is looking at
-* @param {vec3} up vec3 pointing up
-* @returns {mat4} out
-*/
+ * Generates a look-at matrix with the given eye position, focal point, and up axis
+ *
+ * @param {mat4} out mat4 frustum matrix will be written into
+ * @param {vec3} eye Position of the viewer
+ * @param {vec3} center Point the viewer is looking at
+ * @param {vec3} up vec3 pointing up
+ * @returns {mat4} out
+ */
 mat4.lookAt = function (out, eye, center, up) {
     var x0, x1, x2, y0, y1, y2, z0, z1, z2, len,
         eyex = eye[0],
@@ -3377,15 +3436,15 @@ mat4.lookAt = function (out, eye, center, up) {
 };
 
 /**
-* Returns a string representation of a mat4
-*
-* @param {mat4} mat matrix to represent as a string
-* @returns {String} string representation of the matrix
-*/
+ * Returns a string representation of a mat4
+ *
+ * @param {mat4} mat matrix to represent as a string
+ * @returns {String} string representation of the matrix
+ */
 mat4.str = function (a) {
     return 'mat4(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + a[3] + ', ' +
                     a[4] + ', ' + a[5] + ', ' + a[6] + ', ' + a[7] + ', ' +
-                    a[8] + ', ' + a[9] + ', ' + a[10] + ', ' + a[11] + ', ' +
+                    a[8] + ', ' + a[9] + ', ' + a[10] + ', ' + a[11] + ', ' + 
                     a[12] + ', ' + a[13] + ', ' + a[14] + ', ' + a[15] + ')';
 };
 
@@ -3398,15 +3457,15 @@ if(typeof(exports) !== 'undefined') {
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  * Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -3416,19 +3475,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 /**
-* @class Quaternion
-* @name quat
-*/
+ * @class Quaternion
+ * @name quat
+ */
 
 var quat = {};
 
-var quatIdentity = new Float32Array([0, 0, 0, 1]);
-
 /**
-* Creates a new identity quat
-*
-* @returns {quat} a new quaternion
-*/
+ * Creates a new identity quat
+ *
+ * @returns {quat} a new quaternion
+ */
 quat.create = function() {
     var out = new GLMAT_ARRAY_TYPE(4);
     out[0] = 0;
@@ -3439,55 +3496,125 @@ quat.create = function() {
 };
 
 /**
-* Creates a new quat initialized with values from an existing quaternion
-*
-* @param {quat} a quaternion to clone
-* @returns {quat} a new quaternion
-* @function
-*/
+ * Sets a quaternion to represent the shortest rotation from one
+ * vector to another.
+ *
+ * Both vectors are assumed to be unit length.
+ *
+ * @param {quat} out the receiving quaternion.
+ * @param {vec3} a the initial vector
+ * @param {vec3} b the destination vector
+ * @returns {quat} out
+ */
+quat.rotationTo = (function() {
+    var tmpvec3 = vec3.create();
+    var xUnitVec3 = vec3.fromValues(1,0,0);
+    var yUnitVec3 = vec3.fromValues(0,1,0);
+
+    return function(out, a, b) {
+        var dot = vec3.dot(a, b);
+        if (dot < -0.999999) {
+            vec3.cross(tmpvec3, xUnitVec3, a);
+            if (vec3.length(tmpvec3) < 0.000001)
+                vec3.cross(tmpvec3, yUnitVec3, a);
+            vec3.normalize(tmpvec3, tmpvec3);
+            quat.setAxisAngle(out, tmpvec3, Math.PI);
+        } else if (dot > 0.999999) {
+            out[0] = 0;
+            out[1] = 0;
+            out[2] = 0;
+            out[3] = 1;
+        } else {
+            vec3.cross(tmpvec3, a, b);
+            out[0] = tmpvec3[0];
+            out[1] = tmpvec3[1];
+            out[2] = tmpvec3[2];
+            out[3] = 1 + dot;
+            return quat.normalize(out, out);
+        }
+    };
+})();
+
+/**
+ * Sets the specified quaternion with values corresponding to the given
+ * axes. Each axis is a vec3 and is expected to be unit length and
+ * perpendicular to all other specified axes.
+ *
+ * @param {vec3} view  the vector representing the viewing direction
+ * @param {vec3} right the vector representing the local "right" direction
+ * @param {vec3} up    the vector representing the local "up" direction
+ * @returns {quat} out
+ */
+quat.setAxes = (function() {
+    var matr = mat3.create();
+
+    return function(out, view, right, up) {
+        matr[0] = right[0];
+        matr[3] = right[1];
+        matr[6] = right[2];
+
+        matr[1] = up[0];
+        matr[4] = up[1];
+        matr[7] = up[2];
+
+        matr[2] = -view[0];
+        matr[5] = -view[1];
+        matr[8] = -view[2];
+
+        return quat.normalize(out, quat.fromMat3(out, matr));
+    };
+})();
+
+/**
+ * Creates a new quat initialized with values from an existing quaternion
+ *
+ * @param {quat} a quaternion to clone
+ * @returns {quat} a new quaternion
+ * @function
+ */
 quat.clone = vec4.clone;
 
 /**
-* Creates a new quat initialized with the given values
-*
-* @param {Number} x X component
-* @param {Number} y Y component
-* @param {Number} z Z component
-* @param {Number} w W component
-* @returns {quat} a new quaternion
-* @function
-*/
+ * Creates a new quat initialized with the given values
+ *
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @param {Number} z Z component
+ * @param {Number} w W component
+ * @returns {quat} a new quaternion
+ * @function
+ */
 quat.fromValues = vec4.fromValues;
 
 /**
-* Copy the values from one quat to another
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a the source quaternion
-* @returns {quat} out
-* @function
-*/
+ * Copy the values from one quat to another
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a the source quaternion
+ * @returns {quat} out
+ * @function
+ */
 quat.copy = vec4.copy;
 
 /**
-* Set the components of a quat to the given values
-*
-* @param {quat} out the receiving quaternion
-* @param {Number} x X component
-* @param {Number} y Y component
-* @param {Number} z Z component
-* @param {Number} w W component
-* @returns {quat} out
-* @function
-*/
+ * Set the components of a quat to the given values
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {Number} x X component
+ * @param {Number} y Y component
+ * @param {Number} z Z component
+ * @param {Number} w W component
+ * @returns {quat} out
+ * @function
+ */
 quat.set = vec4.set;
 
 /**
-* Set a quat to the identity quaternion
-*
-* @param {quat} out the receiving quaternion
-* @returns {quat} out
-*/
+ * Set a quat to the identity quaternion
+ *
+ * @param {quat} out the receiving quaternion
+ * @returns {quat} out
+ */
 quat.identity = function(out) {
     out[0] = 0;
     out[1] = 0;
@@ -3497,14 +3624,14 @@ quat.identity = function(out) {
 };
 
 /**
-* Sets a quat from the given angle and rotation axis,
-* then returns it.
-*
-* @param {quat} out the receiving quaternion
-* @param {vec3} axis the axis around which to rotate
-* @param {Number} rad the angle in radians
-* @returns {quat} out
-**/
+ * Sets a quat from the given angle and rotation axis,
+ * then returns it.
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {vec3} axis the axis around which to rotate
+ * @param {Number} rad the angle in radians
+ * @returns {quat} out
+ **/
 quat.setAxisAngle = function(out, axis, rad) {
     rad = rad * 0.5;
     var s = Math.sin(rad);
@@ -3516,24 +3643,24 @@ quat.setAxisAngle = function(out, axis, rad) {
 };
 
 /**
-* Adds two quat's
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a the first operand
-* @param {quat} b the second operand
-* @returns {quat} out
-* @function
-*/
+ * Adds two quat's
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a the first operand
+ * @param {quat} b the second operand
+ * @returns {quat} out
+ * @function
+ */
 quat.add = vec4.add;
 
 /**
-* Multiplies two quat's
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a the first operand
-* @param {quat} b the second operand
-* @returns {quat} out
-*/
+ * Multiplies two quat's
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a the first operand
+ * @param {quat} b the second operand
+ * @returns {quat} out
+ */
 quat.multiply = function(out, a, b) {
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         bx = b[0], by = b[1], bz = b[2], bw = b[3];
@@ -3546,32 +3673,32 @@ quat.multiply = function(out, a, b) {
 };
 
 /**
-* Alias for {@link quat.multiply}
-* @function
-*/
+ * Alias for {@link quat.multiply}
+ * @function
+ */
 quat.mul = quat.multiply;
 
 /**
-* Scales a quat by a scalar number
-*
-* @param {quat} out the receiving vector
-* @param {quat} a the vector to scale
-* @param {Number} b amount to scale the vector by
-* @returns {quat} out
-* @function
-*/
+ * Scales a quat by a scalar number
+ *
+ * @param {quat} out the receiving vector
+ * @param {quat} a the vector to scale
+ * @param {Number} b amount to scale the vector by
+ * @returns {quat} out
+ * @function
+ */
 quat.scale = vec4.scale;
 
 /**
-* Rotates a quaternion by the given angle around the X axis
-*
-* @param {quat} out quat receiving operation result
-* @param {quat} a quat to rotate
-* @param {number} rad angle (in radians) to rotate
-* @returns {quat} out
-*/
+ * Rotates a quaternion by the given angle about the X axis
+ *
+ * @param {quat} out quat receiving operation result
+ * @param {quat} a quat to rotate
+ * @param {number} rad angle (in radians) to rotate
+ * @returns {quat} out
+ */
 quat.rotateX = function (out, a, rad) {
-    rad *= 0.5;
+    rad *= 0.5; 
 
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         bx = Math.sin(rad), bw = Math.cos(rad);
@@ -3584,15 +3711,15 @@ quat.rotateX = function (out, a, rad) {
 };
 
 /**
-* Rotates a quaternion by the given angle around the Y axis
-*
-* @param {quat} out quat receiving operation result
-* @param {quat} a quat to rotate
-* @param {number} rad angle (in radians) to rotate
-* @returns {quat} out
-*/
+ * Rotates a quaternion by the given angle about the Y axis
+ *
+ * @param {quat} out quat receiving operation result
+ * @param {quat} a quat to rotate
+ * @param {number} rad angle (in radians) to rotate
+ * @returns {quat} out
+ */
 quat.rotateY = function (out, a, rad) {
-    rad *= 0.5;
+    rad *= 0.5; 
 
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         by = Math.sin(rad), bw = Math.cos(rad);
@@ -3605,15 +3732,15 @@ quat.rotateY = function (out, a, rad) {
 };
 
 /**
-* Rotates a quaternion by the given angle around the Z axis
-*
-* @param {quat} out quat receiving operation result
-* @param {quat} a quat to rotate
-* @param {number} rad angle (in radians) to rotate
-* @returns {quat} out
-*/
+ * Rotates a quaternion by the given angle about the Z axis
+ *
+ * @param {quat} out quat receiving operation result
+ * @param {quat} a quat to rotate
+ * @param {number} rad angle (in radians) to rotate
+ * @returns {quat} out
+ */
 quat.rotateZ = function (out, a, rad) {
-    rad *= 0.5;
+    rad *= 0.5; 
 
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         bz = Math.sin(rad), bw = Math.cos(rad);
@@ -3626,14 +3753,14 @@ quat.rotateZ = function (out, a, rad) {
 };
 
 /**
-* Calculates the W component of a quat from the X, Y, and Z components.
-* Assumes that quaternion is 1 unit in length.
-* Any existing W component will be ignored.
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a quat to calculate W component of
-* @returns {quat} out
-*/
+ * Calculates the W component of a quat from the X, Y, and Z components.
+ * Assumes that quaternion is 1 unit in length.
+ * Any existing W component will be ignored.
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a quat to calculate W component of
+ * @returns {quat} out
+ */
 quat.calculateW = function (out, a) {
     var x = a[0], y = a[1], z = a[2];
 
@@ -3645,85 +3772,84 @@ quat.calculateW = function (out, a) {
 };
 
 /**
-* Calculates the dot product of two quat's
-*
-* @param {quat} a the first operand
-* @param {quat} b the second operand
-* @returns {Number} dot product of a and b
-* @function
-*/
+ * Calculates the dot product of two quat's
+ *
+ * @param {quat} a the first operand
+ * @param {quat} b the second operand
+ * @returns {Number} dot product of a and b
+ * @function
+ */
 quat.dot = vec4.dot;
 
 /**
-* Performs a linear interpolation between two quat's
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a the first operand
-* @param {quat} b the second operand
-* @param {Number} t interpolation amount between the two inputs
-* @returns {quat} out
-* @function
-*/
+ * Performs a linear interpolation between two quat's
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a the first operand
+ * @param {quat} b the second operand
+ * @param {Number} t interpolation amount between the two inputs
+ * @returns {quat} out
+ * @function
+ */
 quat.lerp = vec4.lerp;
 
 /**
-* Performs a spherical linear interpolation between two quat
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a the first operand
-* @param {quat} b the second operand
-* @param {Number} t interpolation amount between the two inputs
-* @returns {quat} out
-*/
+ * Performs a spherical linear interpolation between two quat
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a the first operand
+ * @param {quat} b the second operand
+ * @param {Number} t interpolation amount between the two inputs
+ * @returns {quat} out
+ */
 quat.slerp = function (out, a, b, t) {
+    // benchmarks:
+    //    http://jsperf.com/quaternion-slerp-implementations
+
     var ax = a[0], ay = a[1], az = a[2], aw = a[3],
         bx = b[0], by = b[1], bz = b[2], bw = b[3];
 
-    var cosHalfTheta = ax * bx + ay * by + az * bz + aw * bw,
-        halfTheta,
-        sinHalfTheta,
-        ratioA,
-        ratioB;
-
-    if (Math.abs(cosHalfTheta) >= 1.0) {
-        if (out !== a) {
-            out[0] = ax;
-            out[1] = ay;
-            out[2] = az;
-            out[3] = aw;
-        }
-        return out;
+    var        omega, cosom, sinom, scale0, scale1;
+
+    // calc cosine
+    cosom = ax * bx + ay * by + az * bz + aw * bw;
+    // adjust signs (if necessary)
+    if ( cosom < 0.0 ) {
+        cosom = -cosom;
+        bx = - bx;
+        by = - by;
+        bz = - bz;
+        bw = - bw;
     }
-
-    halfTheta = Math.acos(cosHalfTheta);
-    sinHalfTheta = Math.sqrt(1.0 - cosHalfTheta * cosHalfTheta);
-
-    if (Math.abs(sinHalfTheta) < 0.001) {
-        out[0] = (ax * 0.5 + bx * 0.5);
-        out[1] = (ay * 0.5 + by * 0.5);
-        out[2] = (az * 0.5 + bz * 0.5);
-        out[3] = (aw * 0.5 + bw * 0.5);
-        return out;
+    // calculate coefficients
+    if ( (1.0 - cosom) > 0.000001 ) {
+        // standard case (slerp)
+        omega  = Math.acos(cosom);
+        sinom  = Math.sin(omega);
+        scale0 = Math.sin((1.0 - t) * omega) / sinom;
+        scale1 = Math.sin(t * omega) / sinom;
+    } else {        
+        // "from" and "to" quaternions are very close 
+        //  ... so we can do a linear interpolation
+        scale0 = 1.0 - t;
+        scale1 = t;
     }
-
-    ratioA = Math.sin((1 - t) * halfTheta) / sinHalfTheta;
-    ratioB = Math.sin(t * halfTheta) / sinHalfTheta;
-
-    out[0] = (ax * ratioA + bx * ratioB);
-    out[1] = (ay * ratioA + by * ratioB);
-    out[2] = (az * ratioA + bz * ratioB);
-    out[3] = (aw * ratioA + bw * ratioB);
-
+    // calculate final values
+    out[0] = scale0 * ax + scale1 * bx;
+    out[1] = scale0 * ay + scale1 * by;
+    out[2] = scale0 * az + scale1 * bz;
+    out[3] = scale0 * aw + scale1 * bw;
+    
     return out;
 };
 
 /**
-* Calculates the inverse of a quat
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a quat to calculate inverse of
-* @returns {quat} out
-*/
+ * Calculates the inverse of a quat
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a quat to calculate inverse of
+ * @returns {quat} out
+ */
 quat.invert = function(out, a) {
     var a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3],
         dot = a0*a0 + a1*a1 + a2*a2 + a3*a3,
@@ -3739,13 +3865,13 @@ quat.invert = function(out, a) {
 };
 
 /**
-* Calculates the conjugate of a quat
-* If the quaternion is normalized, this function is faster than quat.inverse and produces the same result.
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a quat to calculate conjugate of
-* @returns {quat} out
-*/
+ * Calculates the conjugate of a quat
+ * If the quaternion is normalized, this function is faster than quat.inverse and produces the same result.
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a quat to calculate conjugate of
+ * @returns {quat} out
+ */
 quat.conjugate = function (out, a) {
     out[0] = -a[0];
     out[1] = -a[1];
@@ -3755,55 +3881,63 @@ quat.conjugate = function (out, a) {
 };
 
 /**
-* Calculates the length of a quat
-*
-* @param {quat} a vector to calculate length of
-* @returns {Number} length of a
-* @function
-*/
+ * Calculates the length of a quat
+ *
+ * @param {quat} a vector to calculate length of
+ * @returns {Number} length of a
+ * @function
+ */
 quat.length = vec4.length;
 
 /**
-* Alias for {@link quat.length}
-* @function
-*/
+ * Alias for {@link quat.length}
+ * @function
+ */
 quat.len = quat.length;
 
 /**
-* Calculates the squared length of a quat
-*
-* @param {quat} a vector to calculate squared length of
-* @returns {Number} squared length of a
-* @function
-*/
+ * Calculates the squared length of a quat
+ *
+ * @param {quat} a vector to calculate squared length of
+ * @returns {Number} squared length of a
+ * @function
+ */
 quat.squaredLength = vec4.squaredLength;
 
 /**
-* Alias for {@link quat.squaredLength}
-* @function
-*/
+ * Alias for {@link quat.squaredLength}
+ * @function
+ */
 quat.sqrLen = quat.squaredLength;
 
 /**
-* Normalize a quat
-*
-* @param {quat} out the receiving quaternion
-* @param {quat} a quaternion to normalize
-* @returns {quat} out
-* @function
-*/
+ * Normalize a quat
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {quat} a quaternion to normalize
+ * @returns {quat} out
+ * @function
+ */
 quat.normalize = vec4.normalize;
 
 /**
-* Creates a quaternion from the given 3x3 rotation matrix.
-*
-* @param {quat} out the receiving quaternion
-* @param {mat3} m rotation matrix
-* @returns {quat} out
-* @function
-*/
+ * Creates a quaternion from the given 3x3 rotation matrix.
+ *
+ * NOTE: The resultant quaternion is not normalized, so you should be sure
+ * to renormalize the quaternion yourself where necessary.
+ *
+ * @param {quat} out the receiving quaternion
+ * @param {mat3} m rotation matrix
+ * @returns {quat} out
+ * @function
+ */
 quat.fromMat3 = (function() {
-    var s_iNext = [1,2,0];
+    // benchmarks:
+    //    http://jsperf.com/typed-array-access-speed
+    //    http://jsperf.com/conversion-of-3x3-matrix-to-quaternion
+
+    var s_iNext = (typeof(Int8Array) !== 'undefined' ? new Int8Array([1,2,0]) : [1,2,0]);
+
     return function(out, m) {
         // Algorithm in Ken Shoemake's article in 1987 SIGGRAPH course notes
         // article "Quaternion Calculus and Fast Animation".
@@ -3812,12 +3946,12 @@ quat.fromMat3 = (function() {
 
         if ( fTrace > 0.0 ) {
             // |w| > 1/2, may as well choose w > 1/2
-            fRoot = Math.sqrt(fTrace + 1.0); // 2w
+            fRoot = Math.sqrt(fTrace + 1.0);  // 2w
             out[3] = 0.5 * fRoot;
-            fRoot = 0.5/fRoot; // 1/(4w)
-            out[0] = (m[7]-m[5])*fRoot;
-            out[1] = (m[2]-m[6])*fRoot;
-            out[2] = (m[3]-m[1])*fRoot;
+            fRoot = 0.5/fRoot;  // 1/(4w)
+            out[0] = (m[5]-m[7])*fRoot;
+            out[1] = (m[6]-m[2])*fRoot;
+            out[2] = (m[1]-m[3])*fRoot;
         } else {
             // |w| <= 1/2
             var i = 0;
@@ -3841,11 +3975,11 @@ quat.fromMat3 = (function() {
 })();
 
 /**
-* Returns a string representation of a quatenion
-*
-* @param {quat} vec vector to represent as a string
-* @returns {String} string representation of the vector
-*/
+ * Returns a string representation of a quatenion
+ *
+ * @param {quat} vec vector to represent as a string
+ * @returns {String} string representation of the vector
+ */
 quat.str = function (a) {
     return 'quat(' + a[0] + ', ' + a[1] + ', ' + a[2] + ', ' + a[3] + ')';
 };
@@ -3868,4 +4002,4 @@ if(typeof(exports) !== 'undefined') {
 
 
   })(shim.exports);
-})();
+})();