15 files changed, 1480 insertions, 1450 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 078a73b5..b2113623 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;
 ////////////////////////////////////////////////////////////////////////
 //
@@ -174,9 +173,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;
@@ -187,9 +186,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         var elt = this.documentRoot;
                         if (elt)
                         {
-// FOR JOSE:   The following commented out lines are what the runtime
-// version should execute.
-//                              var loadForRuntime = true;
+//                              var loadForRuntime = false;
 //                              if (loadForRuntime)
 //                              {
 //                                      var cdm = new CanvasDataManager();
@@ -367,11 +364,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 );
                         }
 
@@ -381,7 +378,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/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,6 +61,8 @@ var Circle = function GLCircle() {
         } else {
                         this._fillMaterial = MaterialsModel.exportFlatMaterial();
         }
+
+                this.exportMaterials();
         };
 
     ///////////////////////////////////////////////////////////////////////
@@ -610,8 +612,9 @@ var Circle = function GLCircle() {
                         console.log( "object material not found in library: " + fillMaterialName );
                         fillMat = MaterialsModel.exportFlatMaterial();
                 }
-
                 this._fillMaterial = fillMat;
+
+                this.importMaterials( importStr );
         };
 
     this.collidesWithPoint = function( x, y ) {
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 852aab89..1a197832 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -5,6 +5,27 @@ 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
 //      Super class for all geometry classes
@@ -235,7 +256,26 @@ var GeomObj = function GLGeomObj() {
                         var materialType = this.getPropertyFromString( "material: ",    importStr );
                         switch (materialType)
                         {
-                                case "flat":            mat = new FlatMaterial();               break;
+                                case "flat":                    mat = new FlatMaterial();                               break;