1 files changed, 223 insertions, 112 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 81a8556d..ea12385f 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -1,8 +1,32 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </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 GeomObj = require("js/lib/geom/geom-obj").GeomObj;
 var ShapePrimitive =    require("js/lib/geom/shape-primitive").ShapePrimitive;
@@ -77,15 +101,28 @@ exports.Rectangle = Object.create(GeomObj, {
             } else {
                 this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
             }
-                        if (strokeColor && this._strokeMaterial.hasProperty( "color" ))  this._strokeMaterial.setProperty( "color",  this._strokeColor );
 
+            if(strokeColor) {
+                if(this._strokeMaterial.hasProperty("color")) {
+                    this._strokeMaterial.setProperty( "color",  this._strokeColor );
+                } else if (this._strokeMaterial && (this._strokeMaterial.gradientType === this._strokeColor.gradientMode)) {
+                    this._strokeMaterial.setGradientData(this._strokeColor.color);
+                }
+            }
 
             if(fillMaterial) {
                 this._fillMaterial = fillMaterial.dup();
             } else {
                 this._fillMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
             }
-                        if (fillColor && this._fillMaterial.hasProperty( "color" ))  this._fillMaterial.setProperty( "color",  this._fillColor );
+
+                        if(fillColor) {
+                if(this._fillMaterial.hasProperty("color")) {
+                    this._fillMaterial.setProperty( "color",  this._fillColor );
+                } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) {
+                    this._fillMaterial.setGradientData(this._fillColor.color);
+                }
+            }
         }
     },
 
@@ -314,98 +351,105 @@ exports.Rectangle = Object.create(GeomObj, {
         }
     },
 
-    buildBuffers: {
-        value: function() {
-            // get the world
-            var world = this.getWorld();
-            if (!world)  throw( "null world in buildBuffers" );
-            //console.log( "GLRectangle.buildBuffers " + world._worldCount );
-            if (!world._useWebGL)  return;
-
-            // make sure RDGE has the correct context
-            RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
-
-            // create the gl buffer
-            var gl = world.getGLContext();
-
-            var tlRadius = this._tlRadius; //top-left radius
-            var trRadius = this._trRadius;
-            var blRadius = this._blRadius;
-            var brRadius = this._brRadius;
-
-            // declare the arrays to hold the parts
-            this._primArray = [];
-            this._materialArray = [];
-            this._materialTypeArray = [];
-            this._materialNodeArray = [];
-
-            // get the normalized device coordinates (NDC) for
-            // all position and dimensions.
-            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-            var xNDC = 2*this._xOffset/vpw,  yNDC = 2*this._yOffset/vph,
-                xFillNDC = this._width/vpw,  yFillNDC = this._height/vph,
-                strokeSizeNDC = 2*this._strokeWidth/vpw,
-                tlRadiusNDC = 2*tlRadius/vpw,  yTLRadiusNDC = 2*tlRadius/vph,
-                trRadiusNDC = 2*trRadius/vpw,  yTRRadiusNDC = 2*trRadius/vph,
-                blRadiusNDC = 2*blRadius/vpw,  yBLRadiusNDC = 2*blRadius/vph,
-                brRadiusNDC = 2*brRadius/vpw,  yBRRadiusNDC = 2*brRadius/vph;
-
-            var aspect = world.getAspect();
-            var zn = world.getZNear(),  zf = world.getZFar();
-            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
-                b = -t,
-                r = aspect*t,
-                l = -r;
+        buildBuffers: {
+                value: function() {
+                        // get the world
+                        var world = this.getWorld();
+                        if (!world)  throw( "null world in buildBuffers" );
+                        //console.log( "GLRectangle.buildBuffers " + world._worldCount );
+                        if (!world._useWebGL)  return;
+
+                        // make sure RDGE has the correct context
+                        RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
+
+                        // create the gl buffer
+                        var gl = world.getGLContext();
+
+                        var tlRadius = this._tlRadius; //top-left radius
+                        var trRadius = this._trRadius;
+                        var blRadius = this._blRadius;
+                        var brRadius = this._brRadius;
+
+                        // declare the arrays to hold the parts
+                        this._primArray = [];
+                        this._materialArray = [];
+                        this._materialTypeArray = [];
+                        this._materialNodeArray = [];
+
+                        // get the normalized device coordinates (NDC) for
+                        // all position and dimensions.
+                        var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
+                        var xNDC = 2*this._xOffset/vpw,  yNDC = 2*this._yOffset/vph,
+                                xFillNDC = this._width/vpw,  yFillNDC = this._height/vph,
+                                strokeSizeNDC = 2*this._strokeWidth/vpw,
+                                tlRadiusNDC = 2*tlRadius/vpw,  yTLRadiusNDC = 2*tlRadius/vph,
+                                trRadiusNDC = 2*trRadius/vpw,  yTRRadiusNDC = 2*trRadius/vph,
+                                blRadiusNDC = 2*blRadius/vpw,  yBLRadiusNDC = 2*blRadius/vph,
+                                brRadiusNDC = 2*brRadius/vpw,  yBRRadiusNDC = 2*brRadius/vph;
+
+                        var aspect = world.getAspect();
+                        var zn = world.getZNear(),  zf = world.getZFar();
+                        var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
+                                b = -t,
+                                r = aspect*t,
+                                l = -r;
+
+                        // calculate the object coordinates from their NDC coordinates
+                        var z = -world.getViewDistance();
+
+                        // get the position of the origin
+                        var x = -z*(r-l)/(2.0*zn)*xNDC,
+                                y = -z*(t-b)/(2.0*zn)*yNDC;
+
+                        // get the x and y fill
+                        var xFill = -z*(r-l)/(2.0*zn)*xFillNDC,
+                                yFill = -z*(t-b)/(2.0*zn)*yFillNDC;
+
+                        // keep some variables giving the overall dimensions of the
+                        // rectangle. These values are used to calculate consistent
+                        // texture map coordinates across all pieces.
+                        this._rectWidth = xFill;  this._rectHeight = yFill;
+
+                        // get the stroke size
+                        var strokeSize = -z*(r-l)/(2.0*zn)*strokeSizeNDC;
+
+                        // get the absolute corner radii
+                        tlRadius = -z*(r-l)/(2.0*zn)*tlRadiusNDC,
+                        trRadius = -z*(r-l)/(2.0*zn)*trRadiusNDC,
+                        blRadius = -z*(r-l)/(2.0*zn)*blRadiusNDC,
+                        brRadius = -z*(r-l)/(2.0*zn)*brRadiusNDC;
+
+                        // stroke
+                        var i;
+                        var strokeMaterial = this.makeStrokeMaterial();
+                        var strokePrimArray = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial);
+                        strokeMaterial.fitToPrimitiveArray( strokePrimArray );
+                        for (i=0;  i<strokePrimArray.length;  i++)
+                        {
+                                this._primArray.push( strokePrimArray[i] );
+                                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
+                        }
 
-            // calculate the object coordinates from their NDC coordinates
-            var z = -world.getViewDistance();
+                        // fill
+                        tlRadius -= strokeSize;  if (tlRadius < 0)  tlRadius = 0.0;
+                        blRadius -= strokeSize;  if (blRadius < 0)  blRadius = 0.0;
+                        brRadius -= strokeSize;  if (brRadius < 0)  brRadius = 0.0;
+                        trRadius -= strokeSize;  if (trRadius < 0)  trRadius = 0.0;
+                        xFill -= strokeSize;
+                        yFill -= strokeSize;
+                        var fillMaterial = this.makeFillMaterial();
+                        //console.log( "fillMaterial: " + fillMaterial.getName() );
+                        var fillPrimArray = this.createFill([x,y],  2*xFill,  2*yFill,  tlRadius, blRadius, brRadius, trRadius, fillMaterial);
+                        fillMaterial.fitToPrimitiveArray( fillPrimArray );
+                        for (i=0;  i<fillPrimArray.length;  i++)
+                        {
+                                this._primArray.push( fillPrimArray[i] );
+                                this._materialNodeArray.push( fillMaterial.getMaterialNode() );
+                        }
 
-            // get the position of the origin
-            var x = -z*(r-l)/(2.0*zn)*xNDC,
-                y = -z*(t-b)/(2.0*zn)*yNDC;
-
-            // get the x and y fill
-            var xFill = -z*(r-l)/(2.0*zn)*xFillNDC,
-                yFill = -z*(t-b)/(2.0*zn)*yFillNDC;
-
-            // keep some variables giving the overall dimensions of the
-            // rectangle. These values are used to calculate consistent
-            // texture map coordinates across all pieces.
-            this._rectWidth = xFill;  this._rectHeight = yFill;
-
-            // get the stroke size
-            var strokeSize = -z*(r-l)/(2.0*zn)*strokeSizeNDC;
-
-            // get the absolute corner radii
-            tlRadius = -z*(r-l)/(2.0*zn)*tlRadiusNDC,
-            trRadius = -z*(r-l)/(2.0*zn)*trRadiusNDC,
-            blRadius = -z*(r-l)/(2.0*zn)*blRadiusNDC,
-            brRadius = -z*(r-l)/(2.0*zn)*brRadiusNDC;
-
+                        world.updateObject(this);
+                }
+        },