6 files changed, 84 insertions, 13 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 425b869a..b60ad58f 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -311,6 +311,7 @@ exports.Circle = Object.create(GeomObj, {
 
             if (fillPrim) {
                 fillMaterial = this.makeFillMaterial();
+                        fillMaterial.fitToPrimitive( fillPrim );
 
                 this._primArray.push( fillPrim );
                 this._materialNodeArray.push( fillMaterial.getMaterialNode() );
@@ -318,6 +319,7 @@ exports.Circle = Object.create(GeomObj, {
 
             if (strokePrim0) {
                 strokeMaterial0 = this.makeStrokeMaterial();
+                        strokeMaterial0.fitToPrimitive( strokePrim0 );
 
                 this._primArray.push( strokePrim0 );
                 this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
@@ -325,6 +327,7 @@ exports.Circle = Object.create(GeomObj, {
 
             if (strokePrim1) {
                 strokeMaterial2 = this.makeStrokeMaterial();
+                        strokeMaterial2.fitToPrimitive( strokePrim1 );
 
                 this._primArray.push( strokePrim1 );
                 this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index d75abb05..cf0e7fc8 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -56,8 +56,6 @@ exports.Rectangle = Object.create(GeomObj, {
                 this._strokeStyle = strokeStyle;
 
                         this._matrix = Matrix.I(4);
-                        //this._matrix[12] = xoffset;
-                        //this._matrix[13] = yoffset;
             }
 
             // the overall radius includes the fill and the stroke.  separate the two based on the stroke width
@@ -124,7 +122,6 @@ exports.Rectangle = Object.create(GeomObj, {
             this._fillMaterial = m;
         }
     },
-
         ///////////////////////////////////////////////////////////////////////
     // update the "color of the material
     getFillColor: {
@@ -138,7 +135,6 @@ exports.Rectangle = Object.create(GeomObj, {
 //            this._fillColor = c;
 //        }
 //    },
-
     getStrokeColor: {
         value: function() {
             return this._strokeColor;
@@ -379,6 +375,7 @@ exports.Rectangle = Object.create(GeomObj, {
             // stroke
             var strokeMaterial = this.makeStrokeMaterial();
             var strokePrim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial);
+                strokeMaterial.fitToPrimitive( strokePrim );
             this._primArray.push( strokePrim );
             this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
 
@@ -392,6 +389,7 @@ exports.Rectangle = Object.create(GeomObj, {
             var fillMaterial = this.makeFillMaterial();
             //console.log( "fillMaterial: " + fillMaterial.getName() );
             var fillPrim = this.createFill([x,y],  2*xFill,  2*yFill,  tlRadius, blRadius, brRadius, trRadius, fillMaterial);
+                fillMaterial.fitToPrimitive( fillPrim );
             this._primArray.push( fillPrim );
             this._materialNodeArray.push( fillMaterial.getMaterialNode() );
 
diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js
index 97873d32..9864a8e9 100644
--- a/js/lib/geom/shape-primitive.js
+++ b/js/lib/geom/shape-primitive.js
@@ -49,6 +49,33 @@ ShapePrimitive.create = function(coords,  normals,  uvs,  indices, primType, ver
         return prim;
 };
 
+ShapePrimitive.getBounds = function( prim )
+{
+        var verts = prim.bufferStreams[0];
+        var nVerts = verts.length;
+        var xMin = verts[0],  xMax = verts[0],
+                yMin = verts[1],  yMax = verts[1],
+                zMin = verts[2],  zMax = verts[2];
+
+        for (var index=3;  index<verts.length;  )
+        {
+                if (verts[index] < xMin)  xMin = verts[index];
+                else if (verts[index] > xMax)  xMax = verts[index];
+
+                index++;
+                if (verts[index] < yMin)  yMin = verts[index];
+                else if (verts[index] > yMax)  yMax = verts[index];
+
+                index++;
+                if (verts[index] < zMin)  zMin = verts[index];
+                else if (verts[index] > zMax)  zMax = verts[index];
+
+                index++;
+        }
+
+        return [xMin, yMin, zMin,  xMax, yMax, zMax];
+};
+
 if (typeof exports === "object") {
     exports.ShapePrimitive = ShapePrimitive;
 }
\ No newline at end of file
diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 51a7430c..79f323db 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -6,6 +6,7 @@
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
+var ShapePrimitive = require("js/lib/geom/shape-primitive").ShapePrimitive;
 
 var LinearGradientMaterial = function LinearGradientMaterial() {
     ///////////////////////////////////////////////////////////////////////
@@ -132,12 +133,6 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-    //  this.getColorCount      = function()    {  return this._colorCount;             };
-    //  this.setColorCount      = function(c)   {  this._colorCount = c;
-    //                                                                                          if (this._shader && this._shader['default'])
-    //                                                                                                  this._shader['default'].u_colorCount.set([c]);
-    //                                                                          };
-
     this.getAngle = function () {
         return this._angle;
     };
@@ -245,7 +240,9 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
             this._shader['default'].u_colorStop4.set([s]);
 
             this.setAngle(this.getAngle());
-        }
+ 
+                        this._shader['default'].u_texTransform.set( [1,0,0,  0,1,0,  0,0,1] );  
+       }
     };
 
     this.exportJSON = function () {
@@ -367,7 +364,8 @@ var linearGradientMaterialDef =
                                                 'u_colorStop2':         { 'type' : 'float' },                                                                   
                                                 'u_colorStop3':         { 'type' : 'float' },                                                                   
                                                 'u_colorStop4':         { 'type' : 'float' },                                                                   
-                                                'u_cos_sin_angle' : { 'type' : 'vec2' }
+                                                'u_cos_sin_angle':  { 'type' : 'vec2' },
+                                                'u_texTransform':   { 'type' : 'mat3' }
                                                 //'u_colorCount':               {'type' : 'int' }
 
                                         },
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 276c7687..b96768b3 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -228,6 +228,10 @@ var Material = function GLMaterial( world ) {
                 // animated materials should implement the update method
         };
 
+        this.fitToPrimitive = function( prim )  {
+                // some materials need to preserve an aspect ratio - or someting else.
+        };
+
         this.registerTexture = function( texture ) {
                 // the world needs to know about the texture map
                 var world = this.getWorld();
diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index dd40d31d..a671ee42 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -6,6 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
+var ShapePrimitive = require("js/lib/geom/shape-primitive").ShapePrimitive;
 
 var RadialGradientMaterial = function RadialGradientMaterial() {
     ///////////////////////////////////////////////////////////////////////
@@ -24,6 +25,9 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     this._colorStop4 = 1.0;
     //  this._colorCount        = 4;