23 files changed, 312 insertions, 12 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 99a80da2..ea3322cf 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -20,6 +20,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this._shaderName = "bumpMetal";
 
 
+        this._defaultLightDiff = [0.3, 0.3, 0.3, 1.0];
     this._defaultDiffuseTexture = "assets/images/metal.png";
     this._defaultSpecularTexture = "assets/images/silver.png";
         this._defaultNormalTexture = "assets/images/normalMap.png";
@@ -43,7 +44,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this._propTypes                 = ["color",                             "file",                         "file",                 "file" ];
         this._propValues                = [];
 
-        this._propValues[ this._propNames[0] ] = [0.3, 0.3, 0.3, 1.0];
+        this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
         this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
         this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
         this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
@@ -72,8 +73,19 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 this.setShaderValues();
                 this.update(0);
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
+                this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+                this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+                this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
+                for (var i=0; i<4;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
+
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
  
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index 4354408d..c2275b24 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -74,6 +74,16 @@ var DeformMaterial = function DeformMaterial() {
         this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
         this.update(0);
     };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
+                this._propValues[this._propNames[1]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index 7e3c17f9..d0a22454 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -78,6 +78,18 @@ var FlagMaterial = function FlagMaterial() {
                 this.setShaderValues();
                 this.update( 0 );
         }
+
+        this.resetToDefault = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+                this._propValues[ this._propNames[1] ] = this._waveWidth;
+                this._propValues[ this._propNames[2] ] = this._waveHeight;
+                this._propValues[ this._propNames[3] ] = this._speed;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index 4e8bd9b5..b6cf2ba1 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -69,6 +69,16 @@ var FlyMaterial = function FlyMaterial() {
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index d89fa594..e4b5c4a4 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -62,6 +62,15 @@ var JuliaMaterial = function JuliaMaterial() {
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js
index b16d9022..533aaee7 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -72,6 +72,16 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 7e53db84..f5c54726 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -79,6 +79,25 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         this.setShaderValues();
                 this.update( 0 );
     };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = this._color1.slice(0);
+                this._propValues[this._propNames[1]] = this._color2.slice(0);
+                this._propValues[this._propNames[2]] = this._color3.slice(0);
+                this._propValues[this._propNames[3]] = this._color4.slice(0);
+
+                this._propValues[this._propNames[4]] = this._colorStop1;
+                this._propValues[this._propNames[5]] = this._colorStop2;
+                this._propValues[this._propNames[6]] = this._colorStop3;
+                this._propValues[this._propNames[7]] = this._colorStop4;