Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal

Conflicts:
	js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
	js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

5 files changed, 1897 insertions, 1892 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 32c7111c..fb95ee21 100755
--- a/js/helper-classes/RDGE/src/core/script/math/mat4.js
+++ b/js/helper-classes/RDGE/src/core/script/math/mat4.js
@@ -1,769 +1,770 @@
-/* <copyright>

-Copyright (c) 2012, Motorola Mobility, Inc

-All Rights Reserved.

-BSD License.

-

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

-  - Neither the name of Motorola Mobility nor the names of its contributors

-    may be used to endorse or promote products derived from this software

-    without specific prior written permission.

-

-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 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-POSSIBILITY OF SUCH DAMAGE.

-</copyright> */

-

-/**

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

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

-*

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

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

-*/

-// RDGE namespaces

-var RDGE = RDGE || {};

-RDGE.mat4 = {};

-

-/**

-* RDGE.mat4.string

-*/

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

-};

-

-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) + ")";

-    return out;

-};

-

-/**

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

-*/

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

+/* <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+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.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+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 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; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
+
+/**
+* This library contains functions for operating on 4x4 matrices. Any JS array
+* 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 ] );
+*
+* 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 ];
+* 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.
+*/
+// RDGE namespaces
+var RDGE = RDGE || {};
+RDGE.mat4 = {};
+
+/**
+* RDGE.mat4.string
+*/
+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;
+};
+
+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) + ")";
+    return out;
+};
+
+/**
+* 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.
+*/
+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];