From 6c994c4b90023cecf4fd0caafb404b859fe28f54 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 6 Jun 2012 16:34:41 -0700
Subject: material cleanup and rearchitecture

---
 js/lib/rdge/materials/bump-metal-material.js |   2 -
 js/lib/rdge/materials/cloud-material.js      |  17 ---
 js/lib/rdge/materials/deform-material.js     |  16 --
 js/lib/rdge/materials/flag-material.js       |  16 --
 js/lib/rdge/materials/flat-material.js       |  18 ++-
 js/lib/rdge/materials/fly-material.js        |   1 +
 js/lib/rdge/materials/material.js            | 219 +++++++++++++++++++++------
 js/lib/rdge/materials/pulse-material.js      | 189 +++--------------------
 js/lib/rdge/materials/taper-material.js      | 102 +++++++------
 js/lib/rdge/materials/water-material.js      |  45 +++---
 10 files changed, 297 insertions(+), 328 deletions(-)

(limited to 'js/lib/rdge')

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 4d19c9c1..30624f7b 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -108,8 +108,6 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function()	{  return new BumpMetalMaterial();	};
 
 	this.init = function( world )
 	{
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index 2c7fced2..2153b857 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -106,23 +106,6 @@ var CloudMaterial = function CloudMaterial()
     ///////////////////////////////////////////////////////////////////////
     // duplicate method required
     /**************************************************************/
-	this.dup = function (world) {
-        // save the world
-        if (world) this.setWorld(world);
-
-        // allocate a new uber material
-        var newMat = new CloudMaterial();
-
-        // copy over the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
-        var n = propNames.length;
-        for (var i = 0; i < n; i++) {
-            newMat.setProperty(propNames[i], propValues[i]);
-        }
-
-        return newMat;
-    };
 
     this.init = function (world) {
 		var GLWorld = require("js/lib/drawing/world").World,
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index c7f9cadc..70742c77 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -37,22 +37,6 @@ var DeformMaterial = function DeformMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function (world)
-	{
-        // get the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
-        
-        // allocate a new material
-        var newMat = new DeformMaterial();
-
-		// copy over the current values;
-        var n = propNames.length;
-        for (var i = 0; i < n; i++)
-            newMat.setProperty(propNames[i], propValues[i]);
-
-        return newMat;
-    };
 
     this.init = function (world) {
         // save the world
diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index d1788fb8..aaf36ebf 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -51,22 +51,6 @@ var FlagMaterial = function FlagMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
 	// duplcate method requirde
-	this.dup = function( world )
-	{
-		// get the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
-        
-        // allocate a new uber material
-        var newMat = new FlagMaterial();
-
-		// copy over the current values;
-        var n = propNames.length;
-        for (var i = 0; i < n; i++)
-            newMat.setProperty(propNames[i], propValues[i]);
-
-        return newMat;
-	};
 
 	this.setProperty = function( prop, value )
 	{
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index 40da9305..e5498b65 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -34,7 +34,22 @@ var FlatMaterial = function FlatMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function () { return new FlatMaterial(); };
+	this.dup = function( world )
+	{
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new FlatMaterial();
+
+		// copy over the current values;
+        var n = propNames.length;
+        for (var i = 0; i < n; i++)
+            newMat.setProperty(propNames[i], propValues[i]);
+
+        return newMat;
+	};
 
     this.init = function (world) {
         // save the world
@@ -72,6 +87,7 @@ var FlatMaterial = function FlatMaterial() {
         // make sure we have legitimate input
         if (this.validateProperty(prop, value)) {
             this._propValues[prop] = value;
+			if (prop === 'color')  this._color = value.slice();
             if (this._shader && this._shader.colorMe) {
                 this._shader.colorMe[prop].set(value);
             }
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index ca38cc83..5e14f3af 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -106,6 +106,7 @@ var flyMaterialDef =
 				{
 					'u_tex0': { 'type' : 'tex2d' },
 					'u_time' : { 'type' : 'float' },
+					'u_speed'  : { 'type' : 'float' },
 					'u_resolution'  :   { 'type' : 'vec2' },
 				},
 
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 856513e2..d2586b58 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -4,6 +4,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
+var Texture = require("js/lib/rdge/texture").Texture;
+
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      GL representation of a material.
@@ -15,19 +18,16 @@ var Material = function GLMaterial( world ) {
 	this._name = "GLMaterial";
 	this._shaderName = "undefined";
 
+	this._time = 0.0;
+	this._dTime = 0.01;
+
 	// keep a reference to the owning GLWorld
 	this._world = null;
     if(world) {
         this._world = world;
     }
 
-	this._shininess = 60;
-		
-	this._ambient  = [0.0, 0.0, 0.0,  1.0];
-	this._diffuse  = [0.0, 0.0, 0.0,  1.0];
-	this._specular = [0.0, 0.0, 0.0,  1.0];
-
-	this._texture = null;
+	this._glTextures = [];		// indexed by uniform name
 
 	// vertex deformation variables
 	this._hasVertexDeformation = false;
@@ -46,13 +46,6 @@ var Material = function GLMaterial( world ) {
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.getShininess = function() {
-        return this._shininess;
-    };
-
-	this.setShininess = function(s) {
-        this._shininess = s;
-    };
 
 	this.setName = function(n) {
         this._name = n;
@@ -78,30 +71,6 @@ var Material = function GLMaterial( world ) {
         return this._world;
     };
 
-	this.setAmbient	= function(r, g, b, a)	{
-        this._ambient = [r, g, b, a];
-    };
-
-	this.getAmbient = function() {
-        return [this._ambient[0], this._ambient[1], this._ambient[2], this._ambient[3]];
-    };
-
-	this.setDiffuse	= function(r, g, b, a)	{
-        this._diffuse = [r, g, b, a];
-    };
-
-	this.getDiffuse	= function() {
-        return [this._diffuse[0], this._diffuse[1], this._diffuse[2], this._diffuse[3]];
-    };
-
-	this.setSpecular = function(r, g, b, a)	{
-        this._specular = [r, g, b, a];
-    };
-
-	this.getSpecular = function() {
-        return [this._specular[0], this._specular[1], this._specular[2], this._specular[3]];
-    };
-
 	this.getShader = function() {
         return this._shader;
     };
@@ -116,6 +85,10 @@ var Material = function GLMaterial( world ) {
         return false;
     };
 
+	this.getTechniqueName	= function() {
+		return 'default'
+	};
+
 	// the vertex shader can apply deformations requiring refinement in
 	// certain areas.
 	this.hasVertexDeformation = function()	{
@@ -166,6 +139,43 @@ var Material = function GLMaterial( world ) {
 		}
 	};
 
+	this.hasProperty = function( prop )
+	{
+		var propNames = [],  dummy = [];
+		this.getAllProperties( propNames, dummy, dummy, dummy )
+		for (var i=0;  i<propNames.length;  i++)
+		{
+			if (prop === propNames[i])  return true;
+		}
+	};
+
+	this.getPropertyType = function( prop )
+	{
+		var n = this.getPropertyCount();
+		for (var i=0;  i<n;  i++)
+		{
+			if (prop === this._propNames[i])  return this._propTypes[i];
+		}
+	};
+
+    this.dup = function ()
+	{
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+		var MaterialLibrary = require("js/models/materials-model").MaterialsModel;
+        var newMat = MaterialLibrary.createMaterialByShaderName( this.getShaderName() );
+
+		// copy over the current values;
+        var n = propNames.length;
+        for (var i = 0; i < n; i++)
+            newMat.setProperty(propNames[i], propValues[i]);
+
+        return newMat;
+    };
+
 	this.validateProperty = function( prop, value ) {
 		var rtnVal = false;
 		try
@@ -216,16 +226,139 @@ var Material = function GLMaterial( world ) {
 
 		return rtnVal;
 	};
+
+	this.setProperty = function( prop,  value )
+	{
+		var ok = this.validateProperty( prop, value );
+		if (!ok && (prop != 'color')) {
+			console.log( "invalid property in Material:" + prop + " : " + value );
+			return;
+		}
+
+		// get the technique if the shader is instantiated
+		var technique;
+		var material = this._materialNode;
+		if (material)  technique = material.shaderProgram[this.getTechniqueName()];
+
+		switch (this.getPropertyType(prop))
+		{
+			case "angle":
+			case "float":
+				this._propValues[prop] = value;
+				if (technique)  technique[prop].set( [value] );
+				break;
+
+			case "file":
+				this._propValues[prop] = value.slice();
+				if (technique)
+				{
+					var glTex = new Texture( this.getWorld(),  value );
+					this._glTextures[prop] = glTex;
+					glTex.render();
+					var tex = glTex.getTexture();
+					if (tex)  technique[prop].set( tex );
+				}
+				break;
+
+			case "color":
+			case "vector2d":
+			case "vector3d":
+				this._propValues[prop] = value.slice();
+				if (technique)  technique[prop].set( value );
+				break;
+		}
+	};
+
+	this.setShaderValues = function()
+	{
+		var material = this._materialNode;
+		if (material)
+		{
+			var technique = material.shaderProgram[this.getTechniqueName()];
+			if (technique)
+			{
+				var n = this.getPropertyCount();
+				for (var i=0;  i<n;  i++)
+				{
+					var prop = this._propNames[i],
+						value = this._propValues[prop];
+
+					switch (this._propTypes[i])
+					{
+						case "angle":
+						case "float":
+							technique[prop].set( [value] );
+							break;
+
+						case "file":
+							var glTex = this._glTextures[prop];
+							if (glTex)
+							{
+								var tex = glTex.getTexture();
+								if (tex)  technique[prop].set( tex );
+							}
+							else
+								this.setProperty( prop, value );
+							break;
+
+						case "color":
+						case "vector2d":
+						case "vector3d":
+							technique[prop].set( value );
+							break;
+					}
+				}
+			}
+		}
+	};
+
+	// JSON export
+	this.exportJSON = function()
+	{
+		var jObj =
+		{
+			'material'		: this.getShaderName(),
+			'name'			: this.getName(),
+			'dTime'         : this._dTime
+		};
+
+		var n = this.getPropertyCount();
+		for (var i=0;  i<n;  i++)
+		{
+			var	prop  = this._propNames[i],
+				value = this._propValues[prop];
+
+			jObj[prop] = value;
+		}
+
+		return jObj;
+	};
+	
+    this.importJSON = function (jObj) {
+        if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
+        this.setName(jObj.name);
+
+        try
+		{
+			for (var prop in jObj)
+			{
+				if ((prop != 'material') && (prop != 'name'))
+				{
+					var value = jObj[prop];
+					this.setProperty( prop, value );
+				}
+			}
+        }
+        catch (e) {
+            throw new Error("could not import material: " + jObj);
+        }
+    };
+
     ///////////////////////////////////////////////////////////////////////
     
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method required by sub class
-	this.dup = function() {
-		throw new Error( "Material.dup() must be overridden by subclass" );
-	};
-
 	this.init = function( world ) {
 		throw new Error( "Material.init() must be overridden by subclass" );
 	};
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 374a5eae..7c00b836 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -30,69 +30,30 @@ var PulseMaterial = function PulseMaterial()
 	this._time = 0.0;
 	this._dTime = 0.01;
 
-	this._xScale = 0.5;
-	this._yScale = 0.4;
-	this._speed  = 1.0;
-
 	///////////////////////////////////////////////////////////////////////
 	// Property Accessors
 	///////////////////////////////////////////////////////////////////////
-	this.getName		= function()	{ return this._name;			};
-	this.getShaderName	= function()	{  return this._shaderName;		};
-
-	this.getTextureMap			= function()		{  return this._propValues[this._propNames[0]] ? this._propValues[this._propNames[0]].slice() : null	};
-	this.setTextureMap			= function(m)		{  this._propValues[this._propNames[0]] = m ? m.slice(0) : null;  this.updateTexture();  	};
-
-	this.isAnimated			= function()			{  return true;					};
+	this.isAnimated			= function()			{  return true;		};
+	this.getShaderDef		= function()			{  return pulseMaterialDef;	}
 
 	///////////////////////////////////////////////////////////////////////
 	// Material Property Accessors
 	///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["texmap",		"xscale",		"yscale",		"speed" ];
+
+	var u_tex0_index	= 0,
+		u_xScale_index	= 1,
+		u_yScale_index	= 2,
+		u_speed_index	= 3;
+
+	this._propNames			= ["u_tex0",		"u_xscale",		"u_yscale",		"u_speed" ];
 	this._propLabels		= ["Texture map",	"X Range",		"Y Range",		"Speed" ];
 	this._propTypes			= ["file",			"float",		"float",		"float"];
 	this._propValues		= [];
 
-	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-	this._propValues[ this._propNames[1] ] = this._xScale;
-	this._propValues[ this._propNames[2] ] = this._yScale;
-	this._propValues[ this._propNames[3] ] = this._speed;
-
-	this.setProperty = function( prop, value ) {
-		// make sure we have legitimate imput
-		var ok = this.validateProperty( prop, value );
-		if (!ok && (prop != 'color')) {
-			console.log( "invalid property in Material:" + prop + " : " + value );
-		}
-
-		switch (prop)
-		{
-			case "texmap":
-				this.setTextureMap(value);
-				break;
-
-			case "speed":
-				this._speed = value;
-				this._propValues[ this._propNames[3] ] = this._speed;
-				this.updateParameters();
-				break;
-
-			case "xscale":
-				this._xScale = value;
-				this._propValues[ this._propNames[1] ] = this._xScale;
-				this.updateParameters();
-				break;
-
-			case "yscale":
-				this._yScale = value;
-				this._propValues[ this._propNames[2] ] = this._yScale;
-				this.updateParameters();
-				break;
-
-			case "color":
-				break;
-		}
-	};
+	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;
 	///////////////////////////////////////////////////////////////////////
 
 
@@ -100,26 +61,9 @@ var PulseMaterial = function PulseMaterial()
 	// Methods
 	///////////////////////////////////////////////////////////////////////
 	// duplicate method required
-	this.dup = function( world ) {
-		// save the world
-		if (world)  this.setWorld( world );
-
-		// get the current values;
-		var propNames = [], propValues = [], propTypes = [], propLabels = [];
-		this.getAllProperties(propNames, propValues, propTypes, propLabels);
-		
-		// allocate a new material
-		var newMat = new PulseMaterial();
-
-		// copy over the current values;
-		var n = propNames.length;
-		for (var i = 0; i < n; i++)
-			newMat.setProperty(propNames[i], propValues[i]);
-
-		return newMat;
-	};
 
-	this.init = function( world ) {
+	this.init = function( world )
+	{
 		// save the world
 		if (world)  this.setWorld( world );
 
@@ -140,67 +84,17 @@ var PulseMaterial = function PulseMaterial()
 		if (this._shader && this._shader['default']) {
 			this._shader['default'].u_time.set( [this._time] );
 		}
-		this.updateParameters();
 
 		// set up the texture
-		var texMapName = this._propValues[this._propNames[0]];
-		this._glTex = new Texture( world, texMapName );
+		//var texMapName = this._propValues[this._propNames[0]];
+		//this.setProperty( "u_tex0",  texMapName );
 
 		// set the shader values in the shader
-		this.updateTexture();
+		this.setShaderValues();
 		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
 		this.update( 0 );
 	};
 
-	this.updateParameters = function()
-	{
-		this._propValues[ this._propNames[1] ] = this._xScale;
-		this._propValues[ this._propNames[2] ] = this._yScale;
-		this._propValues[ this._propNames[3] ] = this._speed;
-
-		var material = this._materialNode;
-		if (material)
-		{
-			var technique = material.shaderProgram['default'];
-			var renderer = RDGE.globals.engine.getContext().renderer;
-			if (renderer && technique)
-			{
-
-				if (this._shader && this._shader['default']) {
-					this._shader['default'].u_speed.set( [this._speed] );
-					this._shader['default'].u_xscale.set( [this._xScale] );
-					this._shader['default'].u_yscale.set( [this._yScale] );
-				}
-			}
-		}
-	}
-
-	this.updateTexture = function() {
-		
-		var texMapName = this._propValues[this._propNames[0]];
-		this._glTex = new Texture( this.getWorld(), texMapName );
-
-		var material = this._materialNode;
-		if (material) {
-			var technique = material.shaderProgram['default'];
-			var renderer = RDGE.globals.engine.getContext().renderer;
-			if (renderer && technique) {
-				var wrap = 'REPEAT',  mips = true;
-				var tex;
-				if (this._glTex)
-				{
-					if (this._glTex.isAnimated())
-						this._glTex.render();
-					tex = this._glTex.getTexture();
-				}
-				
-				if (tex) {
-					technique.u_tex0.set( tex );
-				}
-			}
-		}
-	};
-
 	this.update = function( time )
 	{
 		var material = this._materialNode;
@@ -210,12 +104,13 @@ var PulseMaterial = function PulseMaterial()
 			var renderer = RDGE.globals.engine.getContext().renderer;
 			if (renderer && technique)
 			{
-				if (this._glTex)
+				var glTex = this._glTextures["u_tex0"];
+				if (glTex)
 				{
 					//this.updateTexture();
-					if (this._glTex.isAnimated())
-						this._glTex.render();
-					tex = this._glTex.getTexture();
+					if (glTex.isAnimated())
+						glTex.render();
+					tex = glTex.getTexture();
 					if (tex)
 						technique.u_tex0.set( tex );
 				}
@@ -239,44 +134,6 @@ var PulseMaterial = function PulseMaterial()
 		}
 	};
 
-	// JSON export
-	this.exportJSON = function()
-	{
-		var jObj =
-		{
-			'material'		: this.getShaderName(),
-			'name'			: this.getName(),
-			'texture'		: this._propValues[this._propNames[0]],
-			'dTime'         : this._dTime,
-			'speed'			: this._speed,
-			'xScale'		: this._xScale,
-			'yScale'		: this._yScale
-		};
-
-		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;
-			this._texMap = jObj.texture;
-			if (jObj.dTime) {
-				this._dTime = jObj.dTime;
-			}
-
-			this._speed = jObj.speed;
-			this._xScale = jObj.xScale;
-			this._yScale = jObj.yScale;
-			this.updateParameters();
-		}
-		catch (e)
-		{
-			throw new Error( "could not import material: " + jObj );
-		}
-	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index 7938336b..c491fe61 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -23,14 +23,11 @@ var TaperMaterial = function TaperMaterial()
     this._name = "TaperMaterial";
     this._shaderName = "taper";
 
-    this._color = [1, 0, 0, 1];
-
     this._deltaTime = 0.0;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this.getColor = function () { return this._color; };
     this.getShaderName = function () { return this._shaderName; };
 
     this.isAnimated = function () { return true; };
@@ -42,7 +39,6 @@ var TaperMaterial = function TaperMaterial()
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function () { return new TaperMaterial(); };
 
     this.init = function (world) {
         this.setWorld(world);
@@ -52,9 +48,6 @@ var TaperMaterial = function TaperMaterial()
         this._shader.def = taperShaderDef;
         this._shader.init();
 
-        // set the defaults
-        this._shader.colorMe.color.set(this.getColor());
-
         // set up the material node
         this._materialNode = RDGE.createMaterialNode("taperMaterial" + "_" + world.generateUniqueNodeID());
         this._materialNode.setShader(this._shader);
@@ -67,41 +60,46 @@ var TaperMaterial = function TaperMaterial()
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this._propNames = ["color", "u_limit1", "u_limit2", "u_limit3", "u_minVal", "u_maxVal", "u_center", "u_taperAmount"];
-    this._propLabels = ["Color", "Minimum Parameter Value", "Center Paramater Value", "Maximum Parameter Value", "Minimum Data Bounds", "Maximum Data Bounds", "Center", "Taper Amount"];
-    this._propTypes = ["color", "float", "float", "float", "float", "float", "float", "float"];
+    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._propValues = [];
 
     // initialize the property values
-    this._propValues[this._propNames[0]] = this._color.slice();
-    this._propValues[this._propNames[1]] = 0.25;
-    this._propValues[this._propNames[2]] = 0.50;
-    this._propValues[this._propNames[3]] = 0.75;
-    this._propValues[this._propNames[4]] = -1;
-    this._propValues[this._propNames[5]] = 1;
-    this._propValues[this._propNames[6]] = 0.0;
-    this._propValues[this._propNames[7]] = 0.9;
-
-    this.setProperty = function (prop, value) {
+    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]] = 1.0;
+
+    this.setProperty = function (prop, value)
+	{
         // make sure we have legitimate input
-        if (this.validateProperty(prop, value)) {
-            switch (prop) {
-                case "color": this._propValues[prop] = value.slice(); break;
-                default: this._propValues[prop] = value; break;
-            }
+        if (this.validateProperty(prop, value))
+               this._propValues[prop] = value;
 
-            this.updateShaderValues();
-        }
+        this.updateShaderValues();
     };
-    ///////////////////////////////////////////////////////////////////////
+
     this.exportJSON = function () {
         var jObj =
 		{
 		    'material': this.getShaderName(),
-		    'name': this.getName(),
-		    'color': this._propValues["color"]
+		    'name': this.getName()
 		};
 
+		var n = this._propNames.length;
+		for (var i=0;  i<n;  i++)
+		{
+			var prop = this._propNames[i],
+				val  = this._propValues[prop];
+
+			jObj[prop] = val;
+		}
+
         return jObj;
     };
 
@@ -109,9 +107,16 @@ var TaperMaterial = function TaperMaterial()
         if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
         this.setName(jObj.name);
 
-        try {
-            var color = jObj.color;
-            this.setProperty("color", color);
+        try
+		{
+			for ( var prop in jObj)
+			{
+				if ((prop != 'material') && (prop != 'name'))
+				{
+					var value = jObj[prop];
+					this.setProperty( prop, value );
+				}
+			}
         }
         catch (e) {
             throw new Error("could not import material: " + jObj);
@@ -119,23 +124,23 @@ var TaperMaterial = function TaperMaterial()
     };
 
     this.update = function (time) {
-        //var speed = 0.01;
-        //time *= speed;
-        this._deltaTime += 0.01;
+        var speed = this._propValues["u_speed"];
+        this._deltaTime += 0.01 * speed;
 
         if (this._shader && this._shader.colorMe) {
-            var t3 = this._propValues[this._propNames[3]] - this._deltaTime;
+            var t3 = this._propValues["u_limit3"] - this._deltaTime;
             if (t3 < 0) {
-                this._deltaTime = this._propValues[this._propNames[1]] - 1.0;
-                t3 = this._propValues[this._propNames[3]] - this._deltaTime;
+                this._deltaTime = this._propValues["u_limit1"] - 1.0;
+                t3 = this._propValues["u_limit3"] - this._deltaTime;
             }
-            var t1 = this._propValues[this._propNames[1]] - this._deltaTime,
-				t2 = this._propValues[this._propNames[2]] - this._deltaTime;
 
+            var t1 = this._propValues["u_limit1"] - this._deltaTime,
+				t2 = this._propValues["u_limit2"] - this._deltaTime;
 
-            this._shader.colorMe[this._propNames[1]].set([t1]);
-            this._shader.colorMe[this._propNames[2]].set([t2]);
-            this._shader.colorMe[this._propNames[3]].set([t3]);
+
+            this._shader.colorMe["u_limit1"].set([t1]);
+            this._shader.colorMe["u_limit2"].set([t2]);
+            this._shader.colorMe["u_limit3"].set([t3]);
         }
     };
 
@@ -145,10 +150,9 @@ var TaperMaterial = function TaperMaterial()
             for (var i = 0; i < nProps; i++) {
                 var propName = this._propNames[i];
                 var propValue = this._propValues[propName];
-                switch (propName) {
-                    case "color": this._shader.colorMe[propName].set(propValue); break;
-                    default: this._shader.colorMe[propName].set([propValue]); break;
-                }
+
+                if (this._shader.colorMe[propName])
+					this._shader.colorMe[propName].set([propValue]);
             }
         }
     };
@@ -179,8 +183,6 @@ taperShaderDef = {
 			// attributes
 			'params':
 				 {
-				     'color': { 'type': 'vec4' },
-
 				     'u_limit1': { 'type': 'float' },
 				     'u_limit2': { 'type': 'float' },
 				     'u_limit3': { 'type': 'float' },
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index 1f0aa46e..8dbb3233 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -50,22 +50,6 @@ var WaterMaterial = function WaterMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-    // duplcate method requirde
-    this.dup = function (world) {
-        // get the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
-        
-        // allocate a new material
-        var newMat = new WaterMaterial();
-
-		// copy over the current values;
-        var n = propNames.length;
-        for (var i = 0; i < n; i++)
-            newMat.setProperty(propNames[i], propValues[i]);
-
-        return newMat;
-    };
 
 	this.setProperty = function( prop, value ) {
 		// make sure we have legitimate imput
@@ -142,6 +126,32 @@ var WaterMaterial = function WaterMaterial() {
 		this.updateTexture();
 	}
 
+	this.updateTexture = function() {
+		
+		var texMapName = this._propValues[this._propNames[0]];
+		this._glTex = new Texture( this.getWorld(), texMapName );
+
+		var material = this._materialNode;
+		if (material) {
+			var technique = material.shaderProgram['default'];
+			var renderer = RDGE.globals.engine.getContext().renderer;
+			if (renderer && technique) {
+				var wrap = 'REPEAT',  mips = true;
+				var tex;
+				if (this._glTex)
+				{
+					if (this._glTex.isAnimated())
+						this._glTex.render();
+					tex = this._glTex.getTexture();
+				}
+				
+				if (tex) {
+					technique.u_tex0.set( tex );
+				}
+			}
+		}
+	};
+
 	this.setEmboss = function( value )
 	{
 		this._emboss = value;
@@ -251,6 +261,7 @@ var waterMaterialDef =
 	}
 };
 
+/*
 var ParisMaterial = function ParisMaterial() {
     // initialize the inherited members
     this.inheritedFrom = WaterMaterial;
@@ -349,7 +360,7 @@ var parisMaterialDef =
 		]
 	}
 };
-
+*/
 
 WaterMaterial.prototype = new PulseMaterial();
 
-- 
cgit v1.2.3