From 8d1cc709340da845d76f84220fe92c11e6217ff3 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Tue, 3 Apr 2012 09:36:14 -0700
Subject: Made use of semicolons consistent and updated new files to use the
 new RDGE namespace

---
 js/lib/rdge/materials/cloud-material.js           |  390 +++--
 js/lib/rdge/materials/deform-material.js          |   88 +-
 js/lib/rdge/materials/flat-material.js            |  151 +-
 js/lib/rdge/materials/fly-material.js             |    5 +-
 js/lib/rdge/materials/julia-material.js           |    2 +-
 js/lib/rdge/materials/keleidoscope-material.js    |    2 +-
 js/lib/rdge/materials/linear-gradient-material.js |  489 +++---
 js/lib/rdge/materials/mandel-material.js          |    2 +-
 js/lib/rdge/materials/material-parser.js          |   81 +-
 js/lib/rdge/materials/pulse-material.js           |   10 +-
 js/lib/rdge/materials/radial-blur-material.js     |  446 +++---
 js/lib/rdge/materials/radial-gradient-material.js |  495 +++---
 js/lib/rdge/materials/relief-tunnel-material.js   |  132 +-
 js/lib/rdge/materials/square-tunnel-material.js   |  133 +-
 js/lib/rdge/materials/star-material.js            |  133 +-
 js/lib/rdge/materials/taper-material.js           |  439 +++---
 js/lib/rdge/materials/tunnel-material.js          |   79 +-
 js/lib/rdge/materials/twist-material.js           |  161 +-
 js/lib/rdge/materials/twist-vert-material.js      |  486 +++---
 js/lib/rdge/materials/uber-material.js            | 1721 ++++++++++-----------
 js/lib/rdge/materials/water-material.js           |  275 ++--
 js/lib/rdge/materials/z-invert-material.js        |  132 +-
 22 files changed, 2857 insertions(+), 2995 deletions(-)

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

diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
index 85088f91..092553ce 100644
--- a/js/lib/rdge/materials/cloud-material.js
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -1,8 +1,8 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -14,275 +14,263 @@ var CloudMaterial = function CloudMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "CloudMaterial";
-	this._shaderName = "cloud";
+    this._name = "CloudMaterial";
+    this._shaderName = "cloud";
 
-	this._texMap = 'assets/images/cloud2.jpg';
-	this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
+    this._texMap = 'assets/images/cloud2.jpg';
+    this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
 
-	this._time = 0.0;
-	this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.getName		= function()	{ return this._name;			};
-	this.getShaderName	= function()	{  return this._shaderName;		};
+    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.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.setDiffuseColor		= function(c)		{  this._propValues[this._propNames[1]] = c.slice(0);  this.updateColor();  	};
-	this.getDiffuseColor		= function()		{  return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null; 	};
+    this.setDiffuseColor = function (c) { this._propValues[this._propNames[1]] = c.slice(0); this.updateColor(); };
+    this.getDiffuseColor = function () { return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null; };
 
-	this.isAnimated			= function()			{  return true;					};
+    this.isAnimated = function () { return true; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["texmap",		"diffusecolor"];
-	this._propLabels		= ["Texture map",	"Diffuse Color"];
-	this._propTypes			= ["file",			"color"];
-	this._propValues		= [];
+    this._propNames = ["texmap", "diffusecolor"];
+    this._propLabels = ["Texture map", "Diffuse Color"];
+    this._propTypes = ["file", "color"];
+    this._propValues = [];
 
-	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-	this._propValues[ this._propNames[1] ] = this._diffuseColor.slice();
+    this._propValues[this._propNames[0]] = this._texMap.slice(0);
+    this._propValues[this._propNames[1]] = this._diffuseColor.slice();
 
-    this.setProperty = function( prop, value )
-	{
-		if (prop === 'color')  prop = 'diffusecolor';
+    this.setProperty = function (prop, value) {
+        if (prop === 'color') prop = 'diffusecolor';
 
-		// make sure we have legitimate imput
-		var ok = this.validateProperty( prop, value );
-		if (!ok) {
-			console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value );
+        // make sure we have legitimate imput
+        var ok = this.validateProperty(prop, value);
+        if (!ok) {
+            console.log("invalid property in Radial Gradient Material:" + prop + " : " + value);
         }
 
-		switch (prop)
-		{
-			case "texmap":
-				this.setTextureMap(value);
-				break;
-
-			case "diffusecolor":
-				this.setDiffuseColor( value );
-				break;
-
-			case "color":
-				break;
-		}
-	};
+        switch (prop) {
+            case "texmap":
+                this.setTextureMap(value);
+                break;
+
+            case "diffusecolor":
+                this.setDiffuseColor(value);
+                break;
+
+            case "color":
+                break;
+        }
+    };
     ///////////////////////////////////////////////////////////////////////
 
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	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] );
+    // 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;
-	};
+        return newMat;
+    };
 
-	this.init = function( world )
-	{
-		// save the world
-		if (world)  this.setWorld( world );
-
-		// this variable declared above is inherited set to a smaller delta.
-		// the cloud material runs a little faster
-		this._dTime = 0.01;
-
-		// set up the shader
-		this._shader = new jshader();
-		this._shader.def = cloudMaterialDef;
-		this._shader.init();
-
-		// set up the material node
-		this._materialNode = createMaterialNode("cloudMaterial" + "_" + world.generateUniqueNodeID());
-		this._materialNode.setShader(this._shader);
-
-		this._time = 0;
-		if (this._shader && this._shader['default']) {
-			this._shader['default'].u_time.set( [this._time] );
-			this._shader['default'].u_DiffuseColor.set( this._diffuseColor );
-        }
+    this.init = function (world) {
+        // save the world
+        if (world) this.setWorld(world);
 
-		// set the shader values in the shader
-		this.updateTexture();
-		this.update( 0 );
-	};
+        // this variable declared above is inherited set to a smaller delta.
+        // the cloud material runs a little faster
+        this._dTime = 0.01;
 
-	this.updateColor = function()
-	{
-		var material = this._materialNode;
-		if (material)
-		{
-			var technique = material.shaderProgram['default'];
-			var renderer = g_Engine.getContext().renderer;
-			if (renderer && technique) {
-				var color = this._propValues[this._propNames[1]];
-				technique.u_DiffuseColor.set( this._diffuseColor );
-			}
-		}
-	}
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = cloudMaterialDef;
+        this._shader.init();
 
-	this.updateTexture = function() {
-		var material = this._materialNode;
-		if (material) {
-			var technique = material.shaderProgram['default'];
-			var renderer = g_Engine.getContext().renderer;
-			if (renderer && technique) {
-				var texMapName = this._propValues[this._propNames[0]];
-				var wrap = 'REPEAT',  mips = true;
-				var tex = this.loadTexture( texMapName, wrap, mips );
-
-				if (tex) {
-					technique.u_tex0.set( tex );
-                }
-			}
-		}
-	};
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("cloudMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
 
-	this.update = function( time )
-	{
-		var material = this._materialNode;
-		if (material)
-		{
-			var technique = material.shaderProgram['default'];
-			var renderer = g_Engine.getContext().renderer;
-			if (renderer && technique) {
-				if (this._shader && this._shader['default']) {
-					this._shader['default'].u_time.set( [this._time] );
+        this._time = 0;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_time.set([this._time]);
+            this._shader['default'].u_DiffuseColor.set(this._diffuseColor);
+        }
+
+        // set the shader values in the shader
+        this.updateTexture();
+        this.update(0);
+    };
+
+    this.updateColor = function () {
+        var material = this._materialNode;
+        if (material) {
+            var technique = material.shaderProgram['default'];
+            var renderer = RDGE.globals.engine.getContext().renderer;
+            if (renderer && technique) {
+                var color = this._propValues[this._propNames[1]];
+                technique.u_DiffuseColor.set(this._diffuseColor);
+            }
+        }
+    };
+
+    this.updateTexture = function () {
+        var material = this._materialNode;
+        if (material) {
+            var technique = material.shaderProgram['default'];
+            var renderer = RDGE.globals.engine.getContext().renderer;
+            if (renderer && technique) {
+                var texMapName = this._propValues[this._propNames[0]];
+                var wrap = 'REPEAT', mips = true;
+                var tex = this.loadTexture(texMapName, wrap, mips);
+
+                if (tex) {
+                    technique.u_tex0.set(tex);
                 }
-				this._time += this._dTime;
+            }
+        }
+    };
+
+    this.update = function (time) {
+        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_time.set([this._time]);
+                }
+                this._time += this._dTime;
 
-                if (this._time > 200.0)  this._time = 0.0;
-			}
-		}
-	};
+                if (this._time > 200.0) this._time = 0.0;
+            }
+        }
+    };
 
-	// JSON export
-	this.exportJSON = function()
-	{
-		var jObj =
+    // JSON export
+    this.exportJSON = function () {
+        var jObj =
 		{
-			'material'		: this.getShaderName(),
-			'name'			: this.getName(),
-			'texture'		: this._propValues[this._propNames[0]]
+		    'material': this.getShaderName(),
+		    'name': this.getName(),
+		    'texture': this._propValues[this._propNames[0]]
 		};
 
-		return jObj;
-	};
+        return jObj;
+    };
 
-	this.importJSON = function( jObj )
-	{
-        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
-        this.setName(  jObj.name );
+    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._propValues[this._propNames[0]] = jObj.texture;
         }
-        catch (e)
-        {
-            throw new Error( "could not import material: " + jObj );
+        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";
+        exportStr += "name: " + this.getName() + "\n";
 
-	this.export = function() {
-		// every material needs the base type and instance name
-		var exportStr = "material: " + this.getShaderName() + "\n";
-		exportStr += "name: " + this.getName() + "\n";
+        var world = this.getWorld();
+        if (!world)
+            throw new Error("no world in material.export, " + this.getName());
 
-		var world = this.getWorld();
-		if (!world)
-			throw new Error( "no world in material.export, " + this.getName() );
+        var texMapName = this._propValues[this._propNames[0]];
+        exportStr += "texture: " + texMapName + "\n";
 
-		var texMapName =  this._propValues[this._propNames[0]];
-		exportStr += "texture: " +texMapName + "\n";
-		
-		// every material needs to terminate like this
-		exportStr += "endMaterial\n";
+        // every material needs to terminate like this
+        exportStr += "endMaterial\n";
 
-		return exportStr;
-	};
+        return exportStr;
+    };
 
-	this.import = function( importStr ) {
-		var pu = new MaterialParser( importStr );
-		var material = pu.nextValue( "material: " );
-		if (material != this.getShaderName())  throw new Error( "ill-formed material" );
-		this.setName(  pu.nextValue( "name: ") );
+    this.import = function (importStr) {
+        var pu = new MaterialParser(importStr);
+        var material = pu.nextValue("material: ");
+        if (material != this.getShaderName()) throw new Error("ill-formed material");
+        this.setName(pu.nextValue("name: "));
 
-		var rtnStr;
+        var rtnStr;
         try {
-			this._propValues[this._propNames[0]] = pu.nextValue( "texture: " );
+            this._propValues[this._propNames[0]] = pu.nextValue("texture: ");
 
             var endKey = "endMaterial\n";
-            var index = importStr.indexOf( endKey );
+            var index = importStr.indexOf(endKey);
             index += endKey.length;
-            rtnStr = importStr.substr( index );
+            rtnStr = importStr.substr(index);
         }
-        catch (e)
-        {
-            throw new Error( "could not import material: " + importStr );
+        catch (e) {
+            throw new Error("could not import material: " + importStr);
         }
 
-		return rtnStr;
-	}
+        return rtnStr;
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
- 
+
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var cloudMaterialDef =
-{'shaders': 
+{ 'shaders':
 	{
-		'defaultVShader':"assets/shaders/Cloud.vert.glsl",
-		'defaultFShader':"assets/shaders/Cloud.frag.glsl"
+	    'defaultVShader': "assets/shaders/Cloud.vert.glsl",
+	    'defaultFShader': "assets/shaders/Cloud.frag.glsl"
 	},
-	'techniques':
-	{ 
-		'default':
+    'techniques':
+	{
+	    'default':
 		[
 			{
-				'vshader' : 'defaultVShader',
-				'fshader' : 'defaultFShader',
-				// attributes
-				'attributes' :
+			    'vshader': 'defaultVShader',
+			    'fshader': 'defaultFShader',
+			    // attributes
+			    'attributes':
 				{
-					'vert'  :   { 'type' : 'vec3' },
-					'normal' :  { 'type' : 'vec3' },
-					'texcoord'  :   { 'type' : 'vec2' }
+				    'vert': { 'type': 'vec3' },
+				    'normal': { 'type': 'vec3' },
+				    'texcoord': { 'type': 'vec2' }
 				},
-				// parameters
-				'params' : 
+			    // parameters
+			    'params':
 				{
-					'u_tex0': { 'type' : 'tex2d' },
-					'u_time' : { 'type' : 'float' },
-					'u_DiffuseColor' : { 'type' : 'vec4' }
+				    'u_tex0': { 'type': 'tex2d' },
+				    'u_time': { 'type': 'float' },
+				    'u_DiffuseColor': { 'type': 'vec4' }
 				},
 
-				// render states
-				'states' : 
+			    // render states
+			    'states':
 				{
-					'depthEnable' : true,
-					'offset':[1.0, 0.1]
+				    'depthEnable': true,
+				    'offset': [1.0, 0.1]
 				}
 			}
 		]
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index 8746bb47..328330bf 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -10,20 +10,20 @@ var DeformMaterial = function DeformMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "DeformMaterial";
-	this._shaderName = "deform";
+    this._name = "DeformMaterial";
+    this._shaderName = "deform";
 
-	this._texMap = 'assets/images/rocky-normal.jpg';
+    this._texMap = 'assets/images/rocky-normal.jpg';
 
-	this._time = 0.0;
-	this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-	// all defined in parent PulseMaterial.js
-	// load the local default value
-	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+    // all defined in parent PulseMaterial.js
+    // load the local default value
+    this._propValues[this._propNames[0]] = this._texMap.slice(0);
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
@@ -35,44 +35,44 @@ var DeformMaterial = function DeformMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function( world ) {
-		// allocate a new uber material
-		var newMat = new DeformMaterial();
-
-		// 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 ) {
-		// save the world
-		if (world)  this.setWorld( world );
-
-		// set up the shader
-		this._shader = new RDGE.jshader();
-		this._shader.def = deformMaterialDef;
-		this._shader.init();
-
-		// set up the material node
-		this._materialNode = RDGE.createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID());
-		this._materialNode.setShader(this._shader);
-
-		this._time = 0;
-		if (this._shader && this._shader['default']) {
-			this._shader['default'].u_time.set( [this._time] );
+    // duplcate method requirde
+    this.dup = function (world) {
+        // allocate a new uber material
+        var newMat = new DeformMaterial();
+
+        // 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) {
+        // save the world
+        if (world) this.setWorld(world);
+
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = deformMaterialDef;
+        this._shader.init();
+
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode("deformMaterial" + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
+
+        this._time = 0;
+        if (this._shader && this._shader['default']) {
+            this._shader['default'].u_time.set([this._time]);
         }
 
-		// set the shader values in the shader
-		this.updateTexture();
-		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
-		this.update( 0 );
-	}
+        // set the shader values in the shader
+        this.updateTexture();
+        this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
+        this.update(0);
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js
index e1363c06..106641a9 100755
--- a/js/lib/rdge/materials/flat-material.js
+++ b/js/lib/rdge/materials/flat-material.js
@@ -14,129 +14,120 @@ var FlatMaterial = function FlatMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "FlatMaterial";
-	this._shaderName = "flat";
+    this._name = "FlatMaterial";
+    this._shaderName = "flat";
 
-	this._color = [1,0,0,1];
+    this._color = [1, 0, 0, 1];
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.getColor				= function()	{  return this._color;		};
-	this.getShaderName			= function()	{  return this._shaderName;	};
+    this.getColor = function () { return this._color; };
+    this.getShaderName = function () { return this._shaderName; };
 
-	this.isAnimated				= function()	{  return false;			};
-	this.hasVertexDeformation	= function()	{  return true;				};
-	this._hasVertexDeformation = true;
-	this._vertexDeformationTolerance = 0.2;
+    this.isAnimated = function () { return false; };
+    this.hasVertexDeformation = function () { return true; };
+    this._hasVertexDeformation = true;
+    this._vertexDeformationTolerance = 0.2;
 
     //////////////////////////////////s/////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function()	{  return new FlatMaterial();	} ;
+    // duplcate method requirde
+    this.dup = function () { return new FlatMaterial(); };
 
-	this.init = function( world )
-	{
-		// save the world
-		if (world)
-		{
-			this.setWorld( world );
+    this.init = function (world) {
+        // save the world
+        if (world) {
+            this.setWorld(world);
 
-		// set up the shader
-	    this._shader = new RDGE.jshader();
-		this._shader.def = flatShaderDef;
-		this._shader.init();
+            // set up the shader
+            this._shader = new RDGE.jshader();
+            this._shader.def = flatShaderDef;
+            this._shader.init();
 
-        // set the defaults
-		this._shader.colorMe.color.set( this.getColor() );
+            // set the defaults
+            this._shader.colorMe.color.set(this.getColor());
 
-		// set up the material node
-		this._materialNode = RDGE.createMaterialNode("flatMaterial_" + world.generateUniqueNodeID() );
-		this._materialNode.setShader(this._shader);
-		}
-		else
-			throw new Error( "GLWorld not supplied to material initialization" );
-	};
+            // set up the material node
+            this._materialNode = RDGE.createMaterialNode("flatMaterial_" + world.generateUniqueNodeID());
+            this._materialNode.setShader(this._shader);
+        }
+        else
+            throw new Error("GLWorld not supplied to material initialization");
+    };
 
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["color"];
-	this._propLabels		= ["Color"];
-	this._propTypes			= ["color"];
-	this._propValues		= [];
+    this._propNames = ["color"];
+    this._propLabels = ["Color"];
+    this._propTypes = ["color"];
+    this._propValues = [];
 
-	this._propValues[ this._propNames[0] ] = this._color;
+    this._propValues[this._propNames[0]] = this._color;
 
-    this.setProperty = function( prop, value ) {
-		// make sure we have legitimate input
-		if (this.validateProperty( prop, value )) {
+    this.setProperty = function (prop, value) {
+        // make sure we have legitimate input
+        if (this.validateProperty(prop, value)) {
             this._propValues[prop] = value;
             if (this._shader && this._shader.colorMe) {
                 this._shader.colorMe[prop].set(value);
             }
-		}
-	};
+        }
+    };
     ///////////////////////////////////////////////////////////////////////
 
-	this.export = function()
-	{
-		// this function should be overridden by subclasses
-		var exportStr = "material: " + this.getShaderName() + "\n";
-		exportStr += "name: " + this.getName() + "\n";
-		exportStr += "color: " + String(this._propValues["color"]) + "\n";
-		exportStr += "endMaterial\n";
+    this.export = function () {
+        // this function should be overridden by subclasses
+        var exportStr = "material: " + this.getShaderName() + "\n";
+        exportStr += "name: " + this.getName() + "\n";
+        exportStr += "color: " + String(this._propValues["color"]) + "\n";
+        exportStr += "endMaterial\n";
 
-		return exportStr;
-	};
+        return exportStr;
+    };
 
-    this.import = function( importStr ) {
-        var pu = new MaterialParser( importStr );
-        var material = pu.nextValue( "material: " );
-        if (material != this.getShaderName())  throw new Error( "ill-formed material" );
-        this.setName(  pu.nextValue( "name: ") );
+    this.import = function (importStr) {
+        var pu = new MaterialParser(importStr);
+        var material = pu.nextValue("material: ");
+        if (material != this.getShaderName()) throw new Error("ill-formed material");
+        this.setName(pu.nextValue("name: "));
 
         var rtnStr;
-        try
-        {
-            var color  = eval( "[" + pu.nextValue( "color: " ) + "]" );
-            this.setProperty( "color",  color);
+        try {
+            var color = eval("[" + pu.nextValue("color: ") + "]");
+            this.setProperty("color", color);
         }
-        catch (e)
-        {
-            throw new Error( "could not import material: " + importStr );
+        catch (e) {
+            throw new Error("could not import material: " + importStr);
         }
 
         return rtnStr;
     };
 
-	this.exportJSON = function()
-	{
-		var jObj =
+    this.exportJSON = function () {
+        var jObj =
 		{
-			'material'		: this.getShaderName(),
-			'name'			: this.getName(),
-			'color'			: this._propValues["color"]
+		    'material': this.getShaderName(),
+		    'name': this.getName(),
+		    'color': this._propValues["color"]
 		};
 
-		return jObj;
-	}
+        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.importJSON = function (jObj) {
+        if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
+        this.setName(jObj.name);
 
-	this.update = function( time )
-	{
-	};
+        var color = jObj.color;
+        this.setProperty("color", color);
+    };
 
+    this.update = function (time) {
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index a28fcaee..37bef66a 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -65,7 +65,7 @@ var FlyMaterial = function FlyMaterial() {
 		this.updateTexture();
 		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
 		this.update( 0 );
-	}
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -73,7 +73,8 @@ var FlyMaterial = function FlyMaterial() {
  
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var flyMaterialDef =
-{'shaders': 
+{
+    'shaders': 
 	{
 		'defaultVShader':"assets/shaders/Basic.vert.glsl",
 		'defaultFShader':"assets/shaders/Fly.frag.glsl"
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index 67d08b1a..7aeec3dc 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -76,7 +76,7 @@ var JuliaMaterial = function JuliaMaterial() {
 				this._time = time;
 			}
 		}
-	}
+	};
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js
index cbdd018c..4506bb8c 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -90,7 +90,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
 				this._time = time;
 			}
 		}
-	}
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index efeabf95..87e41ad6 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -11,36 +11,36 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "LinearGradientMaterial";
-	this._shaderName = "linearGradient";
-
-	this._color1		= [1,0,0,1];
-	this._color2		= [0,1,0,1];
-	this._color3		= [0,0,1,1];
-	this._color4		= [0,1,1,1];
-	this._colorStop1	= 0.0;
-	this._colorStop2	= 0.3;
-	this._colorStop3	= 0.6;
-	this._colorStop4	= 1.0;
-//	this._colorCount	= 4;
-	this._angle			= 0.0;	// the shader takes [cos(a), sin(a)]
+    this._name = "LinearGradientMaterial";
+    this._shaderName = "linearGradient";
+
+    this._color1 = [1, 0, 0, 1];
+    this._color2 = [0, 1, 0, 1];
+    this._color3 = [0, 0, 1, 1];
+    this._color4 = [0, 1, 1, 1];
+    this._colorStop1 = 0.0;
+    this._colorStop2 = 0.3;
+    this._colorStop3 = 0.6;
+    this._colorStop4 = 1.0;
+    //	this._colorCount	= 4;
+    this._angle = 0.0; // the shader takes [cos(a), sin(a)]
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.getShaderName	= function() {
+    this.getShaderName = function () {
         return this._shaderName;
     };
 
-	this.getName		= function() {
+    this.getName = function () {
         return this._name;
     };
 
-	this.getColor1	= function() {
+    this.getColor1 = function () {
         return this._color1;
     };
 
-	this.setColor1	= function(c) {
+    this.setColor1 = function (c) {
         this._color1 = c.slice();
 
         if (this._shader && this._shader['default']) {
@@ -48,11 +48,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-	this.getColor2	= function() {
+    this.getColor2 = function () {
         return this._color2;
     };
 
-	this.setColor2	= function(c) {
+    this.setColor2 = function (c) {
         this._color2 = c.slice();
 
         if (this._shader && this._shader['default']) {
@@ -60,23 +60,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-	this.getColor3	= function() {
+    this.getColor3 = function () {
         return this._color3;
     };
 
-	this.setColor3	= function(c) {
+    this.setColor3 = function (c) {
         this._color3 = c.slice();
-        
+
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_color3.set(c);
         }
     };
 
-	this.getColor4	= function() {	
-        return this._color4;		
+    this.getColor4 = function () {
+        return this._color4;
     };
-    
-	this.setColor4	= function(c) {	
+
+    this.setColor4 = function (c) {
         this._color4 = c.slice();
 
         if (this._shader && this._shader['default']) {
@@ -84,11 +84,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-	this.getColorStop1 = function() {  
-        return this._colorStop1;		
+    this.getColorStop1 = function () {
+        return this._colorStop1;
     };
-    
-	this.setColorStop1 = function(s) {  
+
+    this.setColorStop1 = function (s) {
         this._colorStop1 = s;
 
         if (this._shader && this._shader['default']) {
@@ -96,11 +96,11 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-	this.getColorStop2 = function() {  
-        return this._colorStop2;		
+    this.getColorStop2 = function () {
+        return this._colorStop2;
     };
-    
-	this.setColorStop2 = function(s) {
+
+    this.setColorStop2 = function (s) {
         this._colorStop2 = s;
 
         if (this._shader && this._shader['default']) {
@@ -108,23 +108,23 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-	this.getColorStop3 = function()	{  
-        return this._colorStop3;		
+    this.getColorStop3 = function () {
+        return this._colorStop3;
     };
-    
-	this.setColorStop3 = function(s) {
+
+    this.setColorStop3 = function (s) {
         this._colorStop3 = s;
 
         if (this._shader && this._shader['default']) {
             this._shader['default'].u_colorStop3.set([s]);
         }
-    }
+    };
 
-	this.getColorStop4 = function() {  
-        return this._colorStop4;		
+    this.getColorStop4 = function () {
+        return this._colorStop4;
     };
-    
-	this.setColorStop4 = function(s) {
+
+    this.setColorStop4 = function (s) {
         this._colorStop4 = s;
 
         if (this._shader && this._shader['default']) {
@@ -132,17 +132,17 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-//	this.getColorCount	= function()	{  return this._colorCount;		};
-//	this.setColorCount	= function(c)	{  this._colorCount = c;
-//												if (this._shader && this._shader['default'])
-//													this._shader['default'].u_colorCount.set([c]);
-//										};
+    //	this.getColorCount	= function()	{  return this._colorCount;		};
+    //	this.setColorCount	= function(c)	{  this._colorCount = c;
+    //												if (this._shader && this._shader['default'])
+    //													this._shader['default'].u_colorCount.set([c]);
+    //										};
 
-	this.getAngle = function() {
+    this.getAngle = function () {
         return this._angle;
     };
 
-	this.setAngle = function(a) {
+    this.setAngle = function (a) {
         this._angle = a;
 
         if (this._shader && this._shader['default']) {
@@ -150,222 +150,215 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         }
     };
 
-	this.isAnimated	 = function() {  
-        return false;					
+    this.isAnimated = function () {
+        return false;
     };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["color1",		"color2",		"color3",		"color4",   "colorStop1",		"colorStop2",		"colorStop3",		        "colorStop4",       "angle"];
-	this._propLabels		= ["Color 1",	    "Color 2",	    "Color 3",	    "Color 4",  "Color Stop 1",	    "Color Stop 2",      "Color Stop 3",	        "Color Stop 4",     "Angle"];
-	this._propTypes			= ["color",			"color",		"color",        "color",    "float",            "float",             "float",                     "float",          "float"];
-	this._propValues		= [];
-
-	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] ] = this._angle;
-
-    this.setProperty = function( prop, value ) {
-		if (prop === "color")  prop = "color1";
-
-		// make sure we have legitimate imput
-		var ok = this.validateProperty( prop, value );
-		if (!ok) {
-			console.log( "invalid property in Linear Gradient Material" + prop + " : " + value );
+    this._propNames = ["color1", "color2", "color3", "color4", "colorStop1", "colorStop2", "colorStop3", "colorStop4", "angle"];
+    this._propLabels = ["Color 1", "Color 2", "Color 3", "Color 4", "Color Stop 1", "Color Stop 2", "Color Stop 3", "Color Stop 4", "Angle"];
+    this._propTypes = ["color", "color", "color", "color", "float", "float", "float", "float", "float"];
+    this._propValues = [];
+
+    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]] = this._angle;
+
+    this.setProperty = function (prop, value) {
+        if (prop === "color") prop = "color1";
+
+        // make sure we have legitimate imput
+        var ok = this.validateProperty(prop, value);
+        if (!ok) {
+            console.log("invalid property in Linear Gradient Material" + prop + " : " + value);
         }
 
-		switch (prop)
-		{
-			case "color1":		    this.setColor1( value );		    break;
-			case "color2":		    this.setColor2( value );		    break;
-			case "color3":		    this.setColor3( value );		    break;
-			case "color4":		    this.setColor4( value );		    break;
-            case "colorStop1":		this.setColorStop1( value );		break;
-            case "colorStop2":		this.setColorStop2( value );		break;
-            case "colorStop3":		this.setColorStop3( value );		break;
-            case "colorStop4":		this.setColorStop4( value );		break;
-			case "angle":		    this.setAngle( value );			    break;
-		}
-	};
+        switch (prop) {
+            case "color1": this.setColor1(value); break;
+            case "color2": this.setColor2(value); break;
+            case "color3": this.setColor3(value); break;
+            case "color4": this.setColor4(value); break;
+            case "colorStop1": this.setColorStop1(value); break;
+            case "colorStop2": this.setColorStop2(value); break;
+            case "colorStop3": this.setColorStop3(value); break;
+            case "colorStop4": this.setColorStop4(value); break;
+            case "angle": this.setAngle(value); break;
+        }
+    };
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function()	{  return new LinearGradientMaterial();	};
-
-	this.init = function( world ) {
-		this.setWorld( world );
-
-		// set up the shader
-		this._shader = new RDGE.jshader();
-		this._shader.def = linearGradientMaterialDef;
-		this._shader.init();
-
-		// set up the material node
-		this._materialNode = RDGE.createMaterialNode(this.getShaderName() + "_" + world.generateUniqueNodeID());
-		this._materialNode.setShader(this._shader);
-
-		// send the current values to the shader
-		this.updateShaderValues();
-
-		//console.log( "**** LinearGradientMaterial initialized" );
-	};
-
-	this.updateShaderValues= function() {
-		if (this._shader && this._shader['default']) {
-			//this._shader['default'].u_colorCount.set( [4] );
-
-			var c;
-			c = this.getColor1();
-			this._shader['default'].u_color1.set( c );
-			c = this.getColor2();
-			this._shader['default'].u_color2.set( c );
-			c = this.getColor3();
-			this._shader['default'].u_color3.set( c );
-			c = this.getColor4();
-			this._shader['default'].u_color4.set( c );
-
-			var s;
-			s = this.getColorStop1();
-			this._shader['default'].u_colorStop1.set( [s] );
-			s = this.getColorStop2();
-			this._shader['default'].u_colorStop2.set( [s] );
-			s = this.getColorStop3();
-			this._shader['default'].u_colorStop3.set( [s] );
-			s = this.getColorStop4();
-			this._shader['default'].u_colorStop4.set( [s] );
-
-			this.setAngle( this.getAngle() );
-		}
-	};
+    // duplcate method requirde
+    this.dup = function () { return new 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()
-		};
+    this.init = function (world) {
+        this.setWorld(world);
 
-		return jObj;
-	};
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = linearGradientMaterialDef;
+        this._shader.init();
 
-	this.importJSON = function( jObj )
-	{
-        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
-        this.setName(  jObj.name );
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode(this.getShaderName() + "_" + world.generateUniqueNodeID());
+        this._materialNode.setShader(this._shader);
+
+        // send the current values to the shader
+        this.updateShaderValues();
+
+        //console.log( "**** LinearGradientMaterial initialized" );
+    };
+
+    this.updateShaderValues = function () {
+        if (this._shader && this._shader['default']) {
+            //this._shader['default'].u_colorCount.set( [4] );
+
+            var c;
+            c = this.getColor1();
+            this._shader['default'].u_color1.set(c);
+            c = this.getColor2();
+            this._shader['default'].u_color2.set(c);
+            c = this.getColor3();
+            this._shader['default'].u_color3.set(c);
+            c = this.getColor4();
+            this._shader['default'].u_color4.set(c);
+
+            var s;
+            s = this.getColorStop1();
+            this._shader['default'].u_colorStop1.set([s]);
+            s = this.getColorStop2();
+            this._shader['default'].u_colorStop2.set([s]);
+            s = this.getColorStop3();
+            this._shader['default'].u_colorStop3.set([s]);
+            s = this.getColorStop4();
+            this._shader['default'].u_colorStop4.set([s]);
+
+            this.setAngle(this.getAngle());
+        }
+    };
 
-		try
+    this.exportJSON = function () {
+        var jObj =
 		{
-			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,
+		    '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";
-		exportStr += "name: " + this.getName() + "\n";
-
-		exportStr += "color1: "		+ this.getColor1()	+ "\n";
-		exportStr += "color2: "		+ this.getColor2()	+ "\n";
-		exportStr += "color3: "		+ this.getColor3()	+ "\n";
-		exportStr += "color4: "		+ this.getColor4()	+ "\n";
-
-        exportStr += "colorStop1: "		+ this.getColorStop1()	+ "\n";
-        exportStr += "colorStop2: "		+ this.getColorStop2()	+ "\n";
-        exportStr += "colorStop3: "		+ this.getColorStop3()	+ "\n";
-        exportStr += "colorStop4: "		+ this.getColorStop4()	+ "\n";
-
-		exportStr += "angle: "		+ this.getAngle()		+ "\n";
-		
-		// every material needs to terminate like this
-		exportStr += "endMaterial\n";
-
-		return exportStr;
-	};
-
-	this.import = function( importStr ) {
-		var pu = new MaterialParser( importStr );
-		var material = pu.nextValue( "material: " );
-		if (material != this.getShaderName())  throw new Error( "ill-formed material" );
-		this.setName(  pu.nextValue( "name: ") );
-
-		var rtnStr;
-		try
-		{
-			var color1	= eval( "[" + pu.nextValue( "color1: " )	+ "]" ),
-				color2	= eval( "[" + pu.nextValue( "color2: " )		+ "]" ),
-				color3	= eval( "[" + pu.nextValue( "color3: " )		+ "]" ),
-				color4	= eval( "[" + pu.nextValue( "color4: " )		+ "]" ),
-				colorStop1	= Number(pu.nextValue( "colorStop1: " )),
-				colorStop2	= Number(pu.nextValue( "colorStop2: " )),
-				colorStop3	= Number(pu.nextValue( "colorStop3: " )),
-				colorStop4	= Number(pu.nextValue( "colorStop4: " )),
-				angle		= Number(pu.nextValue( "angle: " ) );
-
-			var endKey = "endMaterial\n";
-			var index = importStr.indexOf( endKey );
-			index += endKey.length;
-			rtnStr = importStr.substr( index );
-
-			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 );
-		}
-		
-		return rtnStr;
-	};
+            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";
+        exportStr += "name: " + this.getName() + "\n";
+
+        exportStr += "color1: " + this.getColor1() + "\n";
+        exportStr += "color2: " + this.getColor2() + "\n";
+        exportStr += "color3: " + this.getColor3() + "\n";
+        exportStr += "color4: " + this.getColor4() + "\n";
+
+        exportStr += "colorStop1: " + this.getColorStop1() + "\n";
+        exportStr += "colorStop2: " + this.getColorStop2() + "\n";
+        exportStr += "colorStop3: " + this.getColorStop3() + "\n";
+        exportStr += "colorStop4: " + this.getColorStop4() + "\n";
+
+        exportStr += "angle: " + this.getAngle() + "\n";
+
+        // every material needs to terminate like this
+        exportStr += "endMaterial\n";
+
+        return exportStr;
+    };
+
+    this.import = function (importStr) {
+        var pu = new MaterialParser(importStr);
+        var material = pu.nextValue("material: ");
+        if (material != this.getShaderName()) throw new Error("ill-formed material");
+        this.setName(pu.nextValue("name: "));
+
+        var rtnStr;
+        try {
+            var color1 = eval("[" + pu.nextValue("color1: ") + "]"),
+				color2 = eval("[" + pu.nextValue("color2: ") + "]"),
+				color3 = eval("[" + pu.nextValue("color3: ") + "]"),
+				color4 = eval("[" + pu.nextValue("color4: ") + "]"),
+				colorStop1 = Number(pu.nextValue("colorStop1: ")),
+				colorStop2 = Number(pu.nextValue("colorStop2: ")),
+				colorStop3 = Number(pu.nextValue("colorStop3: ")),
+				colorStop4 = Number(pu.nextValue("colorStop4: ")),
+				angle = Number(pu.nextValue("angle: "));
+
+            var endKey = "endMaterial\n";
+            var index = importStr.indexOf(endKey);
+            index += endKey.length;
+            rtnStr = importStr.substr(index);
+
+            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);
+        }
+
+        return rtnStr;
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 8ba5f790..a82a4bfc 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -86,7 +86,7 @@ var MandelMaterial = function MandelMaterial() {
 				this._time = time;
 			}
 		}
-	}
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/material-parser.js b/js/lib/rdge/materials/material-parser.js
index b334c05d..c078c3af 100755
--- a/js/lib/rdge/materials/material-parser.js
+++ b/js/lib/rdge/materials/material-parser.js
@@ -4,66 +4,65 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var MaterialParser = function MaterialParser( theStr ) {
+var MaterialParser = function MaterialParser(theStr) {
 
-	this._strBuffer = theStr;
+    this._strBuffer = theStr;
 
-	this.nextValue = function( prop, endKeyArg, advanceBufferArg ) {
-		if (!this._strBuffer)  return;
+    this.nextValue = function (prop, endKeyArg, advanceBufferArg) {
+        if (!this._strBuffer) return;
 
-		// make the 2 & 3rd argument optional.  default is to advance the string
-		var endKey = "\n",  advanceBuffer = true;
-		if (endKeyArg) {
-			endKey = endKeyArg;
+        // make the 2 & 3rd argument optional.  default is to advance the string
+        var endKey = "\n", advanceBuffer = true;
+        if (endKeyArg) {
+            endKey = endKeyArg;
         }
 
-		if (advanceBufferArg) {
-			advanceBuffer = advanceBufferArg;
+        if (advanceBufferArg) {
+            advanceBuffer = advanceBufferArg;
         }
 
-		var iStart = this._strBuffer.indexOf( prop );
-		if (iStart < 0)  return;
+        var iStart = this._strBuffer.indexOf(prop);
+        if (iStart < 0) return;
 
-		var iEnd = this._strBuffer.indexOf( endKey, iStart );
-		if (iEnd < 0)  throw new Error( "property " + prop + " improperly terminated: " + this._strBuffer);
+        var iEnd = this._strBuffer.indexOf(endKey, iStart);
+        if (iEnd < 0) throw new Error("property " + prop + " improperly terminated: " + this._strBuffer);
 
-		iStart += prop.length;
-		var nChars = iEnd - iStart;
-		var rtnStr = this._strBuffer.substr( iStart, nChars );
+        iStart += prop.length;
+        var nChars = iEnd - iStart;
+        var rtnStr = this._strBuffer.substr(iStart, nChars);
 
-		if (advanceBuffer) {
-			this._strBuffer = this._strBuffer.substr( iEnd + endKey.length  );
+        if (advanceBuffer) {
+            this._strBuffer = this._strBuffer.substr(iEnd + endKey.length);
         }
 
-		return rtnStr;
-	};
+        return rtnStr;
+    };
 
-	this.nextToken = function() {
-		if (!this._strBuffer)  return;
+    this.nextToken = function () {
+        if (!this._strBuffer) return;
 
-		// find the limits
-		var index = this._strBuffer.search( /\S/ );		// first non-whitespace character
-		if (index > 0) this._strBuffer = this._strBuffer.slice(index);
-		index   = this._strBuffer.search( /\s/ );		// first whitespace character marking the end of the token
+        // find the limits
+        var index = this._strBuffer.search(/\S/); 	// first non-whitespace character
+        if (index > 0) this._strBuffer = this._strBuffer.slice(index);
+        index = this._strBuffer.search(/\s/); 	// first whitespace character marking the end of the token
 
-		var token;
-		if (index > 0) {
-			token = this._strBuffer.slice(0, index);
-			this._strBuffer = this._strBuffer.slice( index  );
-		}
+        var token;
+        if (index > 0) {
+            token = this._strBuffer.slice(0, index);
+            this._strBuffer = this._strBuffer.slice(index);
+        }
 
-		return token;
-	};
+        return token;
+    };
 
-	this.advancePastToken = function( token ) {
-		var index = this._strBuffer.indexOf( token );
-		if (index < 0) {
-			console.log( "could not find token: " + token + " in string: " + this._strBuffer );
+    this.advancePastToken = function (token) {
+        var index = this._strBuffer.indexOf(token);
+        if (index < 0) {
+            console.log("could not find token: " + token + " in string: " + this._strBuffer);
         } else {
-			this._strBuffer = this._strBuffer.substr( index + token.length );
+            this._strBuffer = this._strBuffer.substr(index + token.length);
         }
-	}
-
+    };
 };
 
 if (typeof exports === "object") {
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 47059533..6dabc759 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -66,9 +66,8 @@ var PulseMaterial = function PulseMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function( world )
-	{
+	// duplicate method required
+	this.dup = function( world ) {
 		// save the world
 		if (world)  this.setWorld( world );
 
@@ -86,8 +85,7 @@ var PulseMaterial = function PulseMaterial() {
 		return newMat;
 	};
 
-	this.init = function( world )
-	{
+	this.init = function( world ) {
 		// save the world
 		if (world)  this.setWorld( world );
 
@@ -233,7 +231,7 @@ var PulseMaterial = function PulseMaterial() {
         }
 
 		return rtnStr;
-	}
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 8a624556..67ed81af 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -1,8 +1,8 @@
 /* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -11,263 +11,255 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "RadialBlurMaterial";
-	this._shaderName = "radialBlur";
+    this._name = "RadialBlurMaterial";
+    this._shaderName = "radialBlur";
 
-	this._texMap = 'assets/images/cubelight.png';
-	this._color = [1,0,0,1];
+    this._texMap = 'assets/images/cubelight.png';
+    this._color = [1, 0, 0, 1];
 
-	this._time = 0.0;
-	this._dTime = 0.01;
+    this._time = 0.0;
+    this._dTime = 0.01;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.getName		= function()	{ return this._name;			};
-	this.getShaderName	= function()	{  return this._shaderName;		};
+    this.getName = function () { return this._name; };
+    this.getShaderName = function () { return this._shaderName; };
 
-	this.getTextureMap			= function()		{  return this._texMap.slice(0);	};
-	this.setTextureMap			= function(m)		{  this._propValues[this._propNames[0]] = m.slice(0);  this.updateTexture();  	};
+    this.getTextureMap = function () { return this._texMap.slice(0); };
+    this.setTextureMap = function (m) { this._propValues[this._propNames[0]] = m.slice(0); this.updateTexture(); };
 
-	this.isAnimated				= function()		{  return true;		};
+    this.isAnimated = function () { return true; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["texmap",			"color"];
-	this._propLabels		= ["Texture map",		"Color"];
-	this._propTypes			= ["file",				"color"];
-	this._propValues		= [];
-
-	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-	this._propValues[ this._propNames[1] ] = this._color.slice(0);
-
-    this.setProperty = function( prop, value ) {
-		// make sure we have legitimate imput
-		var ok = this.validateProperty( prop, value );
-		if (!ok) {
-			console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value );
+    this._propNames = ["texmap", "color"];
+    this._propLabels = ["Texture map", "Color"];
+    this._propTypes = ["file", "color"];
+    this._propValues = [];
+
+    this._propValues[this._propNames[0]] = this._texMap.slice(0);
+    this._propValues[this._propNames[1]] = this._color.slice(0);
+
+    this.setProperty = function (prop, value) {
+        // make sure we have legitimate imput
+        var ok = this.validateProperty(prop, value);
+        if (!ok) {
+            console.log("invalid property in Radial Gradient Material:" + prop + " : " + value);
         }
 
-		switch (prop)
-		{
-			case "texmap":
-				this.setTextureMap(value);
-				break;
-
-			case "color":
-				this._propValues[prop] = value.slice(0);
-				if (this._shader && this._shader['default']) {
-					this._shader['default'][prop].set(value);
+        switch (prop) {
+            case "texmap":
+                this.setTextureMap(value);
+                break;
+
+            case "color":
+                this._propValues[prop] = value.slice(0);
+                if (this._shader && this._shader['default']) {
+                    this._shader['default'][prop].set(value);
                 }
-				break;
-		}
-	};
+                break;
+        }
+    };
     ///////////////////////////////////////////////////////////////////////
 
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function( ) {
-		// allocate a new uber material
-		var newMat = new RadialBlurMaterial();
-
-		// 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 ) {
-		// save the world
-		if (world)  this.setWorld( world );
-
-		// set up the shader
-		this._shader = new RDGE.jshader();
-		this._shader.def = radialBlurMaterialDef;
-		this._shader.init();
-
-		// set up the material node
-		this._materialNode = RDGE.createMaterialNode("radialBlurMaterial" + "_" + world.generateUniqueNodeID());
-		this._materialNode.setShader(this._shader);
-
-		this._time = 0;
-		if (this._shader && this._shader['default'])
-			this._shader['default'].u_time.set( [this._time] );
-		this.setProperty( "color", [this._time, 0, 0,  1] );
-
-		// set the shader values in the shader
-		this.updateTexture();
-		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
-		this.update( 0 );
-	};
-
-	this.updateTexture = function() {
-		var material = this._materialNode;
-		if (material) {
-			var technique = material.shaderProgram['default'];
-			var renderer = RDGE.globals.engine.getContext().renderer;
-			if (renderer && technique) {
-				var texMapName = this._propValues[this._propNames[0]];
-				var tex = renderer.getTextureByName(texMapName, 'REPEAT');
-//				if (tex)
-//				{
-//					var res = [tex.image.naturalWidth, tex.image.naturalHeight];
-//					this.setResoloution( res );
-//				}
-				technique.u_tex0.set( tex );
-			}
-		}
-	};
-
-	this.update = function( ) {
-		var material = this._materialNode;