18 files changed, 282 insertions, 1457 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index c9887b88..953f909c 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -276,13 +276,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                         var world = new GLWorld( canvas, useWebGL );
                                                                         world.importJSON( jObj );
                                                                 }
-                                                                else
-                                                                {
-                                                                        var index = importStr.indexOf( "webGL: " );
-                                                                        var useWebGL = (index >= 0);
-                                                                        var world = new GLWorld( canvas, useWebGL );
-                                                                        world.import( importStr );
-                                                                }
 
                                                                 this.buildShapeModel( canvas.elementModel, world );
                                                         }
@@ -432,7 +425,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
                         {
                                 var data = elt.elementModel.shapeModel.GLWorld.exportJSON();
-                                //var data = elt.elementModel.shapeModel.GLWorld.export();
                                 dataArray.push( data );
                         }
 
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 801c199a..ae8c2cce 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -435,38 +435,38 @@ World.prototype.updateObject = function (obj) {
     }
 };
 
-World.prototype.addObject = function( obj ) {
-    if (!obj)  return;
+World.prototype.addObject = function (obj) {
+    if (!obj) return;
 
     try {
         // undefine all the links of the object
-        obj.setChild( undefined );
-        obj.setNext( undefined );
-        obj.setPrev( undefined );
-        obj.setParent( undefined );
+        obj.setChild(undefined);
+        obj.setNext(undefined);
+        obj.setPrev(undefined);
+        obj.setParent(undefined);
 
-        obj.setWorld( this );
+        obj.setWorld(this);
 
         if (this._geomRoot == null) {
             this._geomRoot = obj;
         } else {
             var go = this._geomRoot;
-            while (go.getNext())  go = go.getNext();
-            go.setNext( obj );
-            obj.setPrev( go );
+            while (go.getNext()) go = go.getNext();
+            go.setNext(obj);
+            obj.setPrev(go);
         }
 
-                // build the WebGL buffers
-                if (this._useWebGL) {
-                        obj.buildBuffers();
-                        this.restartRenderLoop();
-                }
+        // build the WebGL buffers
+        if (this._useWebGL) {
+            obj.buildBuffers();
+            this.restartRenderLoop();
+        }
     }
 
-    catch(e) {
-        alert( "Exception in GLWorld.addObject " + e );
+    catch (e) {
+        alert("Exception in GLWorld.addObject " + e);
     }
-}
+};
 
 World.prototype.restartRenderLoop = function() {
         //console.log( "restartRenderLoop" );
@@ -734,146 +734,76 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
 
 
 
-World.prototype.exportJSON = function()
-{
-        // world properties
-        var worldObj = 
+World.prototype.exportJSON = function () {
+    // world properties
+    var worldObj =
         {
-                'version'       : 1.1,
-                'id'            : this.getCanvas().getAttribute( "data-RDGE-id" ),
-                'fov'           : this._fov,
-                'zNear'         : this._zNear,
-                'zFar'          : this._zFar,
-                'viewDist'      : this._viewDist,
-                'webGL'         : this._useWebGL
+            'version': 1.1,
+            'id': this.getCanvas().getAttribute("data-RDGE-id"),
+            'fov': this._fov,
+            'zNear': this._zNear,
+            'zFar': this._zFar,
+            'viewDist': this._viewDist,
+            'webGL': this._useWebGL
         };
 
-        // RDGE scenegraph
-        if (this._useWebGL)
-                worldObj.scenedata = this.myScene.exportJSON();
+    // RDGE scenegraph
+    if (this._useWebGL)
+        worldObj.scenedata = this.myScene.exportJSON();
 
-        // object data
-        var strArray = [];
-        this.exportObjectsJSON( this._geomRoot, worldObj );
+    // object data
+    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)
-        {
-                if (worldObj.children && (worldObj.children.length === 1))
-                {
+    // 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) {
+        if (worldObj.children && (worldObj.children.length === 1)) {
             this.rebuildTree(this._geomRoot);
             this.restartRenderLoop();
-                }
-        }
-
-        // convert the object to a string
-        var jStr = JSON.stringify( worldObj );
-
-        // prepend some version information to the string.
-        // this string is also used to differentiate between JSON
-        // and pre-JSON versions of fileIO.
-        // the ending ';' in the version string is necessary
-        jStr = "v1.0;" + jStr;
-        
-        return jStr;
-}
-
-World.prototype.rebuildTree = function( obj )
-{
-        if (!obj)  return;
-
-        obj.buildBuffers();
-
-        if (obj.getChild()) {
-                 this.rebuildTree( obj.getChild () );
+        }
     }
 
-        if (obj.getNext())
-                this.rebuildTree( obj.getNext() );
-}
-
-World.prototype.exportObjectsJSON = function( obj,  parentObj )
-{
-        if (!obj)  return;
-
-        var jObj = obj.exportJSON();
-        if (!parentObj.children)  parentObj.children = [];
-        parentObj.children.push( jObj );
+    // convert the object to a string
+    var jStr = JSON.stringify(worldObj);
 
-        if (obj.getChild()) {
-                 this.exportObjectsJSON( obj.getChild (), jObj  );
-    }
+    // prepend some version information to the string.
+    // this string is also used to differentiate between JSON
+    // and pre-JSON versions of fileIO.
+    // the ending ';' in the version string is necessary
+    jStr = "v1.0;" + jStr;
 
-        if (obj.getNext())
-                this.exportObjectsJSON( obj.getNext(), parentObj );
-}
+    return jStr;
+};
 
-/*
-World.prototype.export = function()
-{
-        var exportStr = "GLWorld 1.0\n";
-        var id = this.getCanvas().getAttribute( "data-RDGE-id" );
-        exportStr += "id: " + id + "\n";
-        //exportStr += "id: " + this._canvas.rdgeid + "\n";
-        exportStr += "fov: " + this._fov + "\n";
-        exportStr += "zNear: " + this._zNear + "\n";
+World.prototype.rebuildTree = function (obj) {
+    if (!obj) return;