Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 84 insertions, 39 deletions

diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index a44026eb..26631a31 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -45,7 +45,7 @@ exports.Line = Object.create(GeomObj, {
     _xOffset: { value : 0, writable: true },
     _yOffset: { value : 0, writable: true },
 
-        // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
+    // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
     _xAdj: { value : 0, writable: true },
     _yAdj: { value : 0, writable: true },
 
@@ -87,13 +87,22 @@ exports.Line = Object.create(GeomObj, {
             this._materialSpecular = [0.4, 0.4, 0.4,  1.0];
 
             if(strokeMaterial) {
-                this._strokeMaterial = strokeMaterial;
-                                if (strokeColor && this._strokeMaterial.hasProperty( "color" ))  this._strokeMaterial.setProperty( "color",  this._strokeColor );
+                this._strokeMaterial = strokeMaterial.dup();
+            } else {
+                this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
+            }
+
+            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);
+        }
             }
         }
     },
 
-        ////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
     // TODO - Use getters/setters in the future
@@ -217,26 +226,26 @@ exports.Line = Object.create(GeomObj, {
         }
     },
 
-        ///////////////////////////////////////////////////////////////////////
-        // Methods
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
     exportJSON: {
         value: function() {
             var jObj =
             {
-                'type'                  : this.geomType(),
-                'xoff'                  : this._xOffset,
-                'yoff'                  : this._yOffset,
-                'width'                 : this._width,
-                'height'                : this._height,
-                'xAdj'              : this._xAdj,
-                'yAdj'              : this._yAdj,
-                'slope'         : this._slope,
-                'strokeWidth'   : this._strokeWidth,
-                'strokeColor'   : this._strokeColor,
-                'strokeStyle'   : this._strokeStyle,
-                'strokeMat'             : this._strokeMaterial ? this._strokeMaterial.getName() : MaterialsModel.getDefaultMaterialName(),
-                'materials'             : this.exportMaterialsJSON()
+                'type'          : this.geomType(),
+                'xoff'          : this._xOffset,
+                'yoff'          : this._yOffset,
+                'width'         : this._width,
+                'height'        : this._height,
+                'xAdj'          : this._xAdj,
+                'yAdj'          : this._yAdj,
+                'slope'         : this._slope,
+                'strokeWidth'   : this._strokeWidth,
+                'strokeColor'   : this._strokeColor,
+                'strokeStyle'   : this._strokeStyle,
+                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() : MaterialsModel.getDefaultMaterialName(),
+                'materials'     : this.exportMaterialsJSON()
             };
 
             return jObj;
@@ -245,17 +254,17 @@ exports.Line = Object.create(GeomObj, {
 
     importJSON: {
         value: function(jObj) {
-            this._xOffset                       = jObj.xoff;
-            this._yOffset                       = jObj.yoff;
-            this._width                         = jObj.width;
-            this._height                        = jObj.height;
-            this._xAdj                      = jObj.xAdj;
-            this._yAdj                      = jObj.yAdj;
-            this._strokeWidth           = jObj.strokeWidth;
-            this._slope                     = jObj.slope;
-            this._strokeStyle           = jObj.strokeStyle;
-            this._strokeColor           = jObj.strokeColor;
-            var strokeMaterialName      = jObj.strokeMat;
+            this._xOffset           = jObj.xoff;
+            this._yOffset           = jObj.yoff;
+            this._width             = jObj.width;
+            this._height            = jObj.height;
+            this._xAdj              = jObj.xAdj;
+            this._yAdj              = jObj.yAdj;
+            this._strokeWidth       = jObj.strokeWidth;
+            this._slope             = jObj.slope;
+            this._strokeStyle       = jObj.strokeStyle;
+            this._strokeColor       = jObj.strokeColor;
+            var strokeMaterialName  = jObj.strokeMat;
 
             var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
             if (!strokeMat) {
@@ -295,15 +304,15 @@ exports.Line = Object.create(GeomObj, {
 
             // 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,
+            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,
                 xAdjNDC = this._xAdj/vpw,  yAdjNDC = this._yAdj/vph,
                 xStrokeNDC = this._strokeWidth/vpw,  yStrokeNDC = this._strokeWidth/vph;
 
             var aspect = world.getAspect();
             var zn = world.getZNear(),  zf = world.getZFar();
-            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
+            var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0),
                 b = -t,
                 r = aspect*t,
                 l = -r;
@@ -437,12 +446,48 @@ exports.Line = Object.create(GeomObj, {
                 indices.push( index );  index++;
             }
 
-            var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length);
-
             var strokeMaterial = this.makeStrokeMaterial();
-
-            this._primArray.push( prim );
+//            var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length);
+//            this._primArray.push( prim );
+//            this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
+
+                        // refine the mesh for vertex deformations
+                        if (strokeMaterial)
+                        {
+                                var primArray;
+                                if (strokeMaterial.hasVertexDeformation())
+                                {
+                                        var paramRange = strokeMaterial.getVertexDeformationRange();
+                                        var tolerance = strokeMaterial.getVertexDeformationTolerance();
+                                        var nVertices = indices.length;
+                                        nVertices = ShapePrimitive.refineMesh( strokeVertices, strokeNormals, strokeTextures, indices, nVertices,  paramRange,  tolerance );
+                                        var subdividedParts = ShapePrimitive.subdivideOversizedMesh( strokeVertices, strokeNormals, strokeTextures, indices );
+
+                                        primArray = [];
+                                        if (subdividedParts)
+                                        {
+                                                for (var i=0;  i<subdividedParts.length;  i++)
+                                                {
+                                                        var obj = subdividedParts[i];
+                                                        primArray.push( ShapePrimitive.create(obj.vertices, obj.normals, obj.uvs, obj.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, obj.vertices.length/3) );
+                                                }
+                                        }
+                                        else
+                                                primArray = [ ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices) ];
+                                }
+                                else
+                                {
+                                        // create the RDGE primitive
+                                        primArray = [ ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length) ];
+                                }
+
+                                var nPrims = primArray.length;
+                                for (var i=0;  i<nPrims;  i++)
+                                {
+                                        this._primArray.push( primArray[i] );
             this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
+                                }
+                        }
 
             world.updateObject(this);
         }
@@ -472,7 +517,7 @@ exports.Line = Object.create(GeomObj, {
                 cs;
 
             ctx.beginPath();
-            ctx.lineWidth       = lineWidth;
+            ctx.lineWidth   = lineWidth;
             if (this._strokeColor) {
                 if(this._strokeColor.gradientMode) {
                     if(this._strokeColor.gradientMode === "radial") {