Supporting new and old GL data formats.

4 files changed, 97 insertions, 69 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index dd4ad6f9..adff0e8c 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -37,15 +37,25 @@ function CanvasDataManager()
                 for (var i=0;  i<nWorlds;  i++)
                 {
                         var importStr = value[i];
-                        var jObj = JSON.parse( importStr );
 
-                        var id = jObj.id;
-                        if (id)
+                        // there should be some version information in
+                        // the form of 'v0.0;'  Pull that off.  (the trailing ';' should
+                        // be in the first 24 characters).
+                        var index = importStr.indexOf( ';' );
+                        if ((importStr[0] === 'v') && (index < 24))
                         {
-                                var canvas = this.findCanvasWithID( id, root );
-                                if (canvas)
+                                // JSON format.  pull off the version info
+                                importStr = importStr.substr( index+1 );
+
+                                var jObj = JSON.parse( importStr );
+                                var id = jObj.id;
+                                if (id)
                                 {
-                                        new GLRuntime( canvas, jObj,  assetPath );
+                                        var canvas = this.findCanvasWithID( id, root );
+                                        if (canvas)
+                                        {
+                                                new GLRuntime( canvas, jObj,  assetPath );
+                                        }
                                 }
                         }
                 }
diff --git a/js/document/html-document.js b/js/document/html-document.js
index bf03e38b..bb54874c 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -215,30 +215,59 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                         */
 
                                         // /*
+                                        // get the data for the next canvas
                                         var importStr = value[i];
-                                        var jObj = JSON.parse( importStr );
-                                        if (jObj)
+
+                                        // determine if it is the new (JSON) or old style format
+                                        var id = null;
+                                        var jObj = null;
+                                        var index = importStr.indexOf( ';' );
+                                        if ((importStr[0] === 'v') && (index < 24))
+                                        {
+                                                // JSON format.  pull off the
+                                                importStr = importStr.substr( index+1 );
+                                                jObj = jObj = JSON.parse( importStr );
+                                                id = jObj.id;
+                                        }
+                                        else
                                         {
-                                                var id = jObj.id;
-                                                if (id)
+                                                var startIndex = importStr.indexOf( "id: " );
+                                                if (startIndex >= 0) {
+                                                        var endIndex = importStr.indexOf( "\n", startIndex );
+                                                        if (endIndex > 0)
+                                                                id = importStr.substring( startIndex+4, endIndex );
+                                                }
+                                        }
+
+                                        if (id != null)
+                                        {
+                                                var canvas = this.findCanvasWithID( id, elt );
+                                                if (canvas)
                                                 {
-                                                        var canvas = this.findCanvasWithID( id, elt );
-                                                        if (canvas) {
-                                                                if (!canvas.elementModel) {
-                                                                        NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
+                                                        if (!canvas.elementModel)
+                                                        {
+                                                                NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
+                                                        }
+                                                        if (canvas.elementModel)
+                                                        {
+                                                                if (canvas.elementModel.shapeModel.GLWorld)
+                                                                        canvas.elementModel.shapeModel.GLWorld.clearTree();
+
+                                                                if (jObj)
+                                                                {
+                                                                        var useWebGL = jObj.webGL;
+                                                                        var world = new GLWorld( canvas, useWebGL );
+                                                                        world.importJSON( jObj );
                                                                 }
-                                                                if (canvas.elementModel) {
-                                                                        if (canvas.elementModel.shapeModel.GLWorld) {
-                                                                                canvas.elementModel.shapeModel.GLWorld.clearTree();
-                                                                        }
-                                                                        if (jObj)
-                                                                        {
-                                                                                var useWebGL = jObj.webGL;
-                                                                                var world = new GLWorld( canvas, useWebGL );
-                                                                                world.importJSON( jObj );
-                                                                                this.buildShapeModel( canvas.elementModel, world );
-                                                                        }
+                                                                else
+                                                                {
+                                                                        var index = importStr.indexOf( "webGL: " );
+                                                                        var useWebGL = (index >= 0);
+                                                                        var world = new GLWorld( canvas, useWebGL );
+                                                                        world.import( importStr );
                                                                 }
+
+                                                                this.buildShapeModel( canvas.elementModel, world );
                                                         }
                                                 }
                                         }
@@ -380,6 +409,7 @@ 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 4b117242..0ee66abe 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -754,7 +754,14 @@ World.prototype.exportJSON = function()
         // convert the object to a string
         var jStr = JSON.stringify( worldObj );
 
-        // the RDGE export function corrupts the data.
+        // 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;
+
+        // 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();
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index a4813326..63f71955 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -5,28 +5,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
-/*
-var FlatMaterial = require("js/lib/rdge/materials/flat-material").FlatMaterial;
-var LinearGradientMaterial = require("js/lib/rdge/materials/linear-gradient-material").LinearGradientMaterial;
-var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial;
-var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
-var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
-var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
-var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
-var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
-var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
-var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial;
-var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
-var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
-var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
-var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
-var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
-var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
-var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial;
-var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial;
-var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial;
-var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial;
-*/
 
 ///////////////////////////////////////////////////////////////////////
 // Class GLGeomObj
@@ -335,7 +313,7 @@ var GeomObj = function GLGeomObj() {
                                         break;
 
                                 default:
-                                        console.log( "material type: " + materialType + " is not supported" );
+                                        console.log( "material type: " + shaderName + " is not supported" );
                                         break;
                         }
 
@@ -375,26 +353,29 @@ var GeomObj = function GLGeomObj() {
                         var materialType = this.getPropertyFromString( "material: ",    importStr );
                         switch (materialType)
                         {
-                                case "flat":                    mat = new FlatMaterial();                               break;
-                                case "radialGradient":  mat = new RadialGradientMaterial();             break;
-                                case "linearGradient":  mat = new LinearGradientMaterial();             break;
-                                case "bumpMetal":               mat = new BumpMetalMaterial();                  break;
-                                case "uber":                    mat = new UberMaterial();                               break;
-                                case "plasma":                  mat = new PlasmaMaterial();                             break;
-                                case "deform":                  mat = new DeformMaterial();                             break;
-                                case "water":                   mat = new WaterMaterial();                              break;
+                                case "flat":
+                                case "radialGradient":
+                                case "linearGradient":
+                                case "bumpMetal":
+                                case "uber":
+                                case "plasma":
+                                case "deform":
+                                case "water":