Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js
	js/preloader/Preloader.js

1 files changed, 0 insertions, 319 deletions

diff --git a/js/helper-classes/backup-delete/glUtils.js b/js/helper-classes/backup-delete/glUtils.js
deleted file mode 100755
index f6d075f8..00000000
--- a/js/helper-classes/backup-delete/glUtils.js
+++ /dev/null
@@ -1,319 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-// Constructor function
-function Vector() {}
-Vector.create = function(elements)
-{
-        var rtn;
-  if (elements)
-        rtn = elements.slice( 0 );
-  else
-        rtn = [];
-
-  return rtn;
-};
-
-Vector.dup = function(srcPt)
-{
-        return srcPt.slice(0);
-}
-
-
-
-function Matrix() {}
-
-Matrix.create = function( rowArray )
-{
-        var mat = Matrix.I(4);
-        var index = 0;
-        for(var j=0;  j<4;  j++)
-        {
-                for (var i=0;  i<4;  i++)
-                {
-                        mat[index] = rowArray[i][j];
-                        index++;
-                }
-        }
-
-        return mat;
-}
-Matrix.I = function(dimen)
-{
-        var mat = [];
-        for (var i=0;  i<dimen*dimen;  i++)  mat.push(0);
-
-        var index = 0;
-        for (var i=0;  i<dimen;  i++)
-        {
-                mat[index] = 1.0;
-                index += dimen + 1;
-        }
-        
-        return mat;     
-}
-
-Matrix.Translation = function (vec)
-{
-        var mat = Matrix.I(4);
-        glmat4.translate(mat, vec);
-        return mat;
-}
-
-Matrix.RotationX = function( angle )
-{
-        var mat = Matrix.I(4);
-        glmat4.rotateX(mat, angle);
-        return mat;
-}
-
-Matrix.RotationY = function( angle )
-{
-        var mat = Matrix.I(4);
-        glmat4.rotateY(mat, angle);
-        return mat;
-}
-
-Matrix.RotationZ = function( angle )
-{
-        var mat = Matrix.I(4);
-        glmat4.rotateZ(mat, angle);
-        return mat;
-}
-
-Matrix.Rotation = function(angle, axis)
-{
-    var mat = Matrix.I(4);
-    glmat4.rotate(mat, angle, axis);
-    return mat;
-}
-Matrix.flatten = function (mat)
-{
-    var result = [];
-    if (this.elements.length == 0)
-        return [];
-
-        for (var i=0;  i<16;  i++)  result.push(mat[i]);
-//    for (var j = 0; j < this.elements[0].length; j++)
-//        for (var i = 0; i < this.elements.length; i++)
-//            result.push(this.elements[i][j]);
-
-    return result;
-}
-
-/*
-Matrix.ensure4x4 = function()
-{
-    if (this.elements.length == 4 &&
-        this.elements[0].length == 4)
-        return this;
-
-    if (this.elements.length > 4 ||
-        this.elements[0].length > 4)
-        return null;
-
-    for (var i = 0; i < this.elements.length; i++) {
-        for (var j = this.elements[i].length; j < 4; j++) {
-            if (i == j)
-                this.elements[i].push(1);
-            else
-                this.elements[i].push(0);
-        }
-    }
-
-    for (var i = this.elements.length; i < 4; i++) {
-        if (i == 0)
-            this.elements.push([1, 0, 0, 0]);
-        else if (i == 1)
-            this.elements.push([0, 1, 0, 0]);
-        else if (i == 2)
-            this.elements.push([0, 0, 1, 0]);
-        else if (i == 3)
-            this.elements.push([0, 0, 0, 1]);
-    }
-
-    return this;
-};
-
-Matrix.prototype.make3x3 = function()
-{
-    if (this.elements.length != 4 ||
-        this.elements[0].length != 4)
-        return null;
-
-    return Matrix.create([[this.elements[0][0], this.elements[0][1], this.elements[0][2]],
-                          [this.elements[1][0], this.elements[1][1], this.elements[1][2]],
-                          [this.elements[2][0], this.elements[2][1], this.elements[2][2]]]);
-};
-*/
-
-/*
-/////////////////////////////////////////////////////////////////////////////////////////////
-// SMatrix
-
-SMatrix.Translation = function (vec)
-{
-        var mat = SMatrix.I(4);
-        mat.elements[0][3] = vec[0];
-        mat.elements[1][3] = vec[1];
-        mat.elements[2][3] = vec[2];
-        return mat;
-}
-
-SMatrix.RotationX = function( angle )
-{
-        var mat = SMatrix.I(4);
-        mat.rotateX(angle);
-        return mat;
-}
-
-SMatrix.RotationY = function( angle )
-{
-        var mat = SMatrix.I(4);
-        mat.rotateX(angle);
-        return mat;
-}
-
-SMatrix.RotationZ = function( angle )
-{
-        var mat = SMatrix.I(4);
-        mat.rotateZ(angle);
-        return mat;
-}
-
-SMatrix.MatrixtoSMatrix = function( mat )
-{
-        var smat = SMatrix.I(4);
-        var index = 0;
-        for (var j=0;  j<4;  j++)
-        {
-                for (var i=0;  i<4;  i++)
-                {
-                        smat.elements[i][j] = mat[index];
-                        index++;
-                }
-        }
-
-        return smat;
-}
-
-SMatrix.MatEqSMat = function( mat, sMat )
-{
-        var index = 0;
-        for (var j=0;  j<4;  j++)
-        {
-                for (var i=0;  i<4;  i++)
-                {
-                        var m = mat[index];
-                        var s = smat.elements[i][j];
-                        if ( MathUtils.fpCmp(m,s) != 0)
-                                throw new Error( "mat != smat" );
-                        index++;
-                }
-        }
-}
-
-// Matrix
-/////////////////////////////////////////////////////////////////////////////////////////////
-*/
-
-Vector.prototype.flatten = function ()
-{