9 files changed, 475 insertions, 5 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index fa6f5300..4a6e9ab8 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -152,6 +152,50 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 }
         };
 
+        this.exportJSON = function()
+        {
+                var world = this.getWorld();
+                if (!world)
+                        throw new Error( "no world in material.export, " + this.getName() );
+
+                var jObj =
+                {
+                        'material'                      : this.getShaderName(),
+                        'name'                          : this.getName(),
+                        'lightDiff'                     : this.getLightDiff(),
+                        'diffuseTexture'        : this.getDiffuseTexture(),
+                        'specularTexture'       : this.getSpecularTexture(),
+                        'normalMap'                     : this.getNormalTexture()
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj )
+        {
+                if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+                this.setName( jObj.name );
+
+                try
+                {
+                        var lightDiff  = jObj.lightDiff,
+                                dt = jObj.diffuseTexture,
+                                st = jObj.specularTexture,
+                                nt = jObj.normalMap;
+                
+                        this.setProperty( "lightDiff",  lightDiff);
+                        this.setProperty( "diffuseTexture", dt );
+                        this.setProperty( "specularTexture", st );
+                        this.setProperty( "normalMap", nt );
+                }
+                catch (e)
+                {
+                        throw new Error( "could not import BumpMetal material: " + jObj );
+                }
+                
+                return;
+        };
+
         this.export = function()
         {
                 // every material needs the base type and instance name
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index fff0e68e..5030cc88 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -112,6 +112,27 @@ var FlatMaterial = function FlatMaterial() {
         return rtnStr;
     };
 
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'color'                 : this._propValues["color"]
+                };
+
+                return jObj;
+        }
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+        
+                var color  = jObj.color;
+                this.setProperty( "color",  color);
+        }
+
         this.update = function( time )
         {
         };
diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 8e05e23d..0db6fc90 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -249,6 +249,59 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
                 }
         };
 
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'color1'                : this.getColor1(),
+                        'color2'                : this.getColor2(),
+                        'color3'                : this.getColor3(),
+                        'color4'                : this.getColor4(),
+                        'colorStop1'    : this.getColorStop1(),
+                        'colorStop2'    : this.getColorStop2(),
+                        'colorStop3'    : this.getColorStop3(),
+                        'colorStop4'    : this.getColorStop4(),
+                        'angle'                 : this.getAngle()
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+
+                try
+                {
+                        var color1      = jObj.color1,
+                                color2  = jObj.color2,
+                                color3  = jObj.color3,
+                                color4  = jObj.color4,
+                                colorStop1      = jObj.colorStop1,
+                                colorStop2      = jObj.colorStop2,
+                                colorStop3      = jObj.colorStop3,
+                                colorStop4      = jObj.colorStop4,
+                                angle = jObj.angle;
+
+                        this.setProperty( "color1", color1 );
+                        this.setProperty( "color2", color2 );
+                        this.setProperty( "color3", color3 );
+                        this.setProperty( "color4", color4 );
+                        this.setProperty( "colorStop1", colorStop1 );
+                        this.setProperty( "colorStop2", colorStop2 );
+                        this.setProperty( "colorStop3", colorStop3 );
+                        this.setProperty( "colorStop4", colorStop4 );
+                        this.setProperty( "angle", angle );
+                }
+                catch (e)
+                {
+                        throw new Error( "could not import material: " + importStr );
+                }
+        };
+
         this.export = function() {
                 // every material needs the base type and instance name
                 var exportStr = "material: " + this.getShaderName() + "\n";
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 81db36c6..1e2cd2a9 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -174,6 +174,38 @@ var PulseMaterial = function PulseMaterial() {
                 }
         };
 
+        // JSON export
+        this.exportJSON = function()
+        {
+                var world = this.getWorld();
+                if (!world)
+                        throw new Error( "no world in material.export, " + this.getName() );
+
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'texture'               : this._propValues[this._propNames[0]]
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+
+        try {
+                        this._propValues[this._propNames[0]] = jObj.texture;
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + jObj );
+        }
+        }
+
+
         this.export = function() {
                 // every material needs the base type and instance name
                 var exportStr = "material: " + this.getShaderName() + "\n";
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 46cdda74..e76b302f 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -157,6 +157,42 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
                 }
         };
 
+        this.exportJSON = function()
+        {
+                var world = this.getWorld();
+                if (!world)
+