Merge branch 'refs/heads/integration' into FileIO-Integration

Conflicts:
	js/document/html-document.js

15 files changed, 1519 insertions, 1469 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 0dc26884..b9944d66 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -9,7 +9,6 @@ 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,
-        CanvasDataManager =     require("js/lib/rdge/runtime/CanvasDataManager").CanvasDataManager,
         GLWorld =                       require("js/lib/drawing/world").World;
 ////////////////////////////////////////////////////////////////////////
 //
@@ -195,9 +194,9 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         this._glData = null;
                         if (elt)
                         {
-                                var cdm = new CanvasDataManager();
                                 this._glData = [];
-                                cdm.collectGLData( elt,  this._glData );
+                                var path = "assets/";
+                                this.collectGLData( elt,  this._glData, path  );
                         }
                                 
                         return this._glData;
@@ -208,29 +207,47 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         var elt = this.documentRoot;
                         if (elt)
                         {
-                                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 loadForRuntime = false;
+//                              if (loadForRuntime)
+//                              {
+//                                      var cdm = new CanvasDataManager();
+//                                      cdm.loadGLData(elt,  value );
+//                              }
+//                              else
+                                {
+                                        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 );
                                                                                 }
-                                                                                var index = importStr.indexOf( "webGL: " );
-                                                                                var useWebGL = (index >= 0)
-                                                                                var world = new GLWorld(canvas, useWebGL);
-                                                                                world.import( importStr );
-                                                                                        this.buildShapeModel(canvas.elementModel, world);
                                                                         }
                                                                 }
                                                         }
@@ -368,11 +385,11 @@ exports.HTMLDocument = Montage.create(TextDocument, {
 
 
         collectGLData: {
-                value: function( elt,  dataArray )
+                value: function( elt,  dataArray,  imagePath )
                 {
                         if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
                         {
-                                var data = elt.elementModel.shapeModel.GLWorld.export();
+                                var data = elt.elementModel.shapeModel.GLWorld.export( imagePath );
                                 dataArray.push( data );
                         }
 
@@ -382,7 +399,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 for (var i=0;  i<nKids;  i++)
                                 {
                                         var child = elt.children[i];
-                                        this.collectGLData( child, dataArray );
+                                        this.collectGLData( child, dataArray, imagePath );
                                 }
                         }
                 }
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index b8bceda6..cffd0083 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -349,7 +349,7 @@ var World = function GLWorld( canvas, use3D ) {
 
         this.generateUniqueNodeID = function()
         {
-                var str = String( this._nodeCounter );
+                var str = "" + this._nodeCounter;
                 this._nodeCounter++;
                 return str;
         }
@@ -727,7 +727,8 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
         }
 };
 
-World.prototype.export = function( exportForPublish ) {
+World.prototype.export = function( imagePath )
+{
         var exportStr = "GLWorld 1.0\n";
         var id = this.getCanvas().getAttribute( "data-RDGE-id" );
         exportStr += "id: " + id + "\n";
@@ -742,9 +743,17 @@ World.prototype.export = function( exportForPublish ) {
         // we need 2 export modes:  One for save/restore, one for publish.
         // hardcoding for now
         //var exportForPublish = false;
-        if (!exportForPublish)  exportForPublish = false;
+        //if (!exportForPublish)  exportForPublish = false;
+        var exportForPublish = true;
         exportStr += "publish: " + exportForPublish + "\n";
 
+        // the relative path for local assets needs to be modified to
+        // the path specified by argument 'imagePath'.  Save that path
+        // so exporting functions can call newPath = world.cleansePath( oldPath );
+        this._imagePath = imagePath.slice();
+        var endchar = this._imagePath[this._imagePath.length-1]
+        if (endchar != '/')  this._imagePath += '/';
+
         if (exportForPublish && this._useWebGL)
         {
                 exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n";
@@ -928,6 +937,20 @@ World.prototype.importSubObject = function( objStr,  parentNode ) {
         return trNode;
 };
 
+World.prototype.cleansePath = function( url )
+{
+        //this._imagePath
+        var searchStr = "assets/";
+        var index = url.indexOf( searchStr );
+        var rtnPath = url;
+        if (index >= 0)
+        {
+                rtnPath = url.substr( index + searchStr.length );
+                rtnPath = this._imagePath + rtnPath;
+        }
+        return rtnPath;
+}
+
 if (typeof exports === "object") {
     exports.World = World;
 }
\ No newline at end of file
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index ad77383b..f94d4e6b 100755
--- a/