69 files changed, 2356 insertions, 530 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 67026407..bc27ea7b 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -8,7 +8,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage =           require("montage/core/core").Montage,
     TextDocument =      require("js/document/text-document").TextDocument,
-    NJUtils =           require("js/lib/NJUtils").NJUtils;
+    NJUtils =           require("js/lib/NJUtils").NJUtils,
+        CanvasDataManager =     require("js/lib/rdge/runtime/CanvasDataManager").CanvasDataManager,
+        GLWorld =                       require("js/lib/drawing/world").World;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.HTMLDocument = Montage.create(TextDocument, {
@@ -206,13 +208,93 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         var elt = this.documentRoot;
                         if (elt)
                         {
-                                console.log( "load canvas data: " , value );
-                                var cdm = new CanvasDataManager();
-                                cdm.loadGLData(elt,  value);
+                                var nWorlds= value.length;
+                                for (var i=0;  i<nWorlds;  i++) {
+                                        var importStr = value[i];
+                                        var startIndex = importStr.indexOf("id: ");
+                                        if (startIndex >= 0) {
+                                                var endIndex = importStr.indexOf("\n", startIndex);
+                                                if (endIndex > 0) {
+                                                        var id = importStr.substring( startIndex+4, endIndex);
+                                                        if (id) {
+                                                                var canvas = this.findCanvasWithID(id, elt);
+                                                                if (canvas) {
+                                                                        if (!canvas.elementModel) {
+                                                                                NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
+                                                                        }
+                                                                        if (canvas.elementModel) {
+                                                                                if (canvas.elementModel.shapeModel.GLWorld) {
+                                                                                        canvas.elementModel.shapeModel.GLWorld.clearTree();
+                                                                                }
+                                                                                var index = importStr.indexOf( "webGL: " );
+                                                                                var useWebGL = (index >= 0)
+                                                                                var world = new GLWorld(canvas, useWebGL);
+                                                                                world.import( importStr );
+                                                                                        this.buildShapeModel(canvas.elementModel, world);
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
                         }
                 }
     },
 
+        buildShapeModel:
+        {
+                value: function( elementModel, world )
+                {
+            var shapeModel = elementModel.shapeModel;
+                        shapeModel.shapeCount   = 1;    // for now...
+                        shapeModel.useWebGl             = world._useWebGL;
+                        shapeModel.GLWorld              = world;
+                        var root = world.getGeomRoot();
+                        if (root)
+                        {
+                                shapeModel.GLGeomObj                    = root;
+                                shapeModel.strokeSize                   = root._strokeWidth;
+                                shapeModel.stroke                               = root._strokeColor.slice();
+                                shapeModel.strokeMaterial               = root._strokeMaterial.dup();
+                                shapeModel.strokeStyle                  = "solid";
+                                //shapeModel.strokeStyleIndex
+                                //shapeModel.border
+                                //shapeModel.background
+                                switch (root.geomType())
+                                {
+                                        case root.GEOM_TYPE_RECTANGLE:
+                        elementModel.selection = "Rectangle";
+                        elementModel.pi = "RectanglePi";
+                        shapeModel.fill                                 = root._fillColor.slice();
+                        shapeModel.fillMaterial                 = root._fillMaterial.dup();
+                                                shapeModel.tlRadius = root._tlRadius;
+                                                shapeModel.trRadius = root._trRadius;
+                                                shapeModel.blRadius = root._blRadius;
+                                                shapeModel.brRadius = root._brRadius;
+                                                break;
+
+                                        case root.GEOM_TYPE_CIRCLE:
+                        elementModel.selection = "Oval";
+                        elementModel.pi = "OvalPi";
+                        shapeModel.fill                                 = root._fillColor.slice();
+                        shapeModel.fillMaterial                 = root._fillMaterial.dup();