13 files changed, 116 insertions, 80 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index bb54874c..8b765501 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -291,7 +291,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 shapeModel.GLGeomObj                    = root;
                                 shapeModel.strokeSize                   = root._strokeWidth;
                                 shapeModel.stroke                               = root._strokeColor.slice();
-                                shapeModel.strokeMaterial               = root._strokeMaterial.dup();
+                                shapeModel.strokeMaterial               = root._strikeMaterial ? root._strokeMaterial.dup() : null;
                                 shapeModel.strokeStyle                  = "solid";
                                 //shapeModel.strokeStyleIndex
                                 //shapeModel.border
@@ -302,7 +302,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         elementModel.selection = "Rectangle";
                         elementModel.pi = "RectanglePi";
                         shapeModel.fill                                 = root._fillColor.slice();
-                        shapeModel.fillMaterial                 = root._fillMaterial.dup();
+                        shapeModel.fillMaterial                 = root._fillMaterial ? root._fillMaterial.dup() : null;
                                                 shapeModel.tlRadius = root._tlRadius;
                                                 shapeModel.trRadius = root._trRadius;
                                                 shapeModel.blRadius = root._blRadius;
@@ -313,7 +313,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         elementModel.selection = "Oval";
                         elementModel.pi = "OvalPi";
                         shapeModel.fill                                 = root._fillColor.slice();
-                        shapeModel.fillMaterial                 = root._fillMaterial.dup();
+                        shapeModel.fillMaterial                 = root._fillMaterial ? root._fillMaterial.dup() : null;
                                                 shapeModel.innerRadius = root._innerRadius;
                                                 break;
 
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 0ee66abe..0979cf12 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -751,6 +751,21 @@ World.prototype.exportJSON = function()
         var strArray = [];
         this.exportObjectsJSON( this._geomRoot, worldObj );
 
+        // You would think that the RDGE export function
+        // would not be destructive of the data.  You would be wrong...
+        // We need to rebuild everything
+        if (this._useWebGL)
+        {
+                var root = this._rootNode;
+                root.children = new Array();
+                if (worldObj.children && (worldObj.children.length === 1))
+                {
+                        this.init();
+                        this._geomRoot = undefined;
+                        this.importObjectsJSON( worldObj.children[0] );
+                }
+        }
+
         // convert the object to a string
         var jStr = JSON.stringify( worldObj );
 
@@ -759,14 +774,6 @@ World.prototype.exportJSON = function()
         // and pre-JSON versions of fileIO.
         // the ending ';' in the version string is necessary
         jStr = "v1.0;" + jStr;
-
-        // You would think that the RDGE export function
-        // would not change the data.  You would be wrong...
-        // rebuild the tree
-        var root = this._rootNode;
-        root.children = new Array();
-        if (worldObj.children && (worldObj.children.length === 1))
-                this.importObjectsJSON( worldObj.children[0] );
         
         return jStr;
 }
@@ -780,13 +787,14 @@ World.prototype.exportObjectsJSON = function( obj,  parentObj )
         parentObj.children.push( jObj );
 
         if (obj.getChild()) {
-                 this.exportObjects( obj.getChild (), jObj  );
+                 this.exportObjectsJSON( obj.getChild (), jObj  );
     }
 
         if (obj.getNext())
-                this.exportObjects( obj.getNext(), parentObj );
+                this.exportObjectsJSON( obj.getNext(), parentObj );
 }
 
+/*
 World.prototype.export = function()
 {
         var exportStr = "GLWorld 1.0\n";
@@ -849,6 +857,7 @@ World.prototype.exportObjects = function( obj ) {
         
         return rtnStr;
 };
+*/
 
 World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode ) {
         //if (trNode == null)  trNode = this._ctrNode;
@@ -893,6 +902,8 @@ World.prototype.importJSON = function( jObj )
                 // render using canvas 2D
                 this.render();
         }
+        else
+                this.restartRenderLoop();
 }
 
 World.prototype.importObjectsJSON = function( jObj,  parentGeomObj )
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index fec62308..d48bf98b 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -634,24 +634,6 @@ var Circle = function GLCircle() {
                 var strokeMaterialName  = jObj.strokeMat;
                 var fillMaterialName    = jObj.fillMat;
                 this.importMaterialsJSON( jObj.materials );
-
-                var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
-                if (!strokeMat) {
-                        console.log( "object material not found in library: " + strokeMaterialName );
-                        strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
-                }
-                else
-                        strokeMat = strokeMat.dup();
-                this._strokeMaterial = strokeMat;
-
-                var fillMat = MaterialsModel.getMaterial( fillMaterialName );
-                if (!fillMat) {
-                        console.log( "object material not found in library: " + fillMaterialName );
-                        fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
-                }
-                else
-                        fillMat = fillMat.dup();
-                this._fillMaterial = fillMat;
         };
 
 
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 63f71955..75b7808b 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -279,6 +279,11 @@ var GeomObj = function GLGeomObj() {
 
         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++)
@@ -318,7 +323,14 @@ var GeomObj = function GLGeomObj() {
                         }
 
                         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;
+                        }
                 }
         }
 
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index a706eb93..e839e229 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -137,16 +137,7 @@ 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() );
-                }
-                else
-                        strokeMat = strokeMat.dup();
-                this._strokeMaterial = strokeMat;
-
+                this.importMaterialsJSON( jObj.materials );
         };
 
         this.export = function() {
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index c6bc2d88..38e428bd 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -78,8 +78,6 @@ var Rectangle = function GLRectangle() {
         } else {
                         this._fillMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );