From 01783536d2245b474eb1f89df673bfabb006cbdd Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 29 Jun 2012 11:49:51 -0700
Subject: Need to special case linear gradient, radial gradient and uber
 materials when applying fill and stroke colors.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/controllers/elements/shapes-controller.js | 75 +++++++++++++++++++++-------
 js/lib/rdge/materials/uber-material.js       | 12 +++++
 2 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 5920d51a..c3099459 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -139,7 +139,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     break;
                 case "strokeMaterial":
                     // skip shape types that don't support WebGL
-                    if(!el.elementModel.shapeModel.GLGeomObj.useWebGl) {
+                    if(!el.elementModel.shapeModel.useWebGl) {
                         return;
                     }
                     m = Object.create(MaterialsModel.getMaterial(value));
@@ -157,7 +157,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     break;
                 case "fillMaterial":
                     // skip shape types that don't support WebGL or fill color
-                    if(!el.elementModel.shapeModel.GLGeomObj.canFill || !el.elementModel.shapeModel.GLGeomObj.useWebGl) {
+                    if(!el.elementModel.shapeModel.GLGeomObj.canFill || !el.elementModel.shapeModel.useWebGl) {
                         return;
                     }
                     m = Object.create(MaterialsModel.getMaterial(value));
@@ -453,17 +453,17 @@ exports.ShapesController = Montage.create(CanvasController, {
 
             if(gradientM)
             {
-            if(isFill)
-            {
+                if(isFill)
+                {
                     el.elementModel.shapeModel.GLGeomObj.setFillMaterial(gradientM);
                 }
                 else
                 {
                     el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(gradientM);
                 }
-                        el.elementModel.shapeModel.GLGeomObj.buildBuffers();
-                    }
-                }
+                el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+            }
+        }
     },
 
     _setFlatMaterial: {
@@ -480,10 +480,13 @@ exports.ShapesController = Montage.create(CanvasController, {
             }
 
             if(!m || ((m.getName() === "Linear Gradient") || m.getName() === "Radial Gradient") )
-                {
+            {
+                // Uber Material also supports solid colors, so don't change from Uber to Flat Material
+                if(m && (m.getName() === "Uber")) { return; }
+
                 flatM = Object.create(MaterialsModel.getMaterial("Flat"));
                 if(flatM)
-                    {
+                {
                     if(isFill)
                     {
                         el.elementModel.shapeModel.GLGeomObj.setFillMaterial(flatM);
@@ -492,10 +495,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                     {
                         el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(flatM);
                     }
-                        el.elementModel.shapeModel.GLGeomObj.buildBuffers();
-                    }
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                 }
             }
+        }
     },
 
     setColor: {
@@ -605,14 +608,31 @@ exports.ShapesController = Montage.create(CanvasController, {
 
     setStroke: {
         value: function(el, stroke, eventType, source) {
-            if(stroke.colorInfo) {
-                this.setColor(el, stroke.colorInfo, false);
-            }
             if(stroke.shapeInfo) {
                 this.setProperty(el, "strokeSize", stroke.shapeInfo.strokeSize + " " + stroke.shapeInfo.strokeUnits, eventType, source);
             }
+            var m;
             if(stroke.webGLInfo) {
-                this.setProperty(el, "strokeMaterial", stroke.webGLInfo.material);
+                m = stroke.webGLInfo.material;
+                this.setProperty(el, "strokeMaterial", m);
+                if((m === "Linear Gradient") || (m === "Radial Gradient")) {
+                    // Just use the default gradient material values
+                    return;
+                }
+            }
+            if(stroke.colorInfo) {
+                if(el.elementModel.shapeModel.useWebGl) {
+                    m = el.elementModel.shapeModel.GLGeomObj.getStrokeMaterial().getName();
+                    if( ((stroke.colorInfo.mode === "gradient") && (m !== "Linear Gradient") && (m !== "Radial Gradient")) ||
+                        ((stroke.colorInfo.mode !== "gradient") && ((m === "Linear Gradient") || (m === "Radial Gradient"))))
+                    {
+                        return;
+                    } else {
+                        this.setColor(el, stroke.colorInfo, false);
+                    }
+                } else {
+                    this.setColor(el, stroke.colorInfo, false);
+                }
             }
         }
     },
@@ -646,11 +666,28 @@ exports.ShapesController = Montage.create(CanvasController, {
 
     setFill: {
         value: function(el, fill) {
-            if(fill.colorInfo) {
-                this.setColor(el, fill.colorInfo, true);
-            }
+            var m;
             if(fill.webGLInfo) {
-                this.setProperty(el, "fillMaterial", fill.webGLInfo.material);
+                m = fill.webGLInfo.material;
+                this.setProperty(el, "fillMaterial", m);
+                if((m === "Linear Gradient") || (m === "Radial Gradient")) {
+                    // Just use the default gradient material values
+                    return;
+                }
+            }
+            if(fill.colorInfo) {
+                if(el.elementModel.shapeModel.useWebGl) {
+                    m = el.elementModel.shapeModel.GLGeomObj.getFillMaterial().getName();
+                    if( ((fill.colorInfo.mode === "gradient") && (m !== "Linear Gradient") && (m !== "Radial Gradient")) ||
+                        ((fill.colorInfo.mode !== "gradient") && ((m === "Linear Gradient") || (m === "Radial Gradient"))))
+                    {
+                        return;
+                    } else {
+                        this.setColor(el, fill.colorInfo, true);
+                    }
+                } else {
+                    this.setColor(el, fill.colorInfo, true);
+                }
             }
         }
     },
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 347e45d3..e1c6781d 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -99,6 +99,18 @@ var UberMaterial = function UberMaterial() {
             }
         }
     };
+
+    this.hasProperty = function( prop )
+    {
+        if(prop === "color") return true;
+
+        var propNames = [],  dummy = [];
+        this.getAllProperties( propNames, dummy, dummy, dummy )
+        for (var i=0;  i<propNames.length;  i++)
+        {
+            if (prop === propNames[i])  return true;
+        }
+    };
     ///////////////////////////////////////////////////////////////////////
 
     // define the 4 lights
-- 
cgit v1.2.3