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

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 11 insertions, 71 deletions

diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index e839e229..bb198d83 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -33,6 +33,8 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
         this._scaleX = 1.0;
         this._scaleY = 1.0;
 
+    this.canFill = false;
+
         if (arguments.length > 0) {
                 this._width = width;
                 this._height = height;
@@ -44,7 +46,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 
                 this._slope = slope;
                 this._strokeWidth = strokeSize;
-                if (strokeColor)  this._strokeColor = strokeColor.slice();
+                this._strokeColor = strokeColor;
 
                 this._strokeStyle = strokeStyle;
                 this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
@@ -137,77 +139,15 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
                 this._strokeStyle               = jObj.strokeStyle;
                 this._strokeColor               = jObj.strokeColor;
                 var strokeMaterialName  = jObj.strokeMat;
-                this.importMaterialsJSON( jObj.materials );
-        };
 
-        this.export = function() {
-                var rtnStr = "type: " + this.geomType() + "\n";
-
-                rtnStr += "xoff: "                      + this._xOffset         + "\n";
-                rtnStr += "yoff: "                      + this._yOffset         + "\n";
-                rtnStr += "width: "                     + this._width           + "\n";
-                rtnStr += "height: "            + this._height          + "\n";
-                rtnStr += "xAdj: "                  + this._xAdj                + "\n";
-                rtnStr += "yAdj: "                  + this._yAdj                + "\n";
-                rtnStr += "strokeWidth: "       + this._strokeWidth     + "\n";
-
-        if(this._strokeColor.gradientMode) {
-            rtnStr += "strokeGradientMode: "    + this._strokeColor.gradientMode        + "\n";
-            rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n";
-        } else {
-            rtnStr += "strokeColor: "   + String(this._strokeColor)  + "\n";
+        var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+        if (!strokeMat) {
+            console.log( "object material not found in library: " + strokeMaterialName );
+            strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
         }
+        this._strokeMaterial = strokeMat;
 
-                rtnStr += "strokeStyle: "       + this._strokeStyle     + "\n";
-                rtnStr += "slope: "             + String(this._slope)   + "\n";
-
-                rtnStr += "strokeMat: ";
-                if (this._strokeMaterial) {
-                        rtnStr += this._strokeMaterial.getName();
-        } else {
-                        rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-
-                rtnStr += "\n";
-                return rtnStr;
-        };
-
-        this.import = function( importStr ) {
-                this._xOffset                   = Number( this.getPropertyFromString( "xoff: ",                 importStr )  );
-                this._yOffset                   = Number( this.getPropertyFromString( "yoff: ",                 importStr )  );
-                this._width                             = Number( this.getPropertyFromString( "width: ",                importStr )  );
-                this._height                    = Number( this.getPropertyFromString( "height: ",               importStr )  );
-                this._xAdj                          = Number( this.getPropertyFromString( "xAdj: ",                     importStr )  );
-                this._yAdj                          = Number( this.getPropertyFromString( "yAdj: ",                     importStr )  );
-                this._strokeWidth               = Number( this.getPropertyFromString( "strokeWidth: ",  importStr )  );
-                var slope                       = this.getPropertyFromString( "slope: ",        importStr );
-
-                if(isNaN(Number(slope))) {
-                        this._slope                 = slope;
-        } else {
-                        this._slope         = Number(slope);
-        }
-
-                var strokeMaterialName  = this.getPropertyFromString( "strokeMat: ",    importStr );
-                this._strokeStyle               = this.getPropertyFromString( "strokeStyle: ",  importStr );
-
-        if(importStr.indexOf("strokeGradientMode: ") < 0)
-        {
-            this._strokeColor           =  eval( "[" + this.getPropertyFromString( "strokeColor: ",     importStr ) + "]" );
-        } else {
-            this._strokeColor = {};
-            this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ",        importStr );
-            this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ",        importStr ));
-        }
-
-                var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
-                if (!strokeMat) {
-                        console.log( "object material not found in library: " + strokeMaterialName );
-                        strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
-                }
-
-                this._strokeMaterial = strokeMat;
-
+                this.importMaterialsJSON( jObj.materials );
         };
 
         ///////////////////////////////////////////////////////////////////////
@@ -220,7 +160,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
                 if (!world._useWebGL)  return;
                 
                 // make sure RDGE has the correct context
-                g_Engine.setContext( world.getCanvas().rdgeid );
+                RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
 
                  // create the gl buffer
                 var gl = world.getGLContext();
@@ -381,7 +321,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
                         indices.push( index );  index++;
                 }
 
-                var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, g_Engine.getContext().renderer.TRIANGLES, indices.length);
+                var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length);
 
                 var strokeMaterial = this.makeStrokeMaterial();