Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 62 insertions, 8 deletions

diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index dd40d31d..b0b63cee 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,8 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     this._colorStop4 = 1.0;
     //  this._colorCount        = 4;
 
+        this._textureTransform = [1,0,0, 0,1,0, 0,0,1];
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -143,9 +146,9 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this._propNames = ["color1", "color2", "color3", "color4", "colorStop1", "colorStop2", "colorStop3", "colorStop4", "angle"];
-    this._propLabels = ["Color 1", "Color 2", "Color 3", "Color 4", "Color Stop 1", "Color Stop 2", "Color Stop 3", "Color Stop 4", "Angle"];
-    this._propTypes = ["color", "color", "color", "color", "float", "float", "float", "float", "float"];
+    this._propNames = ["color1", "color2", "color3", "color4", "colorStop1", "colorStop2", "colorStop3", "colorStop4" ];
+    this._propLabels = ["Color 1", "Color 2", "Color 3", "Color 4", "Color Stop 1", "Color Stop 2", "Color Stop 3", "Color Stop 4" ];
+    this._propTypes = ["color", "color", "color", "color", "float", "float", "float", "float" ];
     this._propValues = [];
 
     this._propValues[this._propNames[0]] = this._color1.slice(0);
@@ -188,9 +191,21 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function () {
-        return new RadialGradientMaterial();
-    };
+        this.dup = function () {
+                // allocate a new material
+                var newMat = new RadialGradientMaterial();
+
+                // copy over the current values;
+                var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
+                this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
+                var n = propNames.length;
+                for (var i=0;  i<n;  i++) {
+                        newMat.setProperty( propNames[i], propValues[i] );
+                }
+                newMat._textureTransform = this._textureTransform.slice();
+
+                return newMat;
+        };
 
     this.init = function (world) {
         this.setWorld(world);
@@ -231,9 +246,45 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
             this._shader['default'].u_colorStop3.set([s]);
             s = this.getColorStop4();
             this._shader['default'].u_colorStop4.set([s]);
+
+                        this._shader['default'].u_texTransform.set( this._textureTransform );
         }
     };
 
+        this.fitToPrimitive = function( prim )
+        {
+                var bounds = ShapePrimitive.getBounds( prim );
+                if (bounds)
+                {
+                        var dx = Math.abs( bounds[3] - bounds[0] ),
+                                dy = Math.abs( bounds[4] - bounds[1] );
+                        if (dy == 0)  dy = 1.0;
+                        if (dx == 0)  dx = 1.0;
+                        var xScale = 2.0, yScale = 2.0;
+                        if (dx > dy)
+                                yScale *= dy/dx;
+                        else
+                                xScale *= dx/dy;
+
+                        // build the matrix - the translation to the origin, the scale,
+                        // and the translation back to the center (hard coded at (0.5, 0.5) for now).
+                        // the matrix is build directly instead of with matrix multiplications
+                        // for efficiency, not to mention that the multiplication function does
+                        // not exist for mat3's.
+                        // the matrix as laid out below looks transposed - order is columnwise.
+                        var xCtr = 0.5,  yCtr = 0.5;
+                        this._textureTransform = [
+                                                                                                         xScale,                0.0,  0.0,
+                                                                                                                0.0,             yScale,  0.0,
+                                                                                        xCtr*(1-xScale),  yCtr*(1 - yScale),  1.0
+                                                                        ];
+                        
+                        if (this._shader && this._shader['default'])
+                                this._shader['default'].u_texTransform.set( this._textureTransform );   
+
+                }
+        };
+
     this.exportJSON = function () {
         var jObj =
                 {
@@ -247,7 +298,8 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
                     'colorStop1': this.getColorStop1(),
                     'colorStop2': this.getColorStop2(),
                     'colorStop3': this.getColorStop3(),
-                    'colorStop4': this.getColorStop4()
+                    'colorStop4': this.getColorStop4(),
+                        'textureTransform': this._textureTransform
                 };
 
         return jObj;
@@ -266,6 +318,7 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
                                 colorStop2 = jObj.colorStop2,
                                 colorStop3 = jObj.colorStop3,
                                 colorStop4 = jObj.colorStop4;
+                        this._textureTransform = jObj.textureTransform;
 
             this.setProperty("color1", color1);
             this.setProperty("color2", color2);
@@ -316,7 +369,8 @@ var radialGradientMaterialDef =
                                     'u_colorStop1': { 'type': 'float' },
                                     'u_colorStop2': { 'type': 'float' },
                                     'u_colorStop3': { 'type': 'float' },
-                                    'u_colorStop4': { 'type': 'float' }
+                                    'u_colorStop4': { 'type': 'float' },
+                                        'u_texTransform': { 'type' : 'mat3' }
                                     //'u_colorCount':           {'type' : 'int' }
                                 },