Merge pull request #156 from mayhewinator/WorkingBranch

Namespace and code cleanup for RDGE and related files

5 files changed, 1141 insertions, 1148 deletions

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 fab57732..239c646a 100755
--- a/js/helper-classes/RDGE/src/core/script/math/mat4.js
+++ b/js/helper-classes/RDGE/src/core/script/math/mat4.js
@@ -4,17 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.

 </copyright> */

 

-

-float3 = function() {

-        data = [3];

-}

-

-float4 = function() {

-        data = [4];

-}

-

 /**

-* mat4 = {}

 * This library contains functions for operating on 4x4 matrices. Any JS array 

 * containing at least 16 numeric components can represent a 4x4 matrix. 

 *

@@ -31,313 +21,314 @@ float4 = function() {
 *                         y0, y1, y2, y3,

 *                         z0, z1, z2, z3,

 *                         w0, w1, w2, w3 ];

-* The translation components of a tranformation matrix would be stored in 

+* 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.                    

 */

-mat4 = {}

+// RDGE namespaces

+var RDGE = RDGE || {};

+RDGE.mat4 = {};

 

 /**

-* mat4.string

+* RDGE.mat4.string

 */

-mat4.string = function(m) {

-        var out = "{ ";

-        out += m[0] + ", " + m[1] + ", " + m[2] + ", " + m[3] + ", ";

-        out += m[4] + ", " + m[5] + ", " + m[6] + ", " + m[7] + ", ";

-        out += m[8] + ", " + m[9] + ", " + m[10] + ", " + m[11] + ", ";

-        out += m[12] + ", " + m[13] + ", " + m[14] + ", " + m[15] + " }";

-        return out;

-}

+RDGE.mat4.string = function (m) {

+    var out = "{ ";

+    out += m[0] + ", " + m[1] + ", " + m[2] + ", " + m[3] + ", ";

+    out += m[4] + ", " + m[5] + ", " + m[6] + ", " + m[7] + ", ";

+    out += m[8] + ", " + m[9] + ", " + m[10] + ", " + m[11] + ", ";

+    out += m[12] + ", " + m[13] + ", " + m[14] + ", " + m[15] + " }";

+    return out;

+};

 

-mat4.toCSSString = function(m, conversionConstant) 

-{

+RDGE.mat4.toCSSString = function (m, conversionConstant) {

     var cc = 10.0;

 

     if (conversionConstant)

         cc = conversionConstant;

-        

+

     var out = "matrix3d(";

     out += m[0].toFixed(10) + ", " + m[1].toFixed(10) + ", " + m[2].toFixed(10) + ", " + m[3].toFixed(10) + ", ";

     out += m[4].toFixed(10) + ", " + m[5].toFixed(10) + ", " + m[6].toFixed(10) + ", " + m[7].toFixed(10) + ", ";

     out += m[8].toFixed(10) + ", " + m[9].toFixed(10) + ", " + m[10].toFixed(10) + ", " + m[11].toFixed(10) + ", ";

-    out += m[12].toFixed(10)*cc + ", " + (600 - m[13].toFixed(10)*cc) + ", " + m[14].toFixed(10)*cc + ", " + m[15].toFixed(10) + ")";

+    out += m[12].toFixed(10) * cc + ", " + (600 - m[13].toFixed(10) * cc) + ", " + m[14].toFixed(10) * cc + ", " + m[15].toFixed(10) + ")";

     return out;

-}

+};

 

 /**

-* mat4.verify

+* RDGE.mat4.verify

 * This function is provided for debugging purposes only. It is not recommended 

 * to be used in performance critical areas of the code.

 */

-mat4.verify = function(m) {

-        if (m == undefined || m.length == undefined || m.length < 16) {

-                return false;

-        }

-        var i = 16;

-        while (i--) {

-                if (typeof (m[i]) != "number") {

-                        return false;

-                }

-        }

-        return true;

-}

-

-/**

-* mat4.copy

-*/

-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] ];

-}

-

-/**

-* mat4.inplace_copy

-*/

-mat4.inplace_copy = function(dst, src) {

-        dst[0] = src[0];

-        dst[1] = src[1];

-        dst[2] = src[2];

-        dst[3] = src[3];

-        dst[4] = src[4];

-        dst[5] = src[5];

-        dst[6] = src[6];

-        dst[7] = src[7];

-        dst[8] = src[8];

-        dst[9] = src[9];

-        dst[10] = src[10];

-        dst[11] = src[11];

-        dst[12] = src[12];

-        dst[13] = src[13];

-        dst[14] = src[14];

-        dst[15] = src[15];

-}

-

-/**

-* mat4.identity

-*/

-mat4.identity = function() {

-        return  [       1.0, 0.0, 0.0, 0.0,

+RDGE.mat4.verify = function (m) {

+    if (m == undefined || m.length == undefined || m.length < 16) {

+        return false;

+    }

+    var i = 16;

+    while (i--) {

+        if (typeof (m[i]) != "number") {

+            return false;

+        }

+    }

+    return true;

+};

+

+/**

+* RDGE.mat4.copy

+*/

+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]];

+};

+

+/**

+* RDGE.mat4.inplace_copy

+*/

+RDGE.mat4.inplace_copy = function (dst, src) {

+    dst[0] = src[0];

+    dst[1] = src[1];

+    dst[2] = src[2];

+    dst[3] = src[3];

+    dst[4] = src[4];

+    dst[5] = src[5];

+    dst[6] = src[6];

+    dst[7] = src[7];

+    dst[8] = src[8];

+    dst[9] = src[9];

+    dst[10] = src[10];

+    dst[11] = src[11];

+    dst[12] = src[12];

+    dst[13] = src[13];

+    dst[14] = src[14];

+    dst[15] = src[15];

+};

+

+/**

+* RDGE.mat4.identity

+*/

+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, 0.0, 0.0, 1.0];

+};

 

 /**

-* mat4.zero

+* RDGE.mat4.zero

 */

-mat4.zero = function() {

-        return [        0.0, 0.0, 0.0, 0.0,

+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];

+};

 

 /**

-* mat4.basis

+* RDGE.mat4.basis

 * description - construct a matrix with the given basis vectors.

 */

-mat4.basis = function( rowx, rowy, rowz, roww ) {

+RDGE.mat4.basis = function (rowx, rowy, rowz, roww) {