aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-09 17:33:00 -0700
committerJohn Mayhew2012-07-09 17:33:00 -0700
commit754d03da7f5824efe0f259e8bc0703b4ffd832b2 (patch)
tree10d7055250dc6d86c3ec18eee078a7eb9a7b1a5f /js/helper-classes/3D
parent770bcb52422742ff741a88a75ecefbeb90bc9247 (diff)
parent7884c00c1ac6bc2141c0084ac6522562576ddd12 (diff)
downloadninja-754d03da7f5824efe0f259e8bc0703b4ffd832b2.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-xjs/helper-classes/3D/GLMatrix/gl-matrix.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/helper-classes/3D/GLMatrix/gl-matrix.js b/js/helper-classes/3D/GLMatrix/gl-matrix.js
index 811ed5cd..9a60b4db 100755
--- a/js/helper-classes/3D/GLMatrix/gl-matrix.js
+++ b/js/helper-classes/3D/GLMatrix/gl-matrix.js
@@ -1,4 +1,4 @@
1/* 1/*
2 * gl-matrix.js - High performance matrix and vector operations for WebGL 2 * gl-matrix.js - High performance matrix and vector operations for WebGL
3 * Version 1.0.0 3 * Version 1.0.0
4 */ 4 */
@@ -1047,7 +1047,7 @@ glmat4.scale = function (mat, vec, dest) {
1047 * Params: 1047 * Params:
1048 * mat - mat4 to rotate 1048 * mat - mat4 to rotate
1049 * angle - angle (in radians) to rotate 1049 * angle - angle (in radians) to rotate
1050 * axis - vec3 representing the axis to rotate around 1050 * axis - vec3 representing the axis to rotate around
1051 * dest - Optional, mat4 receiving operation result. If not specified result is written to mat 1051 * dest - Optional, mat4 receiving operation result. If not specified result is written to mat
1052 * 1052 *
1053 * Returns: 1053 * Returns:
@@ -1472,7 +1472,7 @@ glmat4.str = function (mat) {
1472}; 1472};
1473 1473
1474/* 1474/*
1475 * quat4 - Quaternions 1475 * quat4 - Quaternions
1476 */ 1476 */
1477 1477
1478/* 1478/*
@@ -1522,8 +1522,8 @@ quat4.set = function (quat, dest) {
1522/* 1522/*
1523 * quat4.calculateW 1523 * quat4.calculateW
1524 * Calculates the W component of a quat4 from the X, Y, and Z components. 1524 * Calculates the W component of a quat4 from the X, Y, and Z components.
1525 * Assumes that quaternion is 1 unit in length. 1525 * Assumes that quaternion is 1 unit in length.
1526 * Any existing W component will be ignored. 1526 * Any existing W component will be ignored.
1527 * 1527 *
1528 * Params: 1528 * Params:
1529 * quat - quat4 to calculate W component of 1529 * quat - quat4 to calculate W component of