From 22cbc9644b79df60b3f6336f9563debd47fb3ea1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 28 Jun 2012 11:44:15 -0700
Subject: Added capability to split a mesh into multiiple parts to avoid buffer
 overflow situations.

---
 js/lib/rdge/materials/linear-gradient-material.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'js/lib/rdge/materials/linear-gradient-material.js')

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 7e53db84..f5c54726 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -79,6 +79,25 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         this.setShaderValues();
 		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]]  );
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:52:06 -0700
Subject: Expand tabs

---
 js/lib/rdge/materials/linear-gradient-material.js | 214 +++++++++++-----------
 1 file changed, 107 insertions(+), 107 deletions(-)

(limited to 'js/lib/rdge/materials/linear-gradient-material.js')

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 981bf9fd..d216a2c0 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -47,15 +47,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,13 +95,13 @@ 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 );
     };
 };
 
@@ -111,107 +111,107 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
 // 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': "\
-				precision highp float;\
-				uniform vec4 u_light1Diff;\
-				uniform vec3 u_light1Pos;\
-				uniform vec4 u_light2Diff;\
-				uniform vec3 u_light2Pos;\
-				varying vec3 vNormal;\
-				varying vec3 vPos;\
-				void main() {\
-					vec3 light1 = vec3(u_light1Pos.x - vPos.x, u_light1Pos.y - vPos.y, u_light1Pos.z - vPos.z);\
-					vec3 light2 = vec3(u_light2Pos.x - vPos.x, u_light2Pos.y - vPos.y, u_light2Pos.z - vPos.z);\
-					float t = 0.75;\
-					float range = t*t;\
-					float alpha1 = max(0.0, 1.0 - ( (light1.x*light1.x)/range + (light1.y*light1.y)/range + (light1.z*light1.z)/range));\
-					float alpha2 = max(0.0, 1.0 - ( (light2.x*light2.x)/range + (light2.y*light2.y)/range + (light2.z*light2.z)/range));\
-					gl_FragColor = vec4((u_light2Diff*alpha2 + u_light1Diff*alpha1).rgb, 1.0);\
-				}"
-		},
-		'techniques':
-		{ 
-			'default':
-			[
-				{
-					'vshader' : 'defaultVShader',
-					'fshader' : 'defaultFShader',
-					// attributes
-					'attributes' :
-					{
-						'vert'	:	{ 'type' : 'vec3' },
-						'normal' :	{ 'type' : 'vec3' },
-						'texcoord'	:	{ 'type' : 'vec2' }
-					},
-					// parameters
-					'params' : 
-					{
-						'u_color1' :		{ 'type' : 'vec4' },									
-						'u_color2' :		{ 'type' : 'vec4' },									
-						'u_color3' :		{ 'type' : 'vec4' },									
-						'u_color4' :		{ 'type' : 'vec4' },
-						'u_colorStop1':		{ 'type' : 'float' },									
-						'u_colorStop2':		{ 'type' : 'float' },									
-						'u_colorStop3':		{ 'type' : 'float' },									
-						'u_colorStop4':		{ 'type' : 'float' },									
-						'u_cos_sin_angle':  { 'type' : 'vec2' },
-						'u_texTransform':   { 'type' : 'mat3' }
-						//'u_colorCount':		{'type' : 'int' }
-
-					},
-
-					// render states
-					'states' : 
-					{
-						'depthEnable' : true,
-						'offset':[1.0, 0.1]
-					}
-				},
-				{	// light pass
-					'vshader' : 'dirLightVShader',
-					'fshader' : 'dirLightFShader',
-					// attributes
-					'attributes' :
-					{
-						'a_pos'	:	{ 'type' : 'vec3' },
-						'a_nrm'	:	{ 'type' : 'vec3' }
-					},
-					// parameters
-					'params' : 
-					{
-					},
-
-					// render states
-					'states' : 
-					{
-						'depthEnable' : true,
-						"blendEnable" : true,
-						"srcBlend" : "SRC_ALPHA",
-						"dstBlend" : "DST_ALPHA"
-					}
-				}
-			]
-		}
+    {
+            // 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': "\
+                precision highp float;\
+                uniform vec4 u_light1Diff;\
+                uniform vec3 u_light1Pos;\
+                uniform vec4 u_light2Diff;\
+                uniform vec3 u_light2Pos;\
+                varying vec3 vNormal;\
+                varying vec3 vPos;\
+                void main() {\
+                    vec3 light1 = vec3(u_light1Pos.x - vPos.x, u_light1Pos.y - vPos.y, u_light1Pos.z - vPos.z);\
+                    vec3 light2 = vec3(u_light2Pos.x - vPos.x, u_light2Pos.y - vPos.y, u_light2Pos.z - vPos.z);\
+                    float t = 0.75;\
+                    float range = t*t;\
+                    float alpha1 = max(0.0, 1.0 - ( (light1.x*light1.x)/range + (light1.y*light1.y)/range + (light1.z*light1.z)/range));\
+                    float alpha2 = max(0.0, 1.0 - ( (light2.x*light2.x)/range + (light2.y*light2.y)/range + (light2.z*light2.z)/range));\
+                    gl_FragColor = vec4((u_light2Diff*alpha2 + u_light1Diff*alpha1).rgb, 1.0);\
+                }"
+        },
+        'techniques':
+        { 
+            'default':
+            [
+                {
+                    'vshader' : 'defaultVShader',
+                    'fshader' : 'defaultFShader',
+                    // attributes
+                    'attributes' :
+                    {
+                        'vert'  :   { 'type' : 'vec3' },
+                        'normal' :  { 'type' : 'vec3' },
+                        'texcoord'  :   { 'type' : 'vec2' }
+                    },
+                    // parameters
+                    'params' : 
+                    {
+                        'u_color1' :        { 'type' : 'vec4' },                                    
+                        'u_color2' :        { 'type' : 'vec4' },                                    
+                        'u_color3' :        { 'type' : 'vec4' },                                    
+                        'u_color4' :        { 'type' : 'vec4' },
+                        'u_colorStop1':     { 'type' : 'float' },                                   
+                        'u_colorStop2':     { 'type' : 'float' },                                   
+                        'u_colorStop3':     { 'type' : 'float' },                                   
+                        'u_colorStop4':     { 'type' : 'float' },                                   
+                        'u_cos_sin_angle':  { 'type' : 'vec2' },
+                        'u_texTransform':   { 'type' : 'mat3' }
+                        //'u_colorCount':       {'type' : 'int' }
+
+                    },
+
+                    // render states
+                    'states' : 
+                    {
+                        'depthEnable' : true,
+                        'offset':[1.0, 0.1]
+                    }
+                },
+                {   // light pass
+                    'vshader' : 'dirLightVShader',
+                    'fshader' : 'dirLightFShader',
+                    // attributes
+                    'attributes' :
+                    {
+                        'a_pos' :   { 'type' : 'vec3' },
+                        'a_nrm' :   { 'type' : 'vec3' }
+                    },
+                    // parameters
+                    'params' : 
+                    {
+                    },
+
+                    // render states
+                    'states' : 
+                    {
+                        'depthEnable' : true,
+                        "blendEnable" : true,
+                        "srcBlend" : "SRC_ALPHA",
+                        "dstBlend" : "DST_ALPHA"
+                    }
+                }
+            ]
+        }
 };
 
 LinearGradientMaterial.prototype = new Material();
-- 
cgit v1.2.3


From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001
From: Kris Kowal
Date: Fri, 6 Jul 2012 11:53:10 -0700
Subject: Remove trailing spaces

---
 js/lib/rdge/materials/linear-gradient-material.js | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'js/lib/rdge/materials/linear-gradient-material.js')

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index d216a2c0..da6d205c 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -107,15 +107,15 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
- 
+
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var linearGradientMaterialDef =
-{'shaders': 
+{'shaders':
     {
             // shader file
             'defaultVShader':"assets/shaders/linearGradient.vert.glsl",
             'defaultFShader':"assets/shaders/linearGradient.frag.glsl",
-                        
+
             // this shader is inline
             'dirLightVShader': "\
                 uniform mat4 u_mvMatrix;\
@@ -130,7 +130,7 @@ var linearGradientMaterialDef =
                     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': "\
                 precision highp float;\
                 uniform vec4 u_light1Diff;\
@@ -150,7 +150,7 @@ var linearGradientMaterialDef =
                 }"
         },
         'techniques':
-        { 
+        {
             'default':
             [
                 {
@@ -164,16 +164,16 @@ var linearGradientMaterialDef =
                         'texcoord'  :   { 'type' : 'vec2' }
                     },
                     // parameters
-                    'params' : 
+                    'params' :
                     {
-                        'u_color1' :        { 'type' : 'vec4' },                                    
-                        'u_color2' :        { 'type' : 'vec4' },                                    
-                        'u_color3' :        { 'type' : 'vec4' },                                    
+                        'u_color1' :        { 'type' : 'vec4' },
+                        'u_color2' :        { 'type' : 'vec4' },
+                        'u_color3' :        { 'type' : 'vec4' },
                         'u_color4' :        { 'type' : 'vec4' },
-                        'u_colorStop1':     { 'type' : 'float' },                                   
-                        'u_colorStop2':     { 'type' : 'float' },                                   
-                        'u_colorStop3':     { 'type' : 'float' },                                   
-                        'u_colorStop4':     { 'type' : 'float' },                                   
+                        'u_colorStop1':     { 'type' : 'float' },
+                        'u_colorStop2':     { 'type' : 'float' },
+                        'u_colorStop3':     { 'type' : 'float' },
+                        'u_colorStop4':     { 'type' : 'float' },
                         'u_cos_sin_angle':  { 'type' : 'vec2' },
                         'u_texTransform':   { 'type' : 'mat3' }
                         //'u_colorCount':       {'type' : 'int' }
@@ -181,7 +181,7 @@ var linearGradientMaterialDef =
                     },
 
                     // render states
-                    'states' : 
+                    'states' :
                     {
                         'depthEnable' : true,
                         'offset':[1.0, 0.1]
@@ -197,12 +197,12 @@ var linearGradientMaterialDef =
                         'a_nrm' :   { 'type' : 'vec3' }
                     },
                     // parameters
-                    'params' : 
+                    'params' :
                     {
                     },
 
                     // render states
-                    'states' : 
+                    'states' :
                     {
                         'depthEnable' : true,
                         "blendEnable" : true,
-- 
cgit v1.2.3


From ac27d538af33ca8d67d3d88729f49c05793afda7 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 9 Jul 2012 11:43:36 -0700
Subject: PI, drawing and editing fixes for shapes and materials.

IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color.

IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material.

IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat.

IKNINJA-1886 - Gradient edits not applied to WebGL Stage object.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/rdge/materials/linear-gradient-material.js | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'js/lib/rdge/materials/linear-gradient-material.js')

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 7e53db84..d26143de 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -79,6 +79,56 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         this.setShaderValues();
 		this.update( 0 );
     };
+
+    // 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);
+        }
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3