1 files changed, 101 insertions, 299 deletions

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";
-        exportStr += "zFar: " + this._zFar + "\n";
-        exportStr += "viewDist: " + this._viewDist + "\n";
-        if (this._useWebGL)
-                exportStr += "webGL: true\n";
-
-        // we need 2 export modes:  One for save/restore, one for publish.
-        // hardcoding for now
-        //var exportForPublish = false;
-        //if (!exportForPublish)  exportForPublish = false;
-        var exportForPublish = true;
-        exportStr += "publish: " + exportForPublish + "\n";
-
-        if (exportForPublish && this._useWebGL)
-        {
-                exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n";
+World.prototype.rebuildTree = function (obj) {
+    if (!obj) return;
 
-                // write out all of the objects
-                exportStr += "tree\n";
-                exportStr += this.exportObjects( this._geomRoot );
-                exportStr += "endtree\n";
-        }
-        else
-        {
-                // output the material library
-                //exportStr += MaterialsLibrary.export();       // THIS NEEDS TO BE DONE AT THE DOC LEVEL
+    obj.buildBuffers();
 
-                // write out all of the objects
-                exportStr += "tree\n";
-                exportStr += this.exportObjects( this._geomRoot );
-                exportStr += "endtree\n";
-        }
+    if (obj.getChild()) {
+        this.rebuildTree(obj.getChild());
+    }
 
-        return exportStr;
+    if (obj.getNext())
+        this.rebuildTree(obj.getNext());
 };
 
-World.prototype.exportObjects = function( obj ) {
-        if (!obj)  return;
+World.prototype.exportObjectsJSON = function (obj, parentObj) {
+    if (!obj) return;
 
-        var rtnStr = "OBJECT\n";
-        rtnStr += obj.export();
+    var jObj = obj.exportJSON();
+    if (!parentObj.children) parentObj.children = [];
+    parentObj.children.push(jObj);
 
-        if (obj.getChild()) {
-                rtnStr += this.exportObjects( obj.getChild ()  );
+    if (obj.getChild()) {
+        this.exportObjectsJSON(obj.getChild(), jObj);
     }
 
-        // the end object goes outside the children
-        rtnStr += "ENDOBJECT\n";
-
-        if (obj.getNext()) {
-                rtnStr += this.exportObjects( obj.getNext() );
-    }
-        
+    if (obj.getNext())
+        this.exportObjectsJSON(obj.getNext(), parentObj);