From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- .../RDGE/src/core/script/math/mat4.js | 192 ++++++++++----------- .../RDGE/src/core/script/math/quat.js | 64 +++---- .../RDGE/src/core/script/math/vec2.js | 6 +- .../RDGE/src/core/script/math/vec3.js | 18 +- .../RDGE/src/core/script/math/vec4.js | 46 ++--- 5 files changed, 163 insertions(+), 163 deletions(-) (limited to 'js/helper-classes/RDGE/src/core/script/math') diff --git a/js/helper-classes/RDGE/src/core/script/math/mat4.js b/js/helper-classes/RDGE/src/core/script/math/mat4.js index 32c7111c..e2907272 100755 --- a/js/helper-classes/RDGE/src/core/script/math/mat4.js +++ b/js/helper-classes/RDGE/src/core/script/math/mat4.js @@ -33,21 +33,21 @@ POSSIBILITY OF SUCH DAMAGE. * containing at least 16 numeric components can represent a 4x4 matrix. * * For example, all of these are valid matrix construction methods: -* ... -* var a = mat4.identity(); -* var b = mat4.perspective(90, aspectRatio, 0.1, 100.00); -* var c = mat4.lookAt( [0, 0, 0], [1, 0, 0], [ 0, 1, 0 ] ); -* var d = mat4.basis( [1, 0, 0], [0, 1, 0], [ 0, 0, 1 ] ); +* ... +* var a = mat4.identity(); +* var b = mat4.perspective(90, aspectRatio, 0.1, 100.00); +* var c = mat4.lookAt( [0, 0, 0], [1, 0, 0], [ 0, 1, 0 ] ); +* var d = mat4.basis( [1, 0, 0], [0, 1, 0], [ 0, 0, 1 ] ); * * This library is implemented assuming components are arranged * contiguously in memory as such: -* M = [ x0, x1, x2, x3, -* y0, y1, y2, y3, -* z0, z1, z2, z3, -* w0, w1, w2, w3 ]; +* M = [ x0, x1, x2, x3, +* y0, y1, y2, y3, +* z0, z1, z2, z3, +* w0, w1, w2, w3 ]; * The translation components of a transformation matrix would be stored in * w0, w1, w2, or at indices 12, 13, and 14 of the array, as is consistent -* with OpenGL. +* with OpenGL. */ // RDGE namespaces var RDGE = RDGE || {}; @@ -102,9 +102,9 @@ RDGE.mat4.verify = function (m) { */ RDGE.mat4.copy = function (m) { return [m[0], m[1], m[2], m[3], - m[4], m[5], m[6], m[7], - m[8], m[9], m[10], m[11], - m[12], m[13], m[14], m[15]]; + m[4], m[5], m[6], m[7], + m[8], m[9], m[10], m[11], + m[12], m[13], m[14], m[15]]; }; /** @@ -134,9 +134,9 @@ RDGE.mat4.inplace_copy = function (dst, src) { */ RDGE.mat4.identity = function () { return [1.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 0.0, 0.0, 1.0]; + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 1.0, 0.0, + 0.0, 0.0, 0.0, 1.0]; }; /** @@ -144,9 +144,9 @@ RDGE.mat4.identity = function () { */ RDGE.mat4.zero = function () { return [0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 0.0]; + 0.0, 0.0, 0.0, 0.0, + 0.0, 0.0, 0.0, 0.0, + 0.0, 0.0, 0.0, 0.0]; }; /** @@ -156,14 +156,14 @@ RDGE.mat4.zero = function () { RDGE.mat4.basis = function (rowx, rowy, rowz, roww) { if (roww == null || roww == undefined) { return [rowx[0], rowx[1], rowx[2], 0.0, - rowy[0], rowy[1], rowy[2], 0.0, - rowz[0], rowz[1], rowz[2], 0.0, - 0, 0, 0, 1.0]; + rowy[0], rowy[1], rowy[2], 0.0, + rowz[0], rowz[1], rowz[2], 0.0, + 0, 0, 0, 1.0]; } else { return [rowx[0], rowx[1], rowx[2], rowx.length == 4 ? rowx[3] : 0.0, - rowy[0], rowy[1], rowy[2], rowy.length == 4 ? rowy[3] : 0.0, - rowz[0], rowz[1], rowz[2], rowz.length == 4 ? rowz[3] : 0.0, - roww[0], roww[1], roww[2], roww.length == 4 ? roww[3] : 1.0]; + rowy[0], rowy[1], rowy[2], rowy.length == 4 ? rowy[3] : 0.0, + rowz[0], rowz[1], rowz[2], rowz.length == 4 ? rowz[3] : 0.0, + roww[0], roww[1], roww[2], roww.length == 4 ? roww[3] : 1.0]; } }; @@ -353,24 +353,24 @@ RDGE.mat4.mul = function (a, b) { var b15 = b[15]; return [a00 * b00 + a01 * b04 + a02 * b08 + a03 * b12, - a00 * b01 + a01 * b05 + a02 * b09 + a03 * b13, - a00 * b02 + a01 * b06 + a02 * b10 + a03 * b14, - a00 * b03 + a01 * b07 + a02 * b11 + a03 * b15, + a00 * b01 + a01 * b05 + a02 * b09 + a03 * b13, + a00 * b02 + a01 * b06 + a02 * b10 + a03 * b14, + a00 * b03 + a01 * b07 + a02 * b11 + a03 * b15, - a04 * b00 + a05 * b04 + a06 * b08 + a07 * b12, - a04 * b01 + a05 * b05 + a06 * b09 + a07 * b13, - a04 * b02 + a05 * b06 + a06 * b10 + a07 * b14, - a04 * b03 + a05 * b07 + a06 * b11 + a07 * b15, + a04 * b00 + a05 * b04 + a06 * b08 + a07 * b12, + a04 * b01 + a05 * b05 + a06 * b09 + a07 * b13, + a04 * b02 + a05 * b06 + a06 * b10 + a07 * b14, + a04 * b03 + a05 * b07 + a06 * b11 + a07 * b15, - a08 * b00 + a09 * b04 + a10 * b08 + a11 * b12, - a08 * b01 + a09 * b05 + a10 * b09 + a11 * b13, - a08 * b02 + a09 * b06 + a10 * b10 + a11 * b14, - a08 * b03 + a09 * b07 + a10 * b11 + a11 * b15, + a08 * b00 + a09 * b04 + a10 * b08 + a11 * b12, + a08 * b01 + a09 * b05 + a10 * b09 + a11 * b13, + a08 * b02 + a09 * b06 + a10 * b10 + a11 * b14, + a08 * b03 + a09 * b07 + a10 * b11 + a11 * b15, - a12 * b00 + a13 * b04 + a14 * b08 + a15 * b12, - a12 * b01 + a13 * b05 + a14 * b09 + a15 * b13, - a12 * b02 + a13 * b06 + a14 * b10 + a15 * b14, - a12 * b03 + a13 * b07 + a14 * b11 + a15 * b15]; + a12 * b00 + a13 * b04 + a14 * b08 + a15 * b12, + a12 * b01 + a13 * b05 + a14 * b09 + a15 * b13, + a12 * b02 + a13 * b06 + a14 * b10 + a15 * b14, + a12 * b03 + a13 * b07 + a14 * b11 + a15 * b15]; }; /** @@ -409,24 +409,24 @@ RDGE.mat4.mul4x3 = function (a, b) { var b14 = b[14]; return [a00 * b00 + a01 * b04 + a02 * b08, - a00 * b01 + a01 * b05 + a02 * b09, - a00 * b02 + a01 * b06 + a02 * b10, - 0, + a00 * b01 + a01 * b05 + a02 * b09, + a00 * b02 + a01 * b06 + a02 * b10, + 0, - a04 * b00 + a05 * b04 + a06 * b08, - a04 * b01 + a05 * b05 + a06 * b09, - a04 * b02 + a05 * b06 + a06 * b10, - 0, + a04 * b00 + a05 * b04 + a06 * b08, + a04 * b01 + a05 * b05 + a06 * b09, + a04 * b02 + a05 * b06 + a06 * b10, + 0, - a08 * b00 + a09 * b04 + a10 * b08, - a08 * b01 + a09 * b05 + a10 * b09, - a08 * b02 + a09 * b06 + a10 * b10, - 0, + a08 * b00 + a09 * b04 + a10 * b08, + a08 * b01 + a09 * b05 + a10 * b09, + a08 * b02 + a09 * b06 + a10 * b10, + 0, - a12 * b00 + a13 * b04 + a14 * b08 + b12, - a12 * b01 + a13 * b05 + a14 * b09 + b13, - a12 * b02 + a13 * b06 + a14 * b10 + b14, - 1.0]; + a12 * b00 + a13 * b04 + a14 * b08 + b12, + a12 * b01 + a13 * b05 + a14 * b09 + b13, + a12 * b02 + a13 * b06 + a14 * b10 + b14, + 1.0]; }; /** @@ -441,8 +441,8 @@ RDGE.mat4._det2x2 = function (a, b, c, d) { */ RDGE.mat4._det3x3 = function (a1, a2, a3, b1, b2, b3, c1, c2, c3) { return a1 * RDGE.mat4._det2x2(b2, b3, c2, c3) - - b1 * RDGE.mat4._det2x2(a2, a3, c2, c3) - + c1 * RDGE.mat4._det2x2(a2, a3, b2, b3); + - b1 * RDGE.mat4._det2x2(a2, a3, c2, c3) + + c1 * RDGE.mat4._det2x2(a2, a3, b2, b3); }; /** @@ -470,9 +470,9 @@ RDGE.mat4._det4x4 = function (m) { var d4 = m[15]; return a1 * RDGE.mat4._det3x3(b2, b3, b4, c2, c3, c4, d2, d3, d4) - - b1 * RDGE.mat4._det3x3(a2, a3, a4, c2, c3, c4, d2, d3, d4) - + c1 * RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, d2, d3, d4) - - d1 * RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, c2, c3, c4); + - b1 * RDGE.mat4._det3x3(a2, a3, a4, c2, c3, c4, d2, d3, d4) + + c1 * RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, d2, d3, d4) + - d1 * RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, c2, c3, c4); }; /** @@ -500,21 +500,21 @@ RDGE.mat4._adjoint = function (m) { var d4 = m[15]; return [RDGE.mat4._det3x3(b2, b3, b4, c2, c3, c4, d2, d3, d4), - -RDGE.mat4._det3x3(b1, b3, b4, c1, c3, c4, d1, d3, d4), - RDGE.mat4._det3x3(b1, b2, b4, c1, c2, c4, d1, d2, d4), - -RDGE.mat4._det3x3(b1, b2, b3, c1, c2, c3, d1, d2, d3), - -RDGE.mat4._det3x3(a2, a3, a4, c2, c3, c4, d2, d3, d4), - RDGE.mat4._det3x3(a1, a3, a4, c1, c3, c4, d1, d3, d4), - -RDGE.mat4._det3x3(a1, a2, a4, c1, c2, c4, d1, d2, d4), - RDGE.mat4._det3x3(a1, a2, a3, c1, c2, c3, d1, d2, d3), - RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, d2, d3, d4), - -RDGE.mat4._det3x3(a1, a3, a4, b1, b3, b4, d1, d3, d4), - RDGE.mat4._det3x3(a1, a2, a4, b1, b2, b4, d1, d2, d4), - -RDGE.mat4._det3x3(a1, a2, a3, b1, b2, b3, d1, d2, d3), - -RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, c2, c3, c4), - RDGE.mat4._det3x3(a1, a3, a4, b1, b3, b4, c1, c3, c4), - -RDGE.mat4._det3x3(a1, a2, a4, b1, b2, b4, c1, c2, c4), - RDGE.mat4._det3x3(a1, a2, a3, b1, b2, b3, c1, c2, c3)]; + -RDGE.mat4._det3x3(b1, b3, b4, c1, c3, c4, d1, d3, d4), + RDGE.mat4._det3x3(b1, b2, b4, c1, c2, c4, d1, d2, d4), + -RDGE.mat4._det3x3(b1, b2, b3, c1, c2, c3, d1, d2, d3), + -RDGE.mat4._det3x3(a2, a3, a4, c2, c3, c4, d2, d3, d4), + RDGE.mat4._det3x3(a1, a3, a4, c1, c3, c4, d1, d3, d4), + -RDGE.mat4._det3x3(a1, a2, a4, c1, c2, c4, d1, d2, d4), + RDGE.mat4._det3x3(a1, a2, a3, c1, c2, c3, d1, d2, d3), + RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, d2, d3, d4), + -RDGE.mat4._det3x3(a1, a3, a4, b1, b3, b4, d1, d3, d4), + RDGE.mat4._det3x3(a1, a2, a4, b1, b2, b4, d1, d2, d4), + -RDGE.mat4._det3x3(a1, a2, a3, b1, b2, b3, d1, d2, d3), + -RDGE.mat4._det3x3(a2, a3, a4, b2, b3, b4, c2, c3, c4), + RDGE.mat4._det3x3(a1, a3, a4, b1, b3, b4, c1, c3, c4), + -RDGE.mat4._det3x3(a1, a2, a4, b1, b2, b4, c1, c2, c4), + RDGE.mat4._det3x3(a1, a2, a3, b1, b2, b3, c1, c2, c3)]; }; /** @@ -535,9 +535,9 @@ RDGE.mat4.inverse = function (m) { var ood = 1.0 / det; return [adj[0] * ood, adj[1] * ood, adj[2] * ood, adj[3] * ood, - adj[4] * ood, adj[5] * ood, adj[6] * ood, adj[7] * ood, - adj[8] * ood, adj[9] * ood, adj[10] * ood, adj[11] * ood, - adj[12] * ood, adj[13] * ood, adj[14] * ood, adj[15] * ood]; + adj[4] * ood, adj[5] * ood, adj[6] * ood, adj[7] * ood, + adj[8] * ood, adj[9] * ood, adj[10] * ood, adj[11] * ood, + adj[12] * ood, adj[13] * ood, adj[14] * ood, adj[15] * ood]; }; /** @@ -556,9 +556,9 @@ RDGE.mat4.rigidInverse = function (m) { */ RDGE.mat4.transpose = function (m) { return [m[0], m[4], m[8], m[12], - m[1], m[5], m[9], m[13], - m[2], m[6], m[10], m[14], - m[3], m[7], m[11], m[15]]; + m[1], m[5], m[9], m[13], + m[2], m[6], m[10], m[14], + m[3], m[7], m[11], m[15]]; }; /** @@ -566,9 +566,9 @@ RDGE.mat4.transpose = function (m) { */ RDGE.mat4.transpose3x3 = function (m) { return [m[0], m[4], m[8], m[3], - m[1], m[5], m[9], m[7], - m[2], m[6], m[10], m[11], - m[12], m[13], m[14], m[15]]; + m[1], m[5], m[9], m[7], + m[2], m[6], m[10], m[11], + m[12], m[13], m[14], m[15]]; }; /** @@ -577,9 +577,9 @@ RDGE.mat4.transpose3x3 = function (m) { RDGE.mat4.transformPoint = function (m, v) { var x = v[0], y = v[1], z = v[2], w = v.length >= 4 ? v[3] : 1.0; return [m[0] * x + m[4] * y + m[8] * z + m[12] * w, - m[1] * x + m[5] * y + m[9] * z + m[13] * w, - m[2] * x + m[6] * y + m[10] * z + m[14] * w, - m[3] * x + m[7] * y + m[11] * z + m[15] * w]; + m[1] * x + m[5] * y + m[9] * z + m[13] * w, + m[2] * x + m[6] * y + m[10] * z + m[14] * w, + m[3] * x + m[7] * y + m[11] * z + m[15] * w]; // 12 adds, 16 multiplies, 16 lookups. }; @@ -592,9 +592,9 @@ RDGE.mat4.transformVector = function (m, v) { // 12 adds, 16 multiplies, 16 lookups. // transpose multiply return [m[0] * x + m[1] * y + m[2] * z + m[3] * w, - m[4] * x + m[5] * y + m[6] * z + m[7] * w, - m[8] * x + m[9] * y + m[10] * z + m[11] * w, - m[12] * x + m[13] * y + m[14] * z + m[15] * w]; + m[4] * x + m[5] * y + m[6] * z + m[7] * w, + m[8] * x + m[9] * y + m[10] * z + m[11] * w, + m[12] * x + m[13] * y + m[14] * z + m[15] * w]; }; /** @@ -605,9 +605,9 @@ RDGE.mat4.transformPoint4x3 = function (m, v) { var x = v[0], y = v[1], z = v[2]; // 9 adds, 9 multiplies, 16 lookups. return [m[0] * x + m[4] * y + m[8] * z + m[12], - m[1] * x + m[5] * y + m[9] * z + m[13], - m[2] * x + m[6] * y + m[10] * z + m[14], - 1.0]; + m[1] * x + m[5] * y + m[9] * z + m[13], + m[2] * x + m[6] * y + m[10] * z + m[14], + 1.0]; }; /** @@ -618,9 +618,9 @@ RDGE.mat4.transformVector4x3 = function (m, v) { m = RDGE.mat4.inverse(m); var x = v[0], y = v[1], z = v[2]; return [m[0] * x + m[1] * y + m[2] * z, - m[4] * x + m[5] * y + m[6] * z, - m[8] * x + m[9] * y + m[10] * z, - 0.0]; + m[4] * x + m[5] * y + m[6] * z, + m[8] * x + m[9] * y + m[10] * z, + 0.0]; }; /** diff --git a/js/helper-classes/RDGE/src/core/script/math/quat.js b/js/helper-classes/RDGE/src/core/script/math/quat.js index a3812084..d243a7ba 100755 --- a/js/helper-classes/RDGE/src/core/script/math/quat.js +++ b/js/helper-classes/RDGE/src/core/script/math/quat.js @@ -34,8 +34,8 @@ POSSIBILITY OF SUCH DAMAGE. * This library contains utility functions for operating on quaternions. * -- * TODO: -* -need to add more helper functions for generating quaternions from -* other representations (i.e. - eulers, angle-axis). +* -need to add more helper functions for generating quaternions from +* other representations (i.e. - eulers, angle-axis). */ var RDGE = RDGE || {}; RDGE.quat = {}; @@ -74,9 +74,9 @@ RDGE.quat.identity = function () { */ RDGE.quat.add = function (a, b) { return [a[0] + b[0], - a[1] + b[1], - a[2] + b[2], - a[3] + b[3]]; + a[1] + b[1], + a[2] + b[2], + a[3] + b[3]]; }; /** @@ -84,9 +84,9 @@ RDGE.quat.add = function (a, b) { */ RDGE.quat.sub = function (a, b) { return [a[0] - b[0], - a[1] - b[1], - a[2] - b[2], - a[3] - b[3]]; + a[1] - b[1], + a[2] - b[2], + a[3] - b[3]]; }; /** @@ -94,9 +94,9 @@ RDGE.quat.sub = function (a, b) { */ RDGE.quat.mul = function (a, b) { return [a[3] * b[3] - a[0] * b[0] - a[1] * b[1] - a[2] * b[2], - a[3] * b[0] + a[0] * b[3] + a[1] * b[2] - a[2] * b[1], - a[3] * b[1] - a[0] * b[2] + a[1] * b[3] + a[2] * b[0], - a[3] * b[2] + a[0] * b[1] - a[1] * b[0] + a[2] * b[3]]; + a[3] * b[0] + a[0] * b[3] + a[1] * b[2] - a[2] * b[1], + a[3] * b[1] - a[0] * b[2] + a[1] * b[3] + a[2] * b[0], + a[3] * b[2] + a[0] * b[1] - a[1] * b[0] + a[2] * b[3]]; }; /** @@ -127,9 +127,9 @@ RDGE.quat.scale = function (q, s) { */ RDGE.quat.lengthSq = function (q) { return q[0] * q[0] + - q[1] * q[1] + - q[2] * q[2] + - q[3] * q[3]; + q[1] * q[1] + + q[2] * q[2] + + q[3] * q[3]; }; /** @@ -137,9 +137,9 @@ RDGE.quat.lengthSq = function (q) { */ RDGE.quat.length = function (q) { return Math.sqrt(q[0] * q[0] + - q[1] * q[1] + - q[2] * q[2] + - q[3] * q[3]); + q[1] * q[1] + + q[2] * q[2] + + q[3] * q[3]); }; /** @@ -193,22 +193,22 @@ RDGE.quat.lerp = function (q0, q1, t) { * RDGE.quat.slerp */ RDGE.quat.slerp = function (q0, q1, t) { - var c = RDGE.quat.dot(q0, q1); // cosine of the angle + var c = RDGE.quat.dot(q0, q1); // cosine of the angle // just lerp if the quats are "close" enough if (c >= 0.9) { return RDGE.quat.lerp(q0, q1, t); } - var s = Math.sqrt(Math.abs(1.0 - c * c)); // sine of the angle + var s = Math.sqrt(Math.abs(1.0 - c * c)); // sine of the angle if (s < 0.001) return q0; // too close var sign = c < 0.0 ? -1.0 : 1.0; var angle = Math.asin(s); - var invs = 1.0 / s; // sine^-1 - var coef0 = Math.sin((1.0 - t) * angle) * invs; // interp. coefficients + var invs = 1.0 / s; // sine^-1 + var coef0 = Math.sin((1.0 - t) * angle) * invs; // interp. coefficients var coef1 = Math.sin(t * angle) * invs * sign; RDGE.quat.scale(q0, coef0); @@ -235,16 +235,16 @@ RDGE.quat.toMatrix = function (q) { var tzz = tz * q[2]; return [1.0 - (tyy + tzz), - txy + twz, - txz - twy, - 0, - txy - twz, - 1.0 - (txx + tzz), - tyz + twx, - 0, - txz + twy, - tyz - twx, - 1.0 - (txx + tyy), - 0, 0, 0, 0, 1]; + txy + twz, + txz - twy, + 0, + txy - twz, + 1.0 - (txx + tzz), + tyz + twx, + 0, + txz + twy, + tyz - twx, + 1.0 - (txx + tyy), + 0, 0, 0, 0, 1]; }; diff --git a/js/helper-classes/RDGE/src/core/script/math/vec2.js b/js/helper-classes/RDGE/src/core/script/math/vec2.js index 0a5b832d..a003130d 100755 --- a/js/helper-classes/RDGE/src/core/script/math/vec2.js +++ b/js/helper-classes/RDGE/src/core/script/math/vec2.js @@ -34,9 +34,9 @@ POSSIBILITY OF SUCH DAMAGE. * This library contains functions for operating on 2D vectors. * A 2D vector can be any array containing at least 2 numeric components. * All of the following are valid methods for declaring a RDGE.vec2: -* var a = [0, 1]; -* var b = RDGE.vec2.zero(); -* var c = RDGE.vec2.up(); +* var a = [0, 1]; +* var b = RDGE.vec2.zero(); +* var c = RDGE.vec2.up(); */ var RDGE = RDGE || {}; RDGE.vec2 = {}; diff --git a/js/helper-classes/RDGE/src/core/script/math/vec3.js b/js/helper-classes/RDGE/src/core/script/math/vec3.js index c50df00c..72662513 100755 --- a/js/helper-classes/RDGE/src/core/script/math/vec3.js +++ b/js/helper-classes/RDGE/src/core/script/math/vec3.js @@ -35,9 +35,9 @@ POSSIBILITY OF SUCH DAMAGE. * containing at least 3 numeric components can represent a 3D vector. * * For example, all of these are valid RDGE.vec3 declarations: - * var a = [0, 0, 1]; - * var b = RDGE.vec3.zero(); - * var c = RDGE.vec3.up(); + * var a = [0, 0, 1]; + * var b = RDGE.vec3.zero(); + * var c = RDGE.vec3.up(); * */ var RDGE = RDGE || {}; @@ -268,8 +268,8 @@ RDGE.vec3.normalize = function (v) { */ RDGE.vec3.cross = function (a, b) { return [a[1] * b[2] - b[1] * a[2], - a[2] * b[0] - b[2] * a[0], - a[0] * b[1] - b[0] * a[1]]; + a[2] * b[0] - b[2] * a[0], + a[0] * b[1] - b[0] * a[1]]; }; /** @@ -367,8 +367,8 @@ RDGE.vec3.equal = function (a, b, t) { */ RDGE.vec3.lerp = function (a, b, t) { return [ - a[0] + (b[0] - a[0]) * t, - a[1] + (b[1] - a[1]) * t, - a[2] + (b[2] - a[2]) * t - ]; + a[0] + (b[0] - a[0]) * t, + a[1] + (b[1] - a[1]) * t, + a[2] + (b[2] - a[2]) * t + ]; }; diff --git a/js/helper-classes/RDGE/src/core/script/math/vec4.js b/js/helper-classes/RDGE/src/core/script/math/vec4.js index 53759d6e..3c2d96e7 100755 --- a/js/helper-classes/RDGE/src/core/script/math/vec4.js +++ b/js/helper-classes/RDGE/src/core/script/math/vec4.js @@ -34,9 +34,9 @@ POSSIBILITY OF SUCH DAMAGE. * containing at least 4 numeric components can represent a 4D vector. * * For example, all of these are valid RDGE.vec4 declarations: -* var a = [0, 0, 0, 1]; -* var b = RDGE.RDGE.vec4.identity(); -* var c = RDGE.RDGE.vec4.zero(); +* var a = [0, 0, 0, 1]; +* var b = RDGE.RDGE.vec4.identity(); +* var c = RDGE.RDGE.vec4.zero(); * */ var RDGE = RDGE || {}; @@ -139,9 +139,9 @@ RDGE.vec4.random = function (min, max) { */ RDGE.vec4.add = function (a, b) { return [a[0] + b[0], - a[1] + b[1], - a[2] + b[2], - a[3] + b[3]]; + a[1] + b[1], + a[2] + b[2], + a[3] + b[3]]; }; /** @@ -149,9 +149,9 @@ RDGE.vec4.add = function (a, b) { */ RDGE.vec4.sub = function (a, b) { return [a[0] - b[0], - a[1] - b[1], - a[2] - b[2], - a[3] - b[3]]; + a[1] - b[1], + a[2] - b[2], + a[3] - b[3]]; }; /** @@ -159,9 +159,9 @@ RDGE.vec4.sub = function (a, b) { */ RDGE.vec4.mul = function (a, b) { return [a[0] * b[0], - a[1] * b[1], - a[2] * b[2], - a[3] * b[3]]; + a[1] * b[1], + a[2] * b[2], + a[3] * b[3]]; }; /** @@ -217,9 +217,9 @@ RDGE.vec4.normalize = function (v) { */ RDGE.vec4.lengthSq = function (v) { return v[0] * v[0] + - v[1] * v[1] + - v[2] * v[2] + - v[3] * v[3]; + v[1] * v[1] + + v[2] * v[2] + + v[3] * v[3]; }; /** @@ -227,9 +227,9 @@ RDGE.vec4.lengthSq = function (v) { */ RDGE.vec4.length = function (v) { return Math.sqrt(v[0] * v[0] + - v[1] * v[1] + - v[2] * v[2] + - v[3] * v[3]); + v[1] * v[1] + + v[2] * v[2] + + v[3] * v[3]); }; /** @@ -275,9 +275,9 @@ RDGE.vec4.equal = function (a, b, t) { */ RDGE.vec4.lerp = function (a, b, t) { return [ - a[0] + (b[0] - a[0]) * t, - a[1] + (b[1] - a[1]) * t, - a[2] + (b[2] - a[2]) * t, - a[3] + (b[3] - a[3]) * t - ]; + a[0] + (b[0] - a[0]) * t, + a[1] + (b[1] - a[1]) * t, + a[2] + (b[2] - a[2]) * t, + a[3] + (b[3] - a[3]) * t + ]; }; -- cgit v1.2.3