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>

1 files changed, 1686 insertions, 1685 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/renderer.js b/js/helper-classes/RDGE/src/core/script/renderer.js
index 9367c145..889cd62e 100755
--- a/js/helper-classes/RDGE/src/core/script/renderer.js
+++ b/js/helper-classes/RDGE/src/core/script/renderer.js
@@ -1,1685 +1,1686 @@
-/* <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> */

-

-var RDGE = RDGE || {};

-

-// runtime globals

-RDGE.rdgeConstants = (function () {

-    return {

-        // clear flags

-        colorBuffer: 0x00004000,

-        depthBuffer: 0x00000100,

-        stencilBuffer: 0x00000400,

-

-        // primitive types

-        POINTS: 0,

-        LINES: 1,

-        LINE_LOOP: 2,

-        LINE_STRIP: 3,

-        TRIANGLES: 4,

-        TRIANGLE_STRIP: 5,

-        TRIANGLE_FAN: 6,

-

-        // primitive data types

-        BYTE: 0x1400,

-        UNSIGNED_BYTE: 0x1401,

-        SHORT: 0x1402,

-        UNSIGNED_SHORT: 0x1403,

-        INT: 0x1404,

-        UNSIGNED_INT: 0x1405,

-        FLOAT: 0x1406,

-

-        // pre-defined vertex element type

-        VS_ELEMENT_FLOAT4: 4,

-        VS_ELEMENT_POS: 3,

-        VS_ELEMENT_NORM: 3,

-        VS_ELEMENT_FLOAT3: 3,

-        VS_ELEMENT_FLOAT2: 2,

-        VS_ELEMENT_UV: 2,

-        VS_ELEMENT_FLOAT: 1,

-        MAX_ELEM_TYPES: 7,

-

-        // GL Definition of buffer types

-        BUFFER_STATIC: 0x88E0,

-        BUFFER_DYNAMIC: 0x88E4,

-        BUFFER_STREAM: 0x88E8,

-

-        // render constants

-        MAX_MATERIAL_LIGHTS: 4,

-

-        //      Material categories determine sorting materials support the following categories

-        categoryEnumeration:

-        {

-            'BACKGROUND': 0,

-            'OPAQUE': 1,

-            'TRANSPARENT': 2,

-            'ADDITIVE': 3,

-            'TRANSLUCENT': 4,

-            'FOREGROUND': 5,

-            'MAX_CAT': 6

-        },

-

-        // Node types supported by the scene graph

-        nodeType:

-        {

-            'TRNODE': 0,

-            'MESHNODE': 1,

-            'MATNODE': 2,

-            'LIGHTNODE': 3

-        }

-    };

-})();

-

-RDGE._renderer = function (canvas) {

-    /*

-    *   Initialize the context associated with this canvas

-    */

-    try {

-        this.ctx = canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }); // true, true, false, true, true);

-

-        if (!this.ctx) {

-            this.ctx = canvas.getContext("webgl", { preserveDrawingBuffer: true });

-        }

-        if (!this.ctx) {

-            this.ctx = canvas.getContext("webkit-3d", { preserveDrawingBuffer: true });

-        }

-        if (!this.ctx) {

-            this.ctx = canvas.getContext("moz-webgl", { preserveDrawingBuffer: true });

-        }

-    }

-    catch (err) { }

-    if (!this.ctx) {

-        window.console.log("Could not create GL context");

-        return null;

-    }

-

-    // set viewport for the first time

-    this.ctx.viewport(0, 0, canvas.width, canvas.height);

-

-    // Add a console output to the renderer

-    this.console = ("console" in window) ? window.console : { log: function () { } };

-

-    /*

-    *   Set the default clear color

-    */

-    this.ctx.clearColor(1, 0, 0, 1);

-

+/* <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> */
+
+var RDGE = RDGE || {};
+
+// runtime globals
+RDGE.rdgeConstants = (function () {
+    return {
+        // clear flags
+        colorBuffer: 0x00004000,
+        depthBuffer: 0x00000100,
+        stencilBuffer: 0x00000400,
+
+        // primitive types
+        POINTS: 0,
+        LINES: 1,
+        LINE_LOOP: 2,
+        LINE_STRIP: 3,
+        TRIANGLES: 4,
+        TRIANGLE_STRIP: 5,
+        TRIANGLE_FAN: 6,
+
+        // primitive data types
+        BYTE: 0x1400,
+        UNSIGNED_BYTE: 0x1401,
+        SHORT: 0x1402,
+        UNSIGNED_SHORT: 0x1403,
+        INT: 0x1404,
+        UNSIGNED_INT: 0x1405,
+        FLOAT: 0x1406,
+
+        // pre-defined vertex element type
+        VS_ELEMENT_FLOAT4: 4,
+        VS_ELEMENT_POS: 3,
+        VS_ELEMENT_NORM: 3,
+        VS_ELEMENT_FLOAT3: 3,
+        VS_ELEMENT_FLOAT2: 2,
+        VS_ELEMENT_UV: 2,
+        VS_ELEMENT_FLOAT: 1,
+        MAX_ELEM_TYPES: 7,
+
+        // GL Definition of buffer types
+        BUFFER_STATIC: 0x88E0,
+        BUFFER_DYNAMIC: 0x88E4,
+        BUFFER_STREAM: 0x88E8,
+
+        // render constants
+        MAX_MATERIAL_LIGHTS: 4,
+
+        //  Material categories determine sorting materials support the following categories
+        categoryEnumeration:
+        {
+            'BACKGROUND': 0,
+            'OPAQUE': 1,
+            'TRANSPARENT': 2,
+            'ADDITIVE': 3,
+            'TRANSLUCENT': 4,
+            'FOREGROUND': 5,
+            'MAX_CAT': 6
+        },
+
+        // Node types supported by the scene graph
+        nodeType:
+        {
+            'TRNODE': 0,
+            'MESHNODE': 1,
+            'MATNODE': 2,
+            'LIGHTNODE': 3
+        }
+    };
+})();
+
+RDGE._renderer = function (canvas) {
+    /*
+    *   Initialize the context associated with this canvas
+    */
+    try {
+        this.ctx = canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }); // true, true, false, true, true);
+
+        if (!this.ctx) {
+            this.ctx = canvas.getContext("webgl", { preserveDrawingBuffer: true });
+        }
+        if (!this.ctx) {
+            this.ctx = canvas.getContext("webkit-3d", { preserveDrawingBuffer: true });
+        }
+        if (!this.ctx) {
+            this.ctx = canvas.getContext("moz-webgl", { preserveDrawingBuffer: true });
+        }
+    }
+    catch (err) { }
+    if (!this.ctx) {
+        window.console.log("Could not create GL context");
+        return null;
+    }
+
+    // set viewport for the first time
+    this.ctx.viewport(0, 0, canvas.width, canvas.height);
+
+    // Add a console output to the renderer
+    this.console = ("console" in window) ? window.console : { log: function () { } };
+
+    /*
+    *   Set the default clear color
+    */
+    this.ctx.clearColor(1, 0, 0, 1);