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, 191 insertions, 120 deletions

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 981bf9fd..f8b77a63 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 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.
+* 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 OWNER OR CONTRIBUTORS BE
+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
@@ -47,15 +48,15 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
     this._colorStop2 = 0.3;
     this._colorStop3 = 0.6;
     this._colorStop4 = 1.0;
-    //  this._colorCount        = 4;
+    //  this._colorCount    = 4;
     this._angle = 0.0; // the shader takes [cos(a), sin(a)]
 
-        this._textureTransform = [1,0,0, 0,1,0, 0,0,1];
+    this._textureTransform = [1,0,0, 0,1,0, 0,0,1];
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.getShaderDef               = function()                    {  return linearGradientMaterialDef;    }
+    this.getShaderDef       = function()            {  return linearGradientMaterialDef;    }
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
@@ -95,123 +96,193 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         this._materialNode.setShader(this._shader);
 
 
-                if (this._shader && this._shader['default'])
-                        this._shader['default'].u_texTransform.set( this._textureTransform );
+        if (this._shader && this._shader['default'])
+            this._shader['default'].u_texTransform.set( this._textureTransform );
 
 
         // send the current values to the shader
         this.setShaderValues();
-                this.update( 0 );
+        this.update( 0 );
+    };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = this._color1.slice(0);
+                this._propValues[this._propNames[1]] = this._color2.slice(0);
+                this._propValues[this._propNames[2]] = this._color3.slice(0);
+                this._propValues[this._propNames[3]] = this._color4.slice(0);
+
+                this._propValues[this._propNames[4]] = this._colorStop1;
+                this._propValues[this._propNames[5]] = this._colorStop2;
+                this._propValues[this._propNames[6]] = this._colorStop3;
+                this._propValues[this._propNames[7]] = this._colorStop4;
+
+                this._propValues[this._propNames[8]] = [ Math.cos(this._angle), Math.sin(this._angle) ];
+
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++) {
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+                }
+        };
+
+    // Only Linear Gradient and Radial Gradients support gradients;
+    this.gradientType = "linear";
+
+    this.getGradientData = function() {
+        var angle = Math.round(this._angle*180/Math.PI),
+            color,
+            colorStr,
+            css = "-webkit-gradient(linear, " + angle + "deg";
+
+        // TODO - Angle is not supported in -webkit-gradient syntax, so just default to across:
+        css = '-webkit-gradient(linear, left top, right top';
+
+        // TODO - Also, Color Model requires from and to in the gradient string
+        color = this.getProperty('u_color1');
+        colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
+        css += ', from(rgba(' + colorStr + '))';
+
+        for (var i=2; i < 4; i++) {
+            color = this.getProperty('u_color'+i);
+            colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
+            css += ', color-stop(' + this.getProperty('u_colorStop'+i) + ', rgba(' + colorStr + '))';
+        }
+
+        color = this.getProperty('u_color4');
+        colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
+        css += ', to(rgba(' + colorStr + '))';
+
+        css += ')';
+
+        return css;
+        };
+
+    // Only Linear Gradient and Radial Gradient have gradient data.
+    this.setGradientData = function(colors) {
+        var len = colors.length;
+        // TODO - Current shaders only support 4 color stops
+        if (len > 4) {
+            len = 4;
+        }
+
+        for (var n = 0; n < len; n++) {
+            var position = colors[n].position/100;
+            var cs = colors[n].value;
+            var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+
+            this.setProperty("u_color" + (n + 1), stop.slice(0));
+            this.setProperty("u_colorStop" + (n + 1), position);
+        }
     };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
- 
+
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var linearGradientMaterialDef =
-{'shaders': 
-        {
-                        // shader file
-                        'defaultVShader':"assets/shaders/linearGradient.vert.glsl",
-                        'defaultFShader':"assets/shaders/linearGradient.frag.glsl",
-                                        
-                        // this shader is inline
-                        'dirLightVShader': "\
-                                uniform mat4 u_mvMatrix;\
-                                uniform mat4 u_normalMatrix;\
-                                uniform mat4 u_projMatrix;\
-                                uniform mat4 u_worldMatrix;\
-                                attribute vec3  a_pos;\
-                                attribute vec3  a_nrm;\
-                                varying vec3 vNormal;\
-                                varying vec3 vPos;\
-                                void main() {\
-                                        vNormal.xyz = (u_normalMatrix*vec4(a_nrm, 0.0)).xyz;\
-                                        gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0);\
-                                        vPos = (u_worldMatrix * vec4(a_pos,1.0)).xyz;\
-                                }",                             
-                        'dirLightFShader': "\
+{'shaders':
+    {
+            // shader file
+            'defaultVShader':"assets/shaders/linearGradient.vert.glsl",
+            'defaultFShader':"assets/shaders/linearGradient.frag.glsl",
+
+            // this shader is inline
+            'dirLightVShader': "\
+                uniform mat4 u_mvMatrix;\
+                uniform mat4 u_normalMatrix;\
+                uniform mat4 u_projMatrix;\
+                uniform mat4 u_worldMatrix;\
+                attribute vec3  a_pos;\
+                attribute vec3  a_nrm;\
+                varying vec3 vNormal;\
+                varying vec3 vPos;\
+                void main() {\
+                    vNormal.xyz = (u_normalMatrix*vec4(a_nrm, 0.0)).xyz;\
+                    gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0);\
+                    vPos = (u_worldMatrix * vec4(a_pos,1.0)).xyz;\
+                }",
+            'dirLightFShader': "\