23 files changed, 421 insertions, 13 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index fa830d3d..044dc59b 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -44,6 +44,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";
@@ -67,7 +68,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);
@@ -96,8 +97,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 8f88b22e..274369d6 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -98,6 +98,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 f0d9b84c..7ad8b6e9 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -102,6 +102,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 13291e25..873f82ce 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -93,6 +93,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 cf9176df..ccd2628d 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -86,6 +86,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 8f235948..9d395370 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -96,6 +96,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 da6d205c..e1d31a42 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -26,7 +26,7 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
+ </copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -103,6 +103,76 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         this.setShaderValues();
         this.update( 0 );
     };
+
+        this.resetToDefault = function()