From 2a8a41711052bb557271c27f82faba8dd13fd880 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 7 Mar 2012 06:12:34 -0800
Subject: preliminary support for setting gradients on webgl shapes.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/geom/geom-obj.js | 65 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 13 deletions(-)

(limited to 'js/lib/geom/geom-obj.js')

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index c5880843..726c3595 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -138,22 +138,61 @@ var GeomObj = function GLGeomObj() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
 	this.setMaterialColor = function(c, type) {
-		if (type == "fill") {
-			this._fillColor = c.slice(0);
+        if(c.gradientMode) {
+            var nMats = 0;
+            if (this._materialArray && this._materialTypeArray) {
+                nMats = this._materialArray.length;
+            }
+
+            var stops = [],
+                colors = c.color;
+
+            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];
+                stops.push(stop);
+
+                if (nMats === this._materialTypeArray.length) {
+                    for (var i=0;  i<nMats;  i++) {
+                        if (this._materialTypeArray[i] == type) {
+                            this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
+                            this._materialArray[i].setProperty( "colorStop"+(n+1), position );
+                        }
+                    }
+                }
+            }
+//            if (type == "fill") {
+//                this._fillColor = c.slice(0);
+//            } else {
+//                this._strokeColor = c.slice(0);
+//            }
         } else {
-			this._strokeColor = c.slice(0);
-        }
+            if (type == "fill") {
+                this._fillColor = c.slice(0);
+            } else {
+                this._strokeColor = c.slice(0);
+            }
 
-		if (this._materialArray && this._materialTypeArray) {
-			var nMats = this._materialArray.length;
-			if (nMats === this._materialTypeArray.length) {
-				for (var i=0;  i<nMats;  i++) {
-					if (this._materialTypeArray[i] == type) {
-						this._materialArray[i].setProperty( "color", c.slice(0) );
+            if (this._materialArray && this._materialTypeArray) {
+                var nMats = this._materialArray.length;
+                if (nMats === this._materialTypeArray.length) {
+                    for (var i=0;  i<nMats;  i++) {
+                        if (this._materialTypeArray[i] == type) {
+                            this._materialArray[i].setProperty( "color", c.slice(0) );
+                        }
                     }
-				}
-			}
-		}
+                }
+            }
+        }
+
+
 
 		var world = this.getWorld();
 		if (world)  {
-- 
cgit v1.2.3


From 443a23289171bb72324e740d8eaa041968a1de99 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 7 Mar 2012 10:30:15 -0800
Subject: Fix for stroke and fill gradients not being retained when drawing
 multiple shapes and switching between them.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/geom/geom-obj.js | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'js/lib/geom/geom-obj.js')

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 726c3595..1ea74475 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -138,8 +138,10 @@ var GeomObj = function GLGeomObj() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
 	this.setMaterialColor = function(c, type) {
+        var i = 0,
+            nMats = 0;
         if(c.gradientMode) {
-            var nMats = 0;
+            // Gradient support
             if (this._materialArray && this._materialTypeArray) {
                 nMats = this._materialArray.length;
             }
@@ -160,7 +162,7 @@ var GeomObj = function GLGeomObj() {
                 stops.push(stop);
 
                 if (nMats === this._materialTypeArray.length) {
-                    for (var i=0;  i<nMats;  i++) {
+                    for (i=0;  i<nMats;  i++) {
                         if (this._materialTypeArray[i] == type) {
                             this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
                             this._materialArray[i].setProperty( "colorStop"+(n+1), position );
@@ -168,22 +170,22 @@ var GeomObj = function GLGeomObj() {
                     }
                 }
             }
-//            if (type == "fill") {
-//                this._fillColor = c.slice(0);
-//            } else {
-//                this._strokeColor = c.slice(0);
-//            }
+            if (type === "fill") {
+                this._fillColor = c;
+            } else {
+                this._strokeColor = c;
+            }
         } else {
-            if (type == "fill") {
+            if (type === "fill") {
                 this._fillColor = c.slice(0);
             } else {
                 this._strokeColor = c.slice(0);
             }
 
             if (this._materialArray && this._materialTypeArray) {
-                var nMats = this._materialArray.length;
+                nMats = this._materialArray.length;
                 if (nMats === this._materialTypeArray.length) {
-                    for (var i=0;  i<nMats;  i++) {
+                    for (i=0;  i<nMats;  i++) {
                         if (this._materialTypeArray[i] == type) {
                             this._materialArray[i].setProperty( "color", c.slice(0) );
                         }
@@ -192,8 +194,6 @@ var GeomObj = function GLGeomObj() {
             }
         }
 
-
-
 		var world = this.getWorld();
 		if (world)  {
             world.restartRenderLoop();
@@ -210,14 +210,15 @@ var GeomObj = function GLGeomObj() {
 
         if (strokeMaterial) {
             strokeMaterial.init( this.getWorld() );
-            if(this._strokeColor) {
-                strokeMaterial.setProperty("color", this._strokeColor);
-            }
         }
 
         this._materialArray.push( strokeMaterial );
         this._materialTypeArray.push( "stroke" );
 
+        if(this._strokeColor) {
+            this.setStrokeColor(this._strokeColor);
+        }
+
         return strokeMaterial;
     };
 
@@ -231,15 +232,15 @@ var GeomObj = function GLGeomObj() {
 
         if (fillMaterial) {
             fillMaterial.init( this.getWorld() );
-            //if(!this.getFillMaterial() && this._fillColor)
-            if (this._fillColor) {
-                fillMaterial.setProperty("color", this._fillColor);
-            }
         }
 
         this._materialArray.push( fillMaterial );
         this._materialTypeArray.push( "fill" );
 
+        if (this._fillColor) {
+            this.setFillColor(this._fillColor);
+        }
+
         return fillMaterial;
     };
 
-- 
cgit v1.2.3


From 2ac9a855724cc4ccf147ce4130a733a84cc647c3 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 12 Mar 2012 16:19:44 -0700
Subject: Support import/export of gradient materials.  This fixes the
 eyedropper not being able to sample gradient colors from WebGL shapes.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/geom/geom-obj.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'js/lib/geom/geom-obj.js')

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 1ea74475..fb1cb246 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -305,6 +305,49 @@ var GeomObj = function GLGeomObj() {
 		return rtnStr;
 	};
 
+    // Gradient stops for rgba(255,0,0,1) at 0%; rgba(0,255,0,1) at 33%; rgba(0,0,255,1) at 100% will return
+    // 255,0,0,1@0;0,255,0,1@33;0,0,255,1@100
+    this.gradientToString = function(colors) {
+        var rtnStr = "";
+        if(colors && colors.length) {
+                var c = colors[0],
+                len = colors.length;
+
+            rtnStr += String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
+            for(var i=1; i<len; i++) {
+                c = colors[i];
+                rtnStr += ";" + String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
+            }
+        }
+        return rtnStr;
+    };
+
+    // Given a gradientStr "255,0,0,1@0;0,255,0,1@33;0,0,255,1@100" will return:
+    // colors array [{position:0, value:{r:255, g:0, b:0, a:1}},
+    //               {position:33, value:{r:0, g:255, b:0, a:1}},
+    //               {position:100, value:{r:0, g:0, b:255, a:1}}
+    //             ]
+    this.stringToGradient = function(gradientStr) {
+        var rtnArr = [];
+
+        var i,
+            len,
+            stops,
+            stop,
+            c;
+
+        stops = gradientStr.split(";");
+        len = stops.length;
+        for(i=0; i<len; i++)
+        {
+            stop = stops[i].split("@");
+            c = stop[0].split(",");
+            rtnArr.push({ position: Number(stop[1]), value:{r:Number(c[0]), g:Number(c[1]), b:Number(c[2]), a:Number(c[3])} });
+        }
+
+        return rtnArr;
+    };
+
     /*
     this.export = function() {
 		var rtnStr;
-- 
cgit v1.2.3