From 5b4f6b1618cf571a6bce5a631f976a008e04a64e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 29 Mar 2012 15:52:08 -0700
Subject: Updated shapes to always check for its stroke and fill colors and
 materials instead of relying on the shapeModel cache because it can get out
 of sync.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/geom/circle.js    | 15 +++++++++
 js/lib/geom/geom-obj.js  | 82 +++++++++++++++++++++++++-----------------------
 js/lib/geom/line.js      |  8 +++++
 js/lib/geom/rectangle.js | 15 +++++++++
 4 files changed, 80 insertions(+), 40 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index d48bf98b..ee3e2abd 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -633,6 +633,21 @@ var Circle = function GLCircle() {
 		this._strokeStyle		= jObj.strokeStyle;
 		var strokeMaterialName	= jObj.strokeMat;
 		var fillMaterialName	= jObj.fillMat;
+
+        var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+        if (!strokeMat) {
+            console.log( "object material not found in library: " + strokeMaterialName );
+            strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._strokeMaterial = strokeMat;
+
+        var fillMat = MaterialsModel.getMaterial( fillMaterialName );
+        if (!fillMat) {
+            console.log( "object material not found in library: " + fillMaterialName );
+            fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._fillMaterial = fillMat;
+
 		this.importMaterialsJSON( jObj.materials );
 	};
 
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 3c4e4bbf..df4a018d 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -141,54 +141,56 @@ var GeomObj = function GLGeomObj() {
 	this.setMaterialColor = function(c, type) {
         var i = 0,
             nMats = 0;
-        if(c.gradientMode) {
-            // Gradient support
-            if (this._materialArray && this._materialTypeArray) {
-                nMats = this._materialArray.length;
-            }
+        if(c) {
+            if(c.gradientMode) {
+                // Gradient support
+                if (this._materialArray && this._materialTypeArray) {
+                    nMats = this._materialArray.length;
+                }
 
-            var stops = [],
-                colors = c.color;
+                var stops = [],
+                    colors = c.color;
 
-            var len = colors.length;
-            // TODO - Current shaders only support 4 color stops
-            if(len > 4) {
-                len = 4;
-            }
+                var len = colors.length;
+                // TODO - Current shaders only support 4 color stops
+                if(len > 4) {
+                    len = 4;
+                }
 
-            for(var n=0; n<len; n++) {
-                var position = colors[n].position/100;
-                var cs = colors[n].value;
-                var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
-                stops.push(stop);
-
-                if (nMats === this._materialTypeArray.length) {
-                    for (i=0;  i<nMats;  i++) {
-                        if (this._materialTypeArray[i] == type) {
-                            this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
-                            this._materialArray[i].setProperty( "colorStop"+(n+1), position );
+                for(var n=0; n<len; n++) {
+                    var position = colors[n].position/100;
+                    var cs = colors[n].value;
+                    var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+                    stops.push(stop);
+
+                    if (nMats === this._materialTypeArray.length) {
+                        for (i=0;  i<nMats;  i++) {
+                            if (this._materialTypeArray[i] == type) {
+                                this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
+                                this._materialArray[i].setProperty( "colorStop"+(n+1), position );
+                            }
                         }
                     }
                 }
-            }
-            if (type === "fill") {
-                this._fillColor = c;
-            } else {
-                this._strokeColor = c;
-            }
-        } else {
-            if (type === "fill") {
-                this._fillColor = c.slice(0);
+                if (type === "fill") {
+                    this._fillColor = c;
+                } else {
+                    this._strokeColor = c;
+                }
             } else {
-                this._strokeColor = c.slice(0);
-            }
+                if (type === "fill") {
+                    this._fillColor = c.slice(0);
+                } else {
+                    this._strokeColor = c.slice(0);
+                }
 
-            if (this._materialArray && this._materialTypeArray) {
-                nMats = this._materialArray.length;
-                if (nMats === this._materialTypeArray.length) {
-                    for (i=0;  i<nMats;  i++) {
-                        if (this._materialTypeArray[i] == type) {
-                            this._materialArray[i].setProperty( "color", c.slice(0) );
+                if (this._materialArray && this._materialTypeArray) {
+                    nMats = this._materialArray.length;
+                    if (nMats === this._materialTypeArray.length) {
+                        for (i=0;  i<nMats;  i++) {
+                            if (this._materialTypeArray[i] == type) {
+                                this._materialArray[i].setProperty( "color", c.slice(0) );
+                            }
                         }
                     }
                 }
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index e839e229..2b2434f5 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -137,6 +137,14 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 		this._strokeStyle		= jObj.strokeStyle;
 		this._strokeColor		= jObj.strokeColor;
 		var strokeMaterialName	= jObj.strokeMat;
+
+        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 );
 	};
 
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index e511d5f4..b01aea53 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -290,6 +290,21 @@ var Rectangle = function GLRectangle() {
 		this._strokeStyle		= jObj.strokeStyle;
 		var strokeMaterialName	= jObj.strokeMat;
 		var fillMaterialName	= jObj.fillMat;
+
+        var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+        if (!strokeMat) {
+            console.log( "object material not found in library: " + strokeMaterialName );
+            strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._strokeMaterial = strokeMat;
+
+        var fillMat = MaterialsModel.getMaterial( fillMaterialName );
+        if (!fillMat) {
+            console.log( "object material not found in library: " + fillMaterialName );
+            fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._fillMaterial = fillMat;
+
 		this.importMaterialsJSON( jObj.materials );
 	};
 
-- 
cgit v1.2.3


From eae317815e15a7ffc2dd1bd1e39b208eaa02fd2b Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 30 Mar 2012 13:53:47 -0700
Subject: Update PI and Color Panel to reflect default LinearGradient and
 RadialGradient materials' colors.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/geom/circle.js | 4 ++--
 js/lib/geom/line.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index ee3e2abd..f74d4e57 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -42,8 +42,8 @@ var Circle = function GLCircle() {
         
 			this._strokeWidth = strokeSize;
 			this._innerRadius = innerRadius;
-			if (strokeColor)  this._strokeColor = strokeColor;
-			if (fillColor)  this._fillColor = fillColor;
+			this._strokeColor = strokeColor;
+			this._fillColor = fillColor;
 
 			this._strokeStyle = strokeStyle;
 		}
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index 2b2434f5..f3806fac 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -44,7 +44,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());
-- 
cgit v1.2.3


From c4e83a61311db75c7a1c307553262e77ecaae662 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 2 Apr 2012 13:16:27 -0700
Subject: IKNinna-1409 - Should dirty document when changing shape properties.
 IKNinja-1391 - Shapes need to support no-color.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/geom/geom-obj.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index ce06498d..44daa291 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -196,6 +196,24 @@ var GeomObj = function GLGeomObj() {
                     }
                 }
             }
+        } else {
+            if (type === "fill") {
+                this._fillColor = null;
+            } else {
+                this._strokeColor = null;
+            }
+
+            if (this._materialArray && this._materialTypeArray) {
+                nMats = this._materialArray.length;
+                if (nMats === this._materialTypeArray.length) {
+                    for (i=0;  i<nMats;  i++) {
+                        if (this._materialTypeArray[i] == type) {
+                            // TODO - Not sure how to set color to null values in shaders
+                            this._materialArray[i].setProperty( "color", [0,0,0,0] );
+                        }
+                    }
+                }
+            }
         }
 
 		var world = this.getWorld();
-- 
cgit v1.2.3


From fb0a659c9ca3479fd6799325498b11f074689936 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Mon, 2 Apr 2012 14:57:31 -0700
Subject: -Namespaced all RDGE javascript.

-Removed the following unused files from the build script
	/core/script/fx/blur.js
	/core/script/fx/ssao.js
	/core/script/animation.js
- Fully removed the following from the build and from source control as they are unused or no longer needed
	/core/script/util/dbgpanel.js
	/core/script/util/fpsTracker.js
	/core/script/util/statTracker.js
	/core/script/input.js
	/core/script/TextureManager.js
	/core/script/ubershader.js
---
 js/lib/geom/circle.js          | 6 +++---
 js/lib/geom/line.js            | 4 ++--
 js/lib/geom/rectangle.js       | 8 ++++----
 js/lib/geom/shape-primitive.js | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index dd82a4cc..52c2d449 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -176,7 +176,7 @@ var Circle = function GLCircle() {
 		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();
@@ -348,7 +348,7 @@ var Circle = function GLCircle() {
 
 		this.recalcTexMapCoords( vrts, uvs );
 
-		return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLES, index);
+		return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, index);
     };
 
     this.generateOvalRing = function(xOff, yOff, rotationMat, innerScaleMat, outerScaleMat, nTriangles) {
@@ -405,7 +405,7 @@ var Circle = function GLCircle() {
 
 		this.recalcTexMapCoords( vrts, uvs );
 
-		return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLE_STRIP, indices.length);
+		return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLE_STRIP, indices.length);
     };
 
     this.render = function() {
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index da63b21c..e8d967f0 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -167,7 +167,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();
@@ -328,7 +328,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();
 
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 81b385b3..98621a98 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -276,7 +276,7 @@ var Rectangle = function GLRectangle() {
 		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();
@@ -826,7 +826,7 @@ RectangleFill.create = function( rectCtr,  width, height, tlRad, blRad,  brRad,
 //	}
 
 	// create the RDGE primitive
-	return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+	return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
 };
 
 RectangleFill.pushVertex = function( x, y, z ) {
@@ -1058,7 +1058,7 @@ RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad,
 //	}
 
 	// create the RDGE primitive
-	return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+	return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
 };
 
 RectangleStroke.getRoundedCorner = function( ctr, insidePt, outsidePt ) {
@@ -1144,7 +1144,7 @@ RectangleGeometry.create = function( ctr,  width, height, material ) {
 //	}
 
 	// create the RDGE primitive
-	return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices);
+	return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices);
 };
 
 RectangleGeometry.pushVertex	= RectangleFill.pushVertex;
diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js
index bf0087b2..97873d32 100644
--- a/js/lib/geom/shape-primitive.js
+++ b/js/lib/geom/shape-primitive.js
@@ -8,11 +8,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var ShapePrimitive = {};
 
 ShapePrimitive.create = function(coords,  normals,  uvs,  indices, primType, vertexCount) {
-	var renderer = g_Engine.getContext().renderer;
+	var renderer = RDGE.globals.engine.getContext().renderer;
 
 	// to setup a primitive you must define it
 	// create a new primitive definition here to then fill out
-	var prim = new rdgePrimitiveDefinition();
+	var prim = new RDGE.rdgePrimitiveDefinition();
 
 	// the vertex definition declares how the data will be delivered to the shader
 	// the position of an element in array determines which attribute in a shader the
-- 
cgit v1.2.3


From dc9650af5760b1f93d6e93a383eabceacfdc0ad8 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 2 Apr 2012 15:40:25 -0700
Subject: Snapping fixes.

---
 js/lib/geom/line.js | 70 -----------------------------------------------------
 1 file changed, 70 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index e839e229..1848218d 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -140,76 +140,6 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 		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";
-        }
-
-		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;
-
-	};
-
 	///////////////////////////////////////////////////////////////////////
 	// Methods
 	///////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 18609d375e7aab9cb48c9b3f5b291f85cbd28683 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 13:39:32 -0700
Subject: removed old unused import and export functions.

---
 js/lib/geom/brush-stroke.js |  12 --
 js/lib/geom/circle.js       |  94 ----------
 js/lib/geom/geom-obj.js     | 442 ++++++++++++++++++--------------------------
 js/lib/geom/line.js         |  70 -------
 js/lib/geom/rectangle.js    | 110 -----------
 5 files changed, 181 insertions(+), 547 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 22209815..26ac42e9 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -711,18 +711,6 @@ var BrushStroke = function GLBrushStroke() {
         this.update();      //after this, the stroke is ready to be rendered
     };
 
-    
-    this.export = function() {
-        var jsonObject = this.exportJSON();
-        var stringified = JSON.stringify(jsonObject);
-        return "type: " + this.geomType() + "\n" + stringified;
-    };
-
-    this.import = function( importStr ) {
-        var jsonObject = JSON.parse(importStr);
-        this.importJSON(jsonObject);
-    }
-
     this.collidesWithPoint = function (x, y, z) {
         if (x < this._BBoxMin[0]) return false;
         if (x > this._BBoxMax[0]) return false;
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index e8c94b64..4bf37474 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -636,100 +636,6 @@ var Circle = function GLCircle() {
 		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 += "strokeWidth: "	+ this._strokeWidth	+ "\n";
-		rtnStr += "innerRadius: "	+ this._innerRadius	+ "\n";
-		rtnStr += "strokeStyle: "	+ this._strokeStyle	+ "\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";
-        }
-
-        if(this._fillColor.gradientMode) {
-            rtnStr += "fillGradientMode: "	+ this._fillColor.gradientMode	+ "\n";
-            rtnStr += "fillColor: " + this.gradientToString(this._fillColor.color) + "\n";
-        } else {
-            rtnStr += "fillColor: "	+ String(this._fillColor)  + "\n";
-        }
-
-		rtnStr += "strokeMat: ";
-		if (this._strokeMaterial) {
-			rtnStr += this._strokeMaterial.getName();
-        } else {
-			rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-
-		rtnStr += "\n";
-
-		rtnStr += "fillMat: ";
-		if (this._fillMaterial) {
-			rtnStr += this._fillMaterial.getName();
-        } else {
-			rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-		rtnStr += "\n";
-
-		rtnStr += this.exportMaterials();
-
-		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._strokeWidth		= Number( this.getPropertyFromString( "strokeWidth: ",	importStr ) );
-		this._innerRadius		= Number( this.getPropertyFromString( "innerRadius: ",	importStr ) );
-		this._strokeStyle		= this.getPropertyFromString( "strokeStyle: ",	importStr );
-		var strokeMaterialName	= this.getPropertyFromString( "strokeMat: ",	importStr );
-		var fillMaterialName	= this.getPropertyFromString( "fillMat: ",		importStr );
-        if(importStr.indexOf("fillGradientMode: ") < 0) {
-            this._fillColor		=  eval( "[" + this.getPropertyFromString( "fillColor: ",	importStr ) + "]" );
-        } else {
-            this._fillColor = {};
-            this._fillColor.gradientMode = this.getPropertyFromString( "fillGradientMode: ",	importStr );
-            this._fillColor.color = this.stringToGradient(this.getPropertyFromString( "fillColor: ",	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;
-
-		var fillMat = MaterialsModel.getMaterial( fillMaterialName );
-		if (!fillMat) {
-			console.log( "object material not found in library: " + fillMaterialName );
-			fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
-		}
-		this._fillMaterial = fillMat;
-
-		this.importMaterials( importStr );
-	};
-
     this.collidesWithPoint = function( x, y ) {
 //        if(x < this._xOffset) return false;
 //        if(x > (this._xOffset + this._width)) return false;
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index f1aa9f8a..bb5b4a9a 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -14,19 +14,19 @@ var GeomObj = function GLGeomObj() {
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
-	this.GEOM_TYPE_RECTANGLE		=  1;
-	this.GEOM_TYPE_CIRCLE			=  2;
-	this.GEOM_TYPE_LINE             =  3;
-	this.GEOM_TYPE_PATH			    =  4;
-	this.GEOM_TYPE_CUBIC_BEZIER     =  5;
-    this.GEOM_TYPE_BRUSH_STROKE     =  6;
-	this.GEOM_TYPE_UNDEFINED		= -1;
+    this.GEOM_TYPE_RECTANGLE = 1;
+    this.GEOM_TYPE_CIRCLE = 2;
+    this.GEOM_TYPE_LINE = 3;
+    this.GEOM_TYPE_PATH = 4;
+    this.GEOM_TYPE_CUBIC_BEZIER = 5;
+    this.GEOM_TYPE_BRUSH_STROKE = 6;
+    this.GEOM_TYPE_UNDEFINED = -1;
 
     // Needed for calculating dashed/dotted strokes
     this.DASH_LENGTH = 0.15;
     this.DOT_LENGTH = 0.05;
     this.GAP_LENGTH = 0.05;
-	
+
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -40,109 +40,111 @@ var GeomObj = function GLGeomObj() {
     this.m_world = null;
 
     // stroke and fill colors
-    this._strokeColor	= [0,0,0,0];
-    this._fillColor		= [0,0,0,0];
+    this._strokeColor = [0, 0, 0, 0];
+    this._fillColor = [0, 0, 0, 0];
 
-	// stroke and fill materials
-	this._fillMaterial = null;
-	this._strokeMaterial = null;
+    // stroke and fill materials
+    this._fillMaterial = null;
+    this._strokeMaterial = null;
 
-	// array of primitives - used in RDGE
-	this._primArray = [];
-	this._materialNodeArray = [];
-	this._materialArray = [];
-	this._materialTypeArray = [];
+    // array of primitives - used in RDGE
+    this._primArray = [];
+    this._materialNodeArray = [];
+    this._materialArray = [];
+    this._materialTypeArray = [];
 
-	// the transform node used by RDGE
-	this._trNode = null;
+    // the transform node used by RDGE
+    this._trNode = null;
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
-    this.setWorld = function( world ) {
+    this.setWorld = function (world) {
         this.m_world = world;
     };
 
-    this.getWorld = function() {
+    this.getWorld = function () {
         return this.m_world;
     };
 
-	this.getMatrix = function() {
+    this.getMatrix = function () {
         return this._matrix.slice(0);
     };
 
-	this.setMatrix = function(m) {
+    this.setMatrix = function (m) {
         this._matrix = m.slice(0);
     };
 
-    this.setNext = function( next ) {
+    this.setNext = function (next) {
         this._next = next;
     };
 
-    this.getNext = function() {
+    this.getNext = function () {
         return this._next;
     };
 
-    this.setPrev = function( prev ) {
+    this.setPrev = function (prev) {
         this._prev = prev;
     };
 
-    this.getPrev = function() {
+    this.getPrev = function () {
         return this._prev;
     };
 
-    this.setChild = function( child ) {
+    this.setChild = function (child) {
         this._child = child;
     };
 
-    this.getChild = function() {
+    this.getChild = function () {
         return this._child;
     };
 
-    this.setParent = function( parent ) {
+    this.setParent = function (parent) {
         this._parent = parent;
     };
 
-    this.getParent = function() {
+    this.getParent = function () {
         return this._parent;
     };
 
-	this.geomType = function() {
+    this.geomType = function () {
         return this.GEOM_TYPE_UNDEFINED;
     };
 
-	this.getPrimitiveArray = function() {  return this._primArray;
+    this.getPrimitiveArray = function () {
+        return this._primArray;
     };
 
-	this.getMaterialNodeArray = function() {
+    this.getMaterialNodeArray = function () {
         return this._materialNodeArray;
     };
 
-	this.getMaterialArray = function() {  return this._materialArray;
+    this.getMaterialArray = function () {
+        return this._materialArray;
     };
 
-	this.getTransformNode = function() {
+    this.getTransformNode = function () {
         return this._trNode;
     };
 
-	this.setTransformNode = function(t) {
+    this.setTransformNode = function (t) {
         this._trNode = t;
     };
 
-    this.setFillColor = function(c) {
+    this.setFillColor = function (c) {
         this.setMaterialColor(c, "fill");
     };
 
-    this.setStrokeColor = function(c) {
+    this.setStrokeColor = function (c) {
         this.setMaterialColor(c, "stroke");
     };
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	this.setMaterialColor = function(c, type) {
+    this.setMaterialColor = function (c, type) {
         var i = 0,
             nMats = 0;
-        if(c.gradientMode) {
+        if (c.gradientMode) {
             // Gradient support
             if (this._materialArray && this._materialTypeArray) {
                 nMats = this._materialArray.length;
@@ -153,21 +155,21 @@ var GeomObj = function GLGeomObj() {
 
             var len = colors.length;
             // TODO - Current shaders only support 4 color stops
-            if(len > 4) {
+            if (len > 4) {
                 len = 4;
             }
 
-            for(var n=0; n<len; n++) {
-                var position = colors[n].position/100;
+            for (var n = 0; n < len; n++) {
+                var position = colors[n].position / 100;
                 var cs = colors[n].value;
-                var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+                var stop = [cs.r / 255, cs.g / 255, cs.b / 255, cs.a];
                 stops.push(stop);
 
                 if (nMats === this._materialTypeArray.length) {
-                    for (i=0;  i<nMats;  i++) {
+                    for (i = 0; i < nMats; i++) {
                         if (this._materialTypeArray[i] == type) {
-                            this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
-                            this._materialArray[i].setProperty( "colorStop"+(n+1), position );
+                            this._materialArray[i].setProperty("color" + (n + 1), stop.slice(0));
+                            this._materialArray[i].setProperty("colorStop" + (n + 1), position);
                         }
                     }
                 }
@@ -187,44 +189,44 @@ var GeomObj = function GLGeomObj() {
             if (this._materialArray && this._materialTypeArray) {
                 nMats = this._materialArray.length;
                 if (nMats === this._materialTypeArray.length) {
-                    for (i=0;  i<nMats;  i++) {
+                    for (i = 0; i < nMats; i++) {
                         if (this._materialTypeArray[i] == type) {
-                            this._materialArray[i].setProperty( "color", c.slice(0) );
+                            this._materialArray[i].setProperty("color", c.slice(0));
                         }
                     }
                 }
             }
         }
 
-		var world = this.getWorld();
-		if (world)  {
+        var world = this.getWorld();
+        if (world) {
             world.restartRenderLoop();
         }
-	};
+    };
 
-    this.makeStrokeMaterial = function() {
+    this.makeStrokeMaterial = function () {
         var strokeMaterial;
-        if (this.getStrokeMaterial()){
+        if (this.getStrokeMaterial()) {
             strokeMaterial = this.getStrokeMaterial().dup();
         } else {
             strokeMaterial = MaterialsModel.exportFlatMaterial();
         }
 
         if (strokeMaterial) {
-            strokeMaterial.init( this.getWorld() );
+            strokeMaterial.init(this.getWorld());
         }
 
-        this._materialArray.push( strokeMaterial );
-        this._materialTypeArray.push( "stroke" );
+        this._materialArray.push(strokeMaterial);
+        this._materialTypeArray.push("stroke");
 
-        if(this._strokeColor) {
+        if (this._strokeColor) {
             this.setStrokeColor(this._strokeColor);
         }
 
         return strokeMaterial;
     };
 
-    this.makeFillMaterial = function() {
+    this.makeFillMaterial = function () {
         var fillMaterial;
         if (this.getFillMaterial()) {
             fillMaterial = this.getFillMaterial().dup();
@@ -233,11 +235,11 @@ var GeomObj = function GLGeomObj() {
         }
 
         if (fillMaterial) {
-            fillMaterial.init( this.getWorld() );
+            fillMaterial.init(this.getWorld());
         }
 
-        this._materialArray.push( fillMaterial );
-        this._materialTypeArray.push( "fill" );
+        this._materialArray.push(fillMaterial);
+        this._materialTypeArray.push("fill");
 
         if (this._fillColor) {
             this.setFillColor(this._fillColor);
@@ -246,241 +248,160 @@ var GeomObj = function GLGeomObj() {
         return fillMaterial;
     };
 
-	this.exportMaterialsJSON = function()
-	{
-		var jObj;
-		if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL())
-		{
-			var nMats = this._materialArray.length;
-			if (nMats > 0)
-			{
-				var arr = [];
+    this.exportMaterialsJSON = function () {
+        var jObj;
+        if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
+            var nMats = this._materialArray.length;
+            if (nMats > 0) {
+                var arr = [];
 
-				for (var i=0;  i<nMats;  i++)
-				{
-					var matObj = 
+                for (var i = 0; i < nMats; i++) {
+                    var matObj =
 					{
-						'materialNodeName'	: this._materialNodeArray[i].name,
-						'material'			: this._materialArray[i].exportJSON(),
-						'type'				: this._materialTypeArray[i]
+					    'materialNodeName': this._materialNodeArray[i].name,
+					    'material': this._materialArray[i].exportJSON(),
+					    'type': this._materialTypeArray[i]
 					}
-					arr.push( matObj );
-				}
+                    arr.push(matObj);
+                }
 
-				jObj =
+                jObj =
 				{
-					'nMaterials'	: nMats,
-					'materials'		: arr
+				    'nMaterials': nMats,
+				    'materials': arr
 				};
-			}
-		}
-
-		return jObj;
-	}
-
-	this.importMaterialsJSON = function( jObj )
-	{
-		this._materialArray = [];
-		this._materialTypeArray = [];
-
-		if (!jObj)  return;
-
-		var nMaterials = jObj.nMaterials;
-		var matArray = jObj.materials;
-		for (var i=0;  i<nMaterials;  i++)
-		{
-			var mat;
-			var matObj = matArray[i].material;
-			var shaderName = matObj.material;
-			switch (shaderName)
-			{
-				case "flat":
-				case "radialGradient":
-				case "linearGradient":
-				case "bumpMetal":
-				case "uber":
-				case "plasma":
-				case "deform":
-				case "water":
-				case "paris":
-				case "raiders":
-				case "tunnel":
-				case "reliefTunnel":
-				case "squareTunnel":
-				case "twist":
-				case "fly":
-				case "julia":
-				case "mandel":
-				case "star":
-				case "zinvert":
-				case "keleidoscope":
-				case "radialBlur":
-				case "pulse":
-					mat = MaterialsModel.getMaterialByShader( shaderName );
-					if (mat)  mat = mat.dup();
-					break;
-
-				default:
-					console.log( "material type: " + shaderName + " is not supported" );
-					break;
-			}
-
-			if (mat)
-			{
-				mat.importJSON( matObj );
-				this._materialArray.push( mat );
-				this._materialTypeArray.push( matObj.type );
-				var type = matArray[i].type;
-				if (type == "fill")  this._fillMaterial = mat;
-				else  this._strokeMaterial = mat;
-			}
-		}
-	}
-
-	this.exportMaterials = function()
-	{
-		var rtnStr = "";
-		if (this._materialArray && this._materialNodeArray)
-		{
-			var nMats = this._materialArray.length;
-			rtnStr += "nMaterials: " + nMats + "\n";
-			for (var i=0;  i<nMats;  i++)
-			{
-				var matNode  = this._materialNodeArray[i];
-				rtnStr += "materialNodeName: " + matNode.name + "\n";
-
-				var material = this._materialArray[i];
-				rtnStr += material.export();
-			}
-		}
-		else
-			rtnStr += "nMaterials: 0\n" ;
-
-		return rtnStr;
-	}
-
-	this.importMaterials = function(importStr)
-	{
-		var nMaterials = Number( this.getPropertyFromString( "nMaterials: ", importStr )  );
-		for (var i=0;  i<nMaterials;  i++)
-		{
-			var mat;
-			var materialType = this.getPropertyFromString( "material: ",	importStr );
-			switch (materialType)
-			{
-				case "flat":
-				case "radialGradient":
-				case "linearGradient":
-				case "bumpMetal":
-				case "uber":
-				case "plasma":
-				case "deform":
-				case "water":
-				case "paris":
-				case "raiders":
-				case "tunnel":
-				case "reliefTunnel":
-				case "squareTunnel":
-				case "twist":
-				case "fly":
-				case "julia":
-				case "mandel":
-				case "star":
-				case "zinvert":
-				case "keleidoscope":
-				case "radialBlur":
-				case "pulse":
-					mat = MaterialsModel.getMaterialByShader( materialType );
-					if (mat)  mat = mat.dup();
-					break;
-
-				default:
-					console.log( "material type: " + materialType + " is not supported" );
-					break;
-			}
-
-			if (mat)
-				mat.import( importStr );
-
-			// pull off the end of the material 
-			var endMat = "endMaterial\n";
-			var endIndex = importStr.indexOf( endMat );
-			if (endIndex < 0)  break;
-			importStr = importStr.substr( endIndex + endMat.length );
-		}
-	}
-
-    this.translate   = function(v) {
-        var mat = Matrix.Translation( v );
+            }
+        }
+
+        return jObj;
+    }
+
+    this.importMaterialsJSON = function (jObj) {
+        this._materialArray = [];
+        this._materialTypeArray = [];
+
+        if (!jObj) return;
+
+        var nMaterials = jObj.nMaterials;
+        var matArray = jObj.materials;
+        for (var i = 0; i < nMaterials; i++) {
+            var mat;
+            var matObj = matArray[i].material;
+            var shaderName = matObj.material;
+            switch (shaderName) {
+                case "flat":
+                case "radialGradient":
+                case "linearGradient":
+                case "bumpMetal":
+                case "uber":
+                case "plasma":
+                case "deform":
+                case "water":
+                case "paris":
+                case "raiders":
+                case "tunnel":
+                case "reliefTunnel":
+                case "squareTunnel":
+                case "twist":
+                case "fly":
+                case "julia":
+                case "mandel":
+                case "star":
+                case "zinvert":
+                case "keleidoscope":
+                case "radialBlur":
+                case "pulse":
+                    mat = MaterialsModel.getMaterialByShader(shaderName);
+                    if (mat) mat = mat.dup();
+                    break;
+
+                default:
+                    console.log("material type: " + shaderName + " is not supported");
+                    break;
+            }
+
+            if (mat) {
+                mat.importJSON(matObj);
+                this._materialArray.push(mat);
+                this._materialTypeArray.push(matObj.type);
+                var type = matArray[i].type;
+                if (type == "fill") this._fillMaterial = mat;
+                else this._strokeMaterial = mat;
+            }
+        }
+    };
+
+    this.translate = function (v) {
+        var mat = Matrix.Translation(v);
         //var mat2 = mat.multiply( this._matrix );
         //this._matrix = mat2;
-		glmat4.multiply(mat, this._matrix, this._matrix);
+        glmat4.multiply(mat, this._matrix, this._matrix);
     };
 
-    this.transform  = function( mat ) {
+    this.transform = function (mat) {
         if (mat) {
             //this._matrix = mat.multiply( this._matrix );
-			glmat4.multiply(mat, this._matrix, this._matrix);
-		}
+            glmat4.multiply(mat, this._matrix, this._matrix);
+        }
     };
 
-    this.setMatrix  = function(mat) {
+    this.setMatrix = function (mat) {
         var gl = this.getWorld().getGLContext();
         if (gl) {
             gl.uniformMatrix4fv(this.getWorld().getShaderProgram().mvMatrixUniform, false, new Float32Array(mat));
         }
     };
 
-    this.buildBuffers = function() {
+    this.buildBuffers = function () {
         // this function must be overridden by the base class
-        alert( "GLGeomObj.buildBuffers must be overridden by base class" );
+        alert("GLGeomObj.buildBuffers must be overridden by base class");
     };
 
-    this.render = function() {
-        alert( "GLGeomObj.render method must be overridden by sub class" );
+    this.render = function () {
+        alert("GLGeomObj.render method must be overridden by sub class");
     };
 
-    this.collidesWithPoint = function( x, y ) {
-        alert( "GLGeomObj.collidesWithPoint method must be overridden by sub class" );
+    this.collidesWithPoint = function (x, y) {
+        alert("GLGeomObj.collidesWithPoint method must be overridden by sub class");
     };
 
-    this.getNearPoint = function( pt, dir ) {
-		// the alert is not displayed.  Objects may choose not to implement this method.
+    this.getNearPoint = function (pt, dir) {
+        // the alert is not displayed.  Objects may choose not to implement this method.
         //alert( "GLGeomObj.getNearPoint method must be overridden by sub class" );
     };
 
-	this.getNearVertex = function( pt, dir ) {
-		// this should be overridden by objects (such as rectangles) that have corners
-	};
+    this.getNearVertex = function (pt, dir) {
+        // this should be overridden by objects (such as rectangles) that have corners
+    };
 
-    this.containsPoint = function( pt, dir ) {
-		// the alert is not displayed.  Objects may choose not to implement this method.
+    this.containsPoint = function (pt, dir) {
+        // the alert is not displayed.  Objects may choose not to implement this method.
         //alert( "GLGeomObj.containsPoint method must be overridden by sub class" );
     };
 
-	this.getPropertyFromString = function( prop, str ) {
-		var index = str.indexOf( prop );
-		if (index < 0)  throw new Error( "property " + prop + " not found in string: " + str);
+    this.getPropertyFromString = function (prop, str) {
+        var index = str.indexOf(prop);
+        if (index < 0) throw new Error("property " + prop + " not found in string: " + str);
 
-		var rtnStr = str.substr( index+prop.length );
-		index = rtnStr.indexOf( "\n" );
-		if (index >= 0) {
-			rtnStr = rtnStr.substr(0, index);
+        var rtnStr = str.substr(index + prop.length);
+        index = rtnStr.indexOf("\n");
+        if (index >= 0) {
+            rtnStr = rtnStr.substr(0, index);
         }
 
-		return rtnStr;
-	};
+        return rtnStr;
+    };
 
     // Gradient stops for rgba(255,0,0,1) at 0%; rgba(0,255,0,1) at 33%; rgba(0,0,255,1) at 100% will return
     // 255,0,0,1@0;0,255,0,1@33;0,0,255,1@100
-    this.gradientToString = function(colors) {
+    this.gradientToString = function (colors) {
         var rtnStr = "";
-        if(colors && colors.length) {
-                var c = colors[0],
+        if (colors && colors.length) {
+            var c = colors[0],
                 len = colors.length;
 
             rtnStr += String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
-            for(var i=1; i<len; i++) {
+            for (var i = 1; i < len; i++) {
                 c = colors[i];
                 rtnStr += ";" + String(c.value.r + "," + c.value.g + "," + c.value.b + "," + c.value.a + "@" + c.position);
             }
@@ -493,7 +414,7 @@ var GeomObj = function GLGeomObj() {
     //               {position:33, value:{r:0, g:255, b:0, a:1}},
     //               {position:100, value:{r:0, g:0, b:255, a:1}}
     //             ]
-    this.stringToGradient = function(gradientStr) {
+    this.stringToGradient = function (gradientStr) {
         var rtnArr = [];
 
         var i,
@@ -504,11 +425,10 @@ var GeomObj = function GLGeomObj() {
 
         stops = gradientStr.split(";");
         len = stops.length;
-        for(i=0; i<len; i++)
-        {
+        for (i = 0; i < len; i++) {
             stop = stops[i].split("@");
             c = stop[0].split(",");
-            rtnArr.push({ position: Number(stop[1]), value:{r:Number(c[0]), g:Number(c[1]), b:Number(c[2]), a:Number(c[3])} });
+            rtnArr.push({ position: Number(stop[1]), value: { r: Number(c[0]), g: Number(c[1]), b: Number(c[2]), a: Number(c[3])} });
         }
 
         return rtnArr;
@@ -516,8 +436,8 @@ var GeomObj = function GLGeomObj() {
 
     /*
     this.export = function() {
-		var rtnStr;
-		return rtnStr;
+    var rtnStr;
+    return rtnStr;
     }
     */
 };
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index 1af02bcd..1b2dd4fc 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -140,76 +140,6 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
 		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";
-        }
-
-		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;
-
-	};
-
 	///////////////////////////////////////////////////////////////////////
 	// Methods
 	///////////////////////////////////////////////////////////////////////
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 46876ba7..00c40eb9 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -187,65 +187,6 @@ var Rectangle = function GLRectangle() {
 	///////////////////////////////////////////////////////////////////////
 	// Methods
 	///////////////////////////////////////////////////////////////////////
-	/*
-    this.export = function() {
-		var rtnStr = "type: " + this.geomType() + "\n";
-
-		/////////////////////////////////////////////////////////////////////////
-		//
-		//	world, xOffset, yOffset, width, height, strokeSize, strokeColor, fillColor,
-        //    tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle
-		//
-		/////////////////////////////////////////////////////////////////////////////
-
-		rtnStr += "xoff: "			+ this._xOffset		+ "\n";
-		rtnStr += "yoff: "			+ this._yOffset		+ "\n";
-		rtnStr += "width: "			+ this._width		+ "\n";
-		rtnStr += "height: "		+ this._height		+ "\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";
-        }
-
-        if(this._fillColor.gradientMode) {
-            rtnStr += "fillGradientMode: "	+ this._fillColor.gradientMode	+ "\n";
-            rtnStr += "fillColor: " + this.gradientToString(this._fillColor.color) + "\n";
-        } else {
-            rtnStr += "fillColor: "	+ String(this._fillColor)  + "\n";
-        }
-		rtnStr += "tlRadius: "		+ this._tlRadius	+ "\n";
-		rtnStr += "trRadius: "		+ this._trRadius	+ "\n";
-		rtnStr += "blRadius: "		+ this._blRadius	+ "\n";
-		rtnStr += "brRadius: "		+ this._brRadius	+ "\n";
-		rtnStr += "innerRadius: "	+ this._innerRadius	+ "\n";
-		rtnStr += "strokeStyle: "	+ this._strokeStyle	+ "\n";
-
-		rtnStr += "strokeMat: ";
-		if (this._strokeMaterial) {
-			rtnStr += this._strokeMaterial.getName();
-        } else {
-			rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-		rtnStr += "\n";
-
-		rtnStr += "fillMat: ";
-		if (this._fillMaterial) {
-			rtnStr += this._fillMaterial.getName();
-        } else {
-			rtnStr +=  MaterialsModel.getDefaultMaterialName();
-        }
-		rtnStr += "\n";
-
-		rtnStr += this.exportMaterials();
-
-		return rtnStr;
-	};
-    */
-
 	// JSON export
 	this.exportJSON = function()
 	{
@@ -293,57 +234,6 @@ var Rectangle = function GLRectangle() {
 		this.importMaterialsJSON( jObj.materials );
 	};
 
-	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._strokeWidth		= Number( this.getPropertyFromString( "strokeWidth: ",	importStr )  );
-		this._innerRadius		= Number( this.getPropertyFromString( "innerRadius: ",	importStr )  );
-		this._strokeStyle		= Number( this.getPropertyFromString( "strokeStyle: ",	importStr )  );
-		var strokeMaterialName	= this.getPropertyFromString( "strokeMat: ",	importStr );
-		var fillMaterialName	= this.getPropertyFromString( "fillMat: ",		importStr );
-		this._strokeStyle		=  this.getPropertyFromString( "strokeStyle: ",	importStr );
-
-        if(importStr.indexOf("fillGradientMode: ") < 0) {
-            this._fillColor		=  eval( "[" + this.getPropertyFromString( "fillColor: ",	importStr ) + "]" );
-        } else {
-            this._fillColor = {};
-            this._fillColor.gradientMode = this.getPropertyFromString( "fillGradientMode: ",	importStr );
-            this._fillColor.color = this.stringToGradient(this.getPropertyFromString( "fillColor: ",	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 ));
-        }
-
-        this._tlRadius			=  Number( this.getPropertyFromString( "tlRadius: ",	importStr )  );
-		this._trRadius			=  Number( this.getPropertyFromString( "trRadius: ",	importStr )  );
-		this._blRadius			=  Number( this.getPropertyFromString( "blRadius: ",	importStr )  );
-		this._brRadius			=  Number( this.getPropertyFromString( "brRadius: ",	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;
-
-		var fillMat = MaterialsModel.getMaterial( fillMaterialName );
-		if (!fillMat) {
-			console.log( "object material not found in library: " + fillMaterialName );
-			fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
-		}
-		this._fillMaterial = fillMat;
-
-		this.importMaterials( importStr );
-	};
-
 	this.buildBuffers = function() {
 		// get the world
 		var world = this.getWorld();
-- 
cgit v1.2.3


From ebdfa77a5399d245ddf134ee8110b2d046922a71 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Wed, 4 Apr 2012 10:32:46 -0700
Subject: removed unnecessary call to exportMaterials from init(). this call
 should not have been there.

---
 js/lib/geom/circle.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 4bf37474..7fa78b12 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,8 +61,6 @@ var Circle = function GLCircle() {
         } else {
 			this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
         }
-
-		this.exportMaterials();
 	};
 
     ///////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 55f4835aa33546f5cd27e501ed461a0f7eb5038b Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 5 Apr 2012 10:31:45 -0700
Subject: Undoing mistakes from auto-merge.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/lib/geom/geom-obj.js | 358 ++++++++++++++++++++++++------------------------
 1 file changed, 179 insertions(+), 179 deletions(-)

(limited to 'js/lib/geom')

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 56cf7c98..2cde8a75 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -1,8 +1,8 @@
 /* <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> */
+ 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> */
 
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
@@ -14,19 +14,19 @@ var GeomObj = function GLGeomObj() {
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
-	this.GEOM_TYPE_RECTANGLE		=  1;
-	this.GEOM_TYPE_CIRCLE			=  2;
-	this.GEOM_TYPE_LINE             =  3;
-	this.GEOM_TYPE_PATH			    =  4;
-	this.GEOM_TYPE_CUBIC_BEZIER     =  5;
-    this.GEOM_TYPE_BRUSH_STROKE     =  6;
-	this.GEOM_TYPE_UNDEFINED		= -1;
+    this.GEOM_TYPE_RECTANGLE = 1;
+    this.GEOM_TYPE_CIRCLE = 2;
+    this.GEOM_TYPE_LINE = 3;
+    this.GEOM_TYPE_PATH = 4;
+    this.GEOM_TYPE_CUBIC_BEZIER = 5;
+    this.GEOM_TYPE_BRUSH_STROKE = 6;
+    this.GEOM_TYPE_UNDEFINED = -1;
 
     // Needed for calculating dashed/dotted strokes
     this.DASH_LENGTH = 0.15;
     this.DOT_LENGTH = 0.05;
     this.GAP_LENGTH = 0.05;
-	
+
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -40,74 +40,74 @@ var GeomObj = function GLGeomObj() {
     this.m_world = null;
 
     // stroke and fill colors
-    this._strokeColor	= [0,0,0,0];
-    this._fillColor		= [0,0,0,0];
+    this._strokeColor = [0, 0, 0, 0];
+    this._fillColor = [0, 0, 0, 0];
 
-	// stroke and fill materials
-	this._fillMaterial = null;
-	this._strokeMaterial = null;
+    // stroke and fill materials
+    this._fillMaterial = null;
+    this._strokeMaterial = null;
 
-	// array of primitives - used in RDGE
-	this._primArray = [];
-	this._materialNodeArray = [];
-	this._materialArray = [];
-	this._materialTypeArray = [];
+    // array of primitives - used in RDGE
+    this._primArray = [];
+    this._materialNodeArray = [];
+    this._materialArray = [];
+    this._materialTypeArray = [];
 
-	// the transform node used by RDGE
-	this._trNode = null;
+    // the transform node used by RDGE
+    this._trNode = null;
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
-    this.setWorld = function( world ) {
+    this.setWorld = function (world) {
         this.m_world = world;
     };
 
-    this.getWorld = function() {
+    this.getWorld = function () {
         return this.m_world;
     };
 
-	this.getMatrix = function() {
+    this.getMatrix = function () {
         return this._matrix.slice(0);
     };
 
-	this.setMatrix = function(m) {
+    this.setMatrix = function (m) {
         this._matrix = m.slice(0);
     };
 
-    this.setNext = function( next ) {
+    this.setNext = function (next) {
         this._next = next;
     };
 
-    this.getNext = function() {
+    this.getNext = function () {
         return this._next;
     };
 
-    this.setPrev = function( prev ) {
+    this.setPrev = function (prev) {
         this._prev = prev;
     };
 
-    this.getPrev = function() {
+    this.getPrev = function () {
         return this._prev;
     };
 
-    this.setChild = function( child ) {
+    this.setChild = function (child) {
         this._child = child;
     };
 
-    this.getChild = function() {
+    this.getChild = function () {
         return this._child;
     };
 
-    this.setParent = function( parent ) {
+    this.setParent = function (parent) {
         this._parent = parent;
     };
 
-    this.getParent = function() {
+    this.getParent = function () {
         return this._parent;
     };
 
-	this.geomType = function() {
+    this.geomType = function () {
         return this.GEOM_TYPE_UNDEFINED;
     };
 
@@ -115,7 +115,7 @@ var GeomObj = function GLGeomObj() {
         return this._primArray;
     };
 
-	this.getMaterialNodeArray = function() {
+    this.getMaterialNodeArray = function () {
         return this._materialNodeArray;
     };
 
@@ -123,29 +123,29 @@ var GeomObj = function GLGeomObj() {
         return this._materialArray;
     };
 
-	this.getTransformNode = function() {
+    this.getTransformNode = function () {
         return this._trNode;
     };
 
-	this.setTransformNode = function(t) {
+    this.setTransformNode = function (t) {
         this._trNode = t;
     };
 
-    this.setFillColor = function(c) {
+    this.setFillColor = function (c) {
         this.setMaterialColor(c, "fill");
     };
 
-    this.setStrokeColor = function(c) {
+    this.setStrokeColor = function (c) {
         this.setMaterialColor(c, "stroke");
     };
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	this.setMaterialColor = function(c, type) {
+    this.setMaterialColor = function (c, type) {
         var i = 0,
             nMats = 0;
-        if(c) {
-            if(c.gradientMode) {
+        if (c) {
+            if (c.gradientMode) {
                 // Gradient support
                 if (this._materialArray && this._materialTypeArray) {
                     nMats = this._materialArray.length;
@@ -156,21 +156,21 @@ var GeomObj = function GLGeomObj() {
 
                 var len = colors.length;
                 // TODO - Current shaders only support 4 color stops
-                if(len > 4) {
+                if (len > 4) {
                     len = 4;
                 }
 
-                for(var n=0; n<len; n++) {
-                    var position = colors[n].position/100;
+                for (var n = 0; n < len; n++) {
+                    var position = colors[n].position / 100;
                     var cs = colors[n].value;
-                    var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+                    var stop = [cs.r / 255, cs.g / 255, cs.b / 255, cs.a];
                     stops.push(stop);
 
                     if (nMats === this._materialTypeArray.length) {
-                        for (i=0;  i<nMats;  i++) {
+                        for (i = 0; i < nMats; i++) {
                             if (this._materialTypeArray[i] == type) {
-                                this._materialArray[i].setProperty( "color"+(n+1), stop.slice(0) );
-                                this._materialArray[i].setProperty( "colorStop"+(n+1), position );
+                                this._materialArray[i].setProperty("color" + (n + 1), stop.slice(0));
+                                this._materialArray[i].setProperty("colorStop" + (n + 1), position);
                             }
                         }
                     }
@@ -190,9 +190,9 @@ var GeomObj = function GLGeomObj() {
                 if (this._materialArray && this._materialTypeArray) {
                     nMats = this._materialArray.length;
                     if (nMats === this._materialTypeArray.length) {
-                        for (i=0;  i<nMats;  i++) {
+                        for (i = 0; i < nMats;