From 22cbc9644b79df60b3f6336f9563debd47fb3ea1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 28 Jun 2012 11:44:15 -0700
Subject: Added capability to split a mesh into multiiple parts to avoid buffer
 overflow situations.

---
 js/lib/rdge/materials/bump-metal-material.js      | 14 ++++++-
 js/lib/rdge/materials/deform-material.js          | 10 +++++
 js/lib/rdge/materials/flag-material.js            | 12 ++++++
 js/lib/rdge/materials/fly-material.js             | 10 +++++
 js/lib/rdge/materials/julia-material.js           |  9 ++++
 js/lib/rdge/materials/keleidoscope-material.js    | 10 +++++
 js/lib/rdge/materials/linear-gradient-material.js | 19 +++++++++
 js/lib/rdge/materials/mandel-material.js          |  9 ++++
 js/lib/rdge/materials/material.js                 | 14 ++++---
 js/lib/rdge/materials/plasma-material.js          | 12 ++++++
 js/lib/rdge/materials/pulse-material.js           | 12 ++++++
 js/lib/rdge/materials/radial-blur-material.js     | 10 +++++
 js/lib/rdge/materials/radial-gradient-material.js | 50 ++++++++++++++++++++++-
 js/lib/rdge/materials/relief-tunnel-material.js   | 10 +++++
 js/lib/rdge/materials/square-tunnel-material.js   | 10 +++++
 js/lib/rdge/materials/star-material.js            | 10 +++++
 js/lib/rdge/materials/taper-material.js           | 29 +++++++++++--
 js/lib/rdge/materials/tunnel-material.js          | 10 +++++
 js/lib/rdge/materials/twist-material.js           | 10 +++++
 js/lib/rdge/materials/twist-vert-material.js      | 14 +++++++
 js/lib/rdge/materials/uber-material.js            | 17 ++++++++
 js/lib/rdge/materials/water-material.js           | 13 ++++++
 js/lib/rdge/materials/z-invert-material.js        | 10 +++++
 23 files changed, 312 insertions(+), 12 deletions(-)

(limited to 'js/lib/rdge/materials')

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;
+
+		this._propValues[this._propNames[8]] = [ Math.cos(this._angle), Math.sin(this._angle) ];
+	
+		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/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 4f3def4a..e868895b 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -65,6 +65,15 @@ var MandelMaterial = function MandelMaterial() {
 		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/material.js b/js/lib/rdge/materials/material.js
index 65448c0c..34524097 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -32,16 +32,12 @@ var Material = function GLMaterial( world ) {
 	// vertex deformation variables
 	this._hasVertexDeformation = false;
 	this._vertexDeformationRange = [0, 0, 1, 1];	// (xMin, yMin, xMax, yMax)
-	this._vertexDeformationTolerance = 0.1;
+	this._vertexDeformationTolerance = 0.02;
 
 	// RDGE variables
 	this._shader = null;
 	this._materialNode = null;
 
-	// vertex deformation variables
-	this._hasVertexDeformation = false;
-	this._vertexDeformationRange = [0, 0, 1, 1];	// (xMin, yMin, xMax, yMax)
-	this._vertexDeformationTolerance = 0.02;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
@@ -366,6 +362,10 @@ var Material = function GLMaterial( world ) {
 		throw new Error( "Material.init() must be overridden by subclass" );
 	};
 
+	this.resetToDefault = function()  {
+		// materials should override this functinon
+	};
+
 	this.update = function( time ) {
 		// animated materials should implement the update method
 	};
@@ -374,6 +374,10 @@ var Material = function GLMaterial( world ) {
 		// some materials need to preserve an aspect ratio - or someting else.
 	};
 
+	this.fitToPrimitiveArray = function( primArray )  {
+		// some materials need to preserve an aspect ratio - or someting else.
+	};
+
 	this.registerTexture = function( texture ) {
 		// the world needs to know about the texture map
 		var world = this.getWorld();
diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js
index 10c29c99..fe64db93 100644
--- a/js/lib/rdge/materials/plasma-material.js
+++ b/js/lib/rdge/materials/plasma-material.js
@@ -80,6 +80,18 @@ var PlasmaMaterial = function PlasmaMaterial() {
 		this._shader['default'].u_time.set( [this._time] );
 		this._time += this._dTime;
 	};
+
+	this.resetToDefault = function()
+	{
+		this._propValues[ this._propNames[0] ] = this._wave;
+		this._propValues[ this._propNames[1] ] = this._wave1;
+		this._propValues[ this._propNames[2] ] = this._wave2;
+		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/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 155bd8a9..199d65c8 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -93,6 +93,18 @@ var PulseMaterial = function PulseMaterial()
 		this.update( 0 );
 	};
 
+	this.resetToDefault = function()
+	{
+		this._propValues[ this._propNames[  u_tex0_index] ] = this._texMap.slice(0);
+		this._propValues[ this._propNames[u_xScale_index] ] = 0.5;
+		this._propValues[ this._propNames[u_yScale_index] ] = 0.4;
+		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]]  );
+	};
+
 	this.update = function( time )
 	{
 		var material = this._materialNode;
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 68a92b0f..3ffbb436 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -69,6 +69,16 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
         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]]  );
+	};
+
 
     this.update = function () {
         var material = this._materialNode;
diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index c9c2536f..a5fc2224 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -75,9 +75,25 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
         this.setShaderValues();
     };
 
-	this.fitToPrimitive = function( prim )
+	this.resetToDefault = function()
+	{
+		this._propValues[this._propNames[0]] = this._defaultColor1.slice(0);
+		this._propValues[this._propNames[1]] = this._defaultColor2.slice(0);
+		this._propValues[this._propNames[2]] = this._defaultColor3.slice(0);
+		this._propValues[this._propNames[3]] = this._defaultColor4.slice(0);
+
+		this._propValues[this._propNames[4]] = this._defaultColorStop1;
+		this._propValues[this._propNames[5]] = this._defaultColorStop2;
+		this._propValues[this._propNames[6]] = this._defaultColorStop3;
+		this._propValues[this._propNames[7]] = this._defaultColorStop4;
+	
+		var nProps = this._propNames.length;
+		for (var i=0; i<nProps;  i++)
+			this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+	};
+
+	this.fitToBounds = function( bounds )
 	{
-		var bounds = ShapePrimitive.getBounds( prim );
 		if (bounds)
 		{
 			var dx = Math.abs( bounds[3] - bounds[0] ),
@@ -107,6 +123,36 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
 				this._shader['default'].u_texTransform.set( this._textureTransform );	
 
 		}
+	}
+
+	this.fitToPrimitiveArray = function( primArray )
+	{
+		if (!primArray)  return;
+		var nPrims = primArray.length;
+		if (nPrims == 0)  return;
+		var bounds = ShapePrimitive.getBounds( primArray[0] );
+		for (var i=1;  i<nPrims;  i++)
+		{
+			var prim = primArray[i];
+			var b2 = ShapePrimitive.getBounds( prim );
+
+			// [xMin, yMin, zMin,  xMax, yMax, zMax]
+			if (b2[0] < bounds[0])  bounds[0] = b2[0];
+			if (b2[1] < bounds[1])  bounds[1] = b2[1];
+			if (b2[2] < bounds[2])  bounds[2] = b2[2];
+
+			if (b2[3] > bounds[3])  bounds[3] = b2[3];
+			if (b2[4] > bounds[4])  bounds[4] = b2[4];
+			if (b2[5] > bounds[5])  bounds[5] = b2[5];
+		}
+
+		this.fitToBounds( bounds );
+	};
+
+	this.fitToPrimitive = function( prim )
+	{
+		var bounds = ShapePrimitive.getBounds( prim );
+		this.fitToBounds( bounds );
 	};
 
 	this.customExport = function( jObj )
diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js
index ab6b142e..a97fdb6d 100644
--- a/js/lib/rdge/materials/relief-tunnel-material.js
+++ b/js/lib/rdge/materials/relief-tunnel-material.js
@@ -67,6 +67,16 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial()
         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/square-tunnel-material.js b/js/lib/rdge/materials/square-tunnel-material.js
index 1f049a2c..c10d4b12 100644
--- a/js/lib/rdge/materials/square-tunnel-material.js
+++ b/js/lib/rdge/materials/square-tunnel-material.js
@@ -65,6 +65,16 @@ var SquareTunnelMaterial = function SquareTunnelMaterial() {
         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/star-material.js b/js/lib/rdge/materials/star-material.js
index 760cf128..e5873810 100644
--- a/js/lib/rdge/materials/star-material.js
+++ b/js/lib/rdge/materials/star-material.js
@@ -71,6 +71,16 @@ var StarMaterial = function StarMaterial() {
         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/taper-material.js b/js/lib/rdge/materials/taper-material.js
index f6aa782c..595f5064 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -38,6 +38,8 @@ var TaperMaterial = function TaperMaterial()
     this._hasVertexDeformation = true;
     this._vertexDeformationTolerance = 0.02; // should be a property
 
+	this.getVertexDeformationTolerance = function()	{  return  this._propValues[this._propNames[7]];  };
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
@@ -62,13 +64,30 @@ var TaperMaterial = function TaperMaterial()
         this.setShaderValues();
     };
 
+	this.resetToDefault = function()
+	{
+		this._propValues[this._propNames[0]] = 0.25;
+		this._propValues[this._propNames[1]] = 0.50;
+		this._propValues[this._propNames[2]] = 0.75;
+		this._propValues[this._propNames[3]] = -1;
+		this._propValues[this._propNames[4]] = 1;
+		this._propValues[this._propNames[5]] = 0.0;
+		this._propValues[this._propNames[6]] = 0.9;
+		this._propValues[this._propNames[7]] = this._vertexDeformationTolerance;
+		this._propValues[this._propNames[8]] = 1.0;
+	
+		var nProps = this._propNames.length;
+		for (var i=0; i<nProps;  i++)
+			this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+	};
+
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this._propNames = [ "u_limit1", "u_limit2", "u_limit3", "u_minVal", "u_maxVal", "u_center", "u_taperAmount",  "u_speed" ];
-    this._propLabels = [ "Minimum Parameter Value", "Center Paramater Value", "Maximum Parameter Value", "Minimum Data Bounds", "Maximum Data Bounds", "Center", "Taper Amount", "Speed" ];
-    this._propTypes = [ "float", "float", "float", "float", "float", "float", "float", "float" ];
+    this._propNames = [ "u_limit1", "u_limit2", "u_limit3", "u_minVal", "u_maxVal", "u_center", "u_taperAmount",  "facettol",  "u_speed" ];
+    this._propLabels = [ "Minimum Parameter Value", "Center Paramater Value", "Maximum Parameter Value", "Minimum Data Bounds", "Maximum Data Bounds", "Center", "Taper Amount",  "Faceting Tolerance", "Speed" ];
+    this._propTypes = [ "float", "float", "float", "float", "float", "float", "float", "float", "float" ];
     this._propValues = [];
 
     // initialize the property values
@@ -79,7 +98,8 @@ var TaperMaterial = function TaperMaterial()
     this._propValues[this._propNames[4]] = 1;
     this._propValues[this._propNames[5]] = 0.0;
     this._propValues[this._propNames[6]] = 0.9;
-    this._propValues[this._propNames[7]] = 1.0;
+    this._propValues[this._propNames[7]] = this._vertexDeformationTolerance;
+    this._propValues[this._propNames[8]] = 1.0;
 
     this.update = function (time) {
         var speed = this._propValues["u_speed"];
@@ -135,6 +155,7 @@ taperShaderDef = {
 				     'u_maxVal': { 'type': 'float' },
 				     'u_center': { 'type': 'float' },
 				     'u_taperAmount': { 'type': 'float' },
+					 'facettol': { 'type': 'float' },
 				     'u_speed': { 'type': 'float' }
 				 }
             }
diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js
index 34e96ef9..a501aa91 100644
--- a/js/lib/rdge/materials/tunnel-material.js
+++ b/js/lib/rdge/materials/tunnel-material.js
@@ -66,6 +66,16 @@ var TunnelMaterial = function TunnelMaterial() {
         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/twist-material.js b/js/lib/rdge/materials/twist-material.js
index b757afb8..f42a5f02 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-material.js
@@ -67,6 +67,16 @@ var TwistMaterial = function TwistMaterial() {
         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/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 7c2dae5e..870e068d 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -81,6 +81,20 @@ var TwistVertMaterial = function TwistVertMaterial()
         this.setShaderValues();
 	};
 
+	this.resetToDefault = function()
+	{
+		this._propValues[this._propNames[0]] = 0.0;
+		this._propValues[this._propNames[1]] = 1.0;
+		this._propValues[this._propNames[2]] = 2.0 * Math.PI;
+		this._propValues[this._propNames[3]] = this._speed;
+		this._propValues[this._propNames[4]] = this._tex0.slice();
+		this._propValues[this._propNames[5]] = this._tex1.slice();
+	
+		var nProps = this._propNames.length;
+		for (var i=0; i<nProps;  i++)
+			this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+	};
+
 	this.update = function (time)
 	{
 		if (this._shader && this._shader.twistMe)
diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 347e45d3..97adf310 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -62,6 +62,23 @@ var UberMaterial = function UberMaterial() {
     this._propValues[this._propNames[7]] = this._environmentMapOb['texture'];
     this._propValues[this._propNames[8]] = this._environmentMapOb['envReflection'];
 
+	this.resetToDefault = function()
+	{
+		this._propValues[this._propNames[0]] = this._ambientColor.slice(0);
+		this._propValues[this._propNames[1]] = this._diffuseColor.slice(0);
+		this._propValues[this._propNames[2]] = this._specularColor.slice(0);
+		this._propValues[this._propNames[3]] = this._specularPower;
+		this._propValues[this._propNames[4]] = this._diffuseMapOb['texture'];
+		this._propValues[this._propNames[5]] = this._normalMapOb['texture'];
+		this._propValues[this._propNames[6]] = this._specularMapOb['texture'];
+		this._propValues[this._propNames[7]] = this._environmentMapOb['texture'];
+		this._propValues[this._propNames[8]] = this._environmentMapOb['envReflection'];
+	
+		var nProps = this._propNames.length;
+		for (var i=0; i<nProps;  i++)
+			this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+	};
+
     this.setProperty = function (prop, value) {
         if (prop == "color") prop = "ambientColor";
         var valid = this.validateProperty(prop, value);
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index 982b581f..45ac2a42 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -78,6 +78,19 @@ var WaterMaterial = function WaterMaterial()
 		this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
 		this.update(0);
 	};
+
+	this.resetToDefault = function()
+	{
+		this._propValues[ this._propNames[u_tex_index		] ]	= this._defaultTexMap.slice(0);
+		this._propValues[ this._propNames[u_emboss_index	] ]	= 0.3;
+		this._propValues[ this._propNames[u_delta_index		] ]	= 20.0;
+		this._propValues[ this._propNames[u_intensity_index	] ]	= 3.0;
+		this._propValues[ this._propNames[u_speed_index		] ]	= 0.2;
+	
+		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/z-invert-material.js b/js/lib/rdge/materials/z-invert-material.js
index b8870eb4..747f1a8f 100644
--- a/js/lib/rdge/materials/z-invert-material.js
+++ b/js/lib/rdge/materials/z-invert-material.js
@@ -69,6 +69,16 @@ var ZInvertMaterial = function ZInvertMaterial() {
         this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
         this.update(0);
     };
+
+	this.resetToDefault = function()
+	{
+		this._propValues[ this._propNames[u_tex_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]]  );
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3