14 files changed, 1474 insertions, 1441 deletions

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;
+                                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 "tunnel":                  mat = new TunnelMaterial();                             break;
+                                case "reliefTunnel":    mat = new ReliefTunnelMaterial();               break;
+                                case "squareTunnel":    mat = new SquareTunnelMaterial();               break;
+                                case "twist":                   mat = new TwiseMaterial();                              break;
+                                case "fly":                             mat = new FlyMaterial();                                break;
+                                case "julia":                   mat = new JuliaMaterial();                              break;
+                                case "mandel":                  mat = new MandelMaterial();                             break;
+                                case "star":                    mat = new StarMaterial();                               break;
+                                case "zinvert":                 mat = new ZInvertMaterial();                    break;
+                                case "keleidoscope":    mat = new KeleidoscopeMaterial();               break;
+                                case "radialBlur":              mat = new RadialBlurMaterial();                 break;
+                                case "pulse":                   mat = new PulseMaterial();                              break;
 
                                 default:
                                         console.log( "material type: " + materialType + " is not supported" );
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index f91e830c..370bb257 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -79,6 +79,8 @@ var Rectangle = function GLRectangle() {
         } else {
                         this._fillMaterial = MaterialsModel.exportFlatMaterial();
         }
+
+                this.exportMaterials();
         };
 
         ///////////////////////////////////////////////////////////////////////
@@ -264,8 +266,9 @@ var Rectangle = function GLRectangle() {
                         console.log( "object material not found in library: " + fillMaterialName );
                         fillMat = MaterialsModel.exportFlatMaterial();
                 }
-
                 this._fillMaterial = fillMat;
+
+                this.importMaterials( importStr );
         };
 
         this.buildBuffers = function() {
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 67b16371..70873885 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -158,10 +158,14 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 var exportStr = "material: " + this.getShaderName() + "\n";
                 exportStr += "name: " + this.getName() + "\n";
 
+                var world = this.getWorld();
+                if (!world)
+                        throw new Error( "no world in material.export, " + this.getName() );
+
                 exportStr += "lightDiff: "                      + this.getLightDiff()           + "\n";
-                exportStr += "diffuseTexture: "         + this.getDiffuseTexture()      + "\n";
-                exportStr += "specularTexture: "        + this.getSpecularTexture()     + "\n";
-                exportStr += "normalMap: "              + this.getNormalTexture()       + "\n";
+                exportStr += "diffuseTexture: "         + world.cleansePath(this.getDiffuseTexture())   + "\n";
+                exportStr += "specularTexture: "        + world.cleansePath(this.getSpecularTexture())  + "\n";
+                exportStr += "normalMap: "                      + world.cleansePath(this.getNormalTexture())    + "\n";