Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components

19 files changed, 1310 insertions, 89 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 049145ce..07a2c3ae 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -363,6 +363,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         if (this._useWebGL) {
                 rdgeStarted = true;
                 this._canvas.rdgeid = this._canvas.getAttribute( "data-RDGE-id" );
+                g_Engine.unregisterCanvas( this._canvas )
                 g_Engine.registerCanvas(this._canvas, this);
                 RDGEStart( this._canvas );
                 this._canvas.task.stop()
@@ -729,6 +730,72 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
         }
 };
 
+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
+        };
+
+        // RDGE scenegraph
+        if (this._useWebGL)
+                worldObj.scenedata = this.myScene.exportJSON();
+
+        // 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)
+        {
+                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 );
+
+        // 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.exportObjectsJSON = function( obj,  parentObj )
+{
+        if (!obj)  return;
+
+        var jObj = obj.exportJSON();
+        if (!parentObj.children)  parentObj.children = [];
+        parentObj.children.push( jObj );
+
+        if (obj.getChild()) {
+                 this.exportObjectsJSON( obj.getChild (), jObj  );
+    }
+
+        if (obj.getNext())
+                this.exportObjectsJSON( obj.getNext(), parentObj );
+}
+
+/*
 World.prototype.export = function()
 {
         var exportStr = "GLWorld 1.0\n";
@@ -791,6 +858,7 @@ World.prototype.exportObjects = function( obj ) {
         
         return rtnStr;
 };
+*/
 
 World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode ) {
         //if (trNode == null)  trNode = this._ctrNode;
@@ -810,6 +878,85 @@ World.prototype.findTransformNodeByMaterial = function( materialNode,  trNode )
         return rtnNode;
 };
 
+World.prototype.importJSON = function( jObj )
+{
+        if (jObj.webGL)
+        {
+                // start RDGE
+                rdgeStarted = true;
+                var id = this._canvas.getAttribute( "data-RDGE-id" ); 
+                this._canvas.rdgeid = id;
+                g_Engine.registerCanvas(this._canvas, this);
+                RDGEStart( this._canvas );
+                this._canvas.task.stop()
+        }
+
+        // import the objects
+        // there should be exactly one child of the parent object
+        if (jObj.children && (jObj.children.length === 1))
+                this.importObjectsJSON( jObj.children[0] );
+        else
+                throw new Error ("unrecoverable canvas import error - inconsistent root object: " + jObj.children );
+
+        if (!this._useWebGL)
+        {
+                // render using canvas 2D
+                this.render();
+        }
+        else
+                this.restartRenderLoop();
+}
+
+World.prototype.importObjectsJSON = function( jObj,  parentGeomObj )
+{
+        // read the next object
+        var gObj = this.importObjectJSON( jObj,  parentGeomObj );
+
+        // determine if we have children
+        if (jObj.children)
+        {
+                var nKids = ojObjbj.chilodren.length;
+                for (var i=0;  i<nKids;  i++)
+                {
+                        var child = jObj.children[i];
+                        this.importObjectsJSON( child, gObj );
+                }
+        }
+}
+
+World.prototype.importObjectJSON = function( jObj, parentGeomObj )
+{
+        var type = jObj.type;
+
+        var obj;
+        switch (type)
+        {
+                case 1:
+                        obj = new Rectangle();
+                        obj.importJSON( jObj );
+                        break;
+
+                case 2:         // circle
+                        obj = new Circle();
+                        obj.importJSON( jObj );
+                        break;
+
+                case 3:         // line
+            obj = new Line();
+            obj.importJSON( jObj );
+            break;
+
+                default:
+                        throw new Error( "Unrecognized object type: " + type );
+                        break;
+        }
+
+        if (obj)
+                this.addObject( obj,  parentGeomObj );
+
+        return obj;
+};
+
 World.prototype.import = function( importStr ) {
         // import the worldattributes - not currently used
 
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 4b155b4c..d48bf98b 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -53,13 +53,13 @@ var Circle = function GLCircle() {
                 if(strokeMaterial){
                         this._strokeMaterial = strokeMaterial;
         } else {
-                        this._strokeMaterial = MaterialsModel.exportFlatMaterial();
+                        this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
         }
 
                 if(fillMaterial) {
                         this._fillMaterial = fillMaterial;
         } else {
-                        this._fillMaterial = MaterialsModel.exportFlatMaterial();
+                        this._fillMaterial = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
         }
 
                 this.exportMaterials();
@@ -598,7 +598,47 @@ var Circle = function GLCircle() {