From 96a0a8c916533eb5625816192ed38488f639326d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:00:20 -0800
Subject: Integrating canvas-2d drawing and WebGL fixes, including adding back
 WebGL materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../RDGE/Materials/RadialBlurMaterial.js           | 246 +++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 js/helper-classes/RDGE/Materials/RadialBlurMaterial.js

(limited to 'js/helper-classes/RDGE/Materials/RadialBlurMaterial.js')

diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
new file mode 100644
index 00000000..732800cf
--- /dev/null
+++ b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
@@ -0,0 +1,246 @@
+/* <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> */
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Class GLMaterial
+//      RDGE representation of a material.
+///////////////////////////////////////////////////////////////////////
+function RadialBlurMaterial()
+{
+    // initialize the inherited members
+    this.inheritedFrom = GLMaterial;
+    this.inheritedFrom();
+   
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+	this._name = "RadialBlurMaterial";
+	this._shaderName = "radialBlur";
+
+	this._texMap = 'assets/images/cubelight.png';
+	this._color = [1,0,0,1];
+
+	this._time = 0.0;
+	this._dTime = 0.01;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+	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.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 );
+
+		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;
+		}
+	}
+    ///////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+	// duplcate method requirde
+	this.dup = function( world )
+	{
+		// 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 jshader();
+		this._shader.def = radialBlurMaterialDef;
+		this._shader.init();
+
+		// set up the material node
+		this._materialNode = createMaterialNode("radialBlurMaterial");
+		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 = g_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( 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] );
+				var color = this.getProperty( "color" );
+				color[0] = this._time;
+				this.setProperty( "color", color );
+				//console.log( "update color to: " + color );
+				this._time += this._dTime;
+			}
+		}
+	}
+
+	this.setResolution = function( res )
+	{
+		var material = this._materialNode;
+		if (material)
+		{
+			var technique = material.shaderProgram.default;
+			var renderer = g_Engine.getContext().renderer;
+			if (renderer && technique)
+			{
+				technique.u_resolution.set( res );
+			}
+		}
+	}
+
+	this.export = function()
+	{
+		// every material needs the base type and instance name
+		var exportStr = "material: " + this.getShaderName() + "\n";
+		exportStr += "name: " + this.getName() + "\n";
+		
+		// every material needs to terminate like this
+		exportStr += "endMaterial\n";
+
+		return exportStr;
+	}
+
+	this.import = function( importStr )
+	{
+		var pu = new ParseUtils( importStr );
+		var material = pu.nextValue( "material: " );
+		if (material != this.getShaderName())  throw new Error( "ill-formed material" );
+		this.setName(  pu.nextValue( "name: ") );
+
+		var rtnStr;
+		
+		return rtnStr;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+// RDGE shader
+ 
+// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
+var radialBlurMaterialDef =
+{'shaders': 
+	{
+		'defaultVShader':"assets/shaders/Basic.vert.glsl",
+		'defaultFShader':"assets/shaders/radialBlur.frag.glsl"
+	},
+	'techniques':
+	{ 
+		'default':
+		[
+			{
+				'vshader' : 'defaultVShader',
+				'fshader' : 'defaultFShader',
+				// attributes
+				'attributes' :
+				{
+					'vert'  :   { 'type' : 'vec3' },
+					'normal' :  { 'type' : 'vec3' },
+					'texcoord'  :   { 'type' : 'vec2' }
+				},
+				// parameters
+				'params' : 
+				{
+					'u_tex0': { 'type' : 'tex2d' },
+					'u_time' : { 'type' : 'float' },
+					'u_resolution'  :   { 'type' : 'vec2' },
+					'color' :   { 'type' : 'vec4' }
+				},
+
+				// render states
+				'states' : 
+				{
+					'depthEnable' : true,
+					'offset':[1.0, 0.1]
+				},
+			},
+		]
+	}
+};
+
+
+
+
-- 
cgit v1.2.3


From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:36:19 -0800
Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including
 adding back WebGL materials."

This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
---
 .../RDGE/Materials/RadialBlurMaterial.js           | 246 ---------------------
 1 file changed, 246 deletions(-)
 delete mode 100644 js/helper-classes/RDGE/Materials/RadialBlurMaterial.js

(limited to 'js/helper-classes/RDGE/Materials/RadialBlurMaterial.js')

diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
deleted file mode 100644
index 732800cf..00000000
--- a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/* <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> */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-//      RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function RadialBlurMaterial()
-{
-    // initialize the inherited members
-    this.inheritedFrom = GLMaterial;
-    this.inheritedFrom();
-   
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-	this._name = "RadialBlurMaterial";
-	this._shaderName = "radialBlur";
-
-	this._texMap = 'assets/images/cubelight.png';
-	this._color = [1,0,0,1];
-
-	this._time = 0.0;
-	this._dTime = 0.01;
-
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-	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.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 );
-
-		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;
-		}
-	}
-    ///////////////////////////////////////////////////////////////////////
-
-
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function( world )
-	{
-		// 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 jshader();
-		this._shader.def = radialBlurMaterialDef;
-		this._shader.init();
-
-		// set up the material node
-		this._materialNode = createMaterialNode("radialBlurMaterial");
-		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 = g_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( 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] );
-				var color = this.getProperty( "color" );
-				color[0] = this._time;
-				this.setProperty( "color", color );
-				//console.log( "update color to: " + color );
-				this._time += this._dTime;
-			}
-		}
-	}
-
-	this.setResolution = function( res )
-	{
-		var material = this._materialNode;
-		if (material)
-		{
-			var technique = material.shaderProgram.default;
-			var renderer = g_Engine.getContext().renderer;
-			if (renderer && technique)
-			{
-				technique.u_resolution.set( res );
-			}
-		}
-	}
-
-	this.export = function()
-	{
-		// every material needs the base type and instance name
-		var exportStr = "material: " + this.getShaderName() + "\n";
-		exportStr += "name: " + this.getName() + "\n";
-		
-		// every material needs to terminate like this
-		exportStr += "endMaterial\n";
-
-		return exportStr;
-	}
-
-	this.import = function( importStr )
-	{
-		var pu = new ParseUtils( importStr );
-		var material = pu.nextValue( "material: " );
-		if (material != this.getShaderName())  throw new Error( "ill-formed material" );
-		this.setName(  pu.nextValue( "name: ") );
-
-		var rtnStr;
-		
-		return rtnStr;
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-// RDGE shader
- 
-// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
-var radialBlurMaterialDef =
-{'shaders': 
-	{
-		'defaultVShader':"assets/shaders/Basic.vert.glsl",
-		'defaultFShader':"assets/shaders/radialBlur.frag.glsl"
-	},
-	'techniques':
-	{ 
-		'default':
-		[
-			{
-				'vshader' : 'defaultVShader',
-				'fshader' : 'defaultFShader',
-				// attributes
-				'attributes' :
-				{
-					'vert'  :   { 'type' : 'vec3' },
-					'normal' :  { 'type' : 'vec3' },
-					'texcoord'  :   { 'type' : 'vec2' }
-				},
-				// parameters
-				'params' : 
-				{
-					'u_tex0': { 'type' : 'tex2d' },
-					'u_time' : { 'type' : 'float' },
-					'u_resolution'  :   { 'type' : 'vec2' },
-					'color' :   { 'type' : 'vec4' }
-				},
-
-				// render states
-				'states' : 
-				{
-					'depthEnable' : true,
-					'offset':[1.0, 0.1]
-				},
-			},
-		]
-	}
-};
-
-
-
-
-- 
cgit v1.2.3


From d5b216d9d6d2b8cb93106e8f8ca351089d05b41d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:52:31 -0800
Subject: Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL
 materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../RDGE/Materials/RadialBlurMaterial.js           | 246 +++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 js/helper-classes/RDGE/Materials/RadialBlurMaterial.js

(limited to 'js/helper-classes/RDGE/Materials/RadialBlurMaterial.js')

diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
new file mode 100644
index 00000000..732800cf
--- /dev/null
+++ b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
@@ -0,0 +1,246 @@
+/* <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> */
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Class GLMaterial
+//      RDGE representation of a material.
+///////////////////////////////////////////////////////////////////////
+function RadialBlurMaterial()
+{
+    // initialize the inherited members
+    this.inheritedFrom = GLMaterial;
+    this.inheritedFrom();
+   
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+	this._name = "RadialBlurMaterial";
+	this._shaderName = "radialBlur";
+
+	this._texMap = 'assets/images/cubelight.png';
+	this._color = [1,0,0,1];
+
+	this._time = 0.0;
+	this._dTime = 0.01;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+	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.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 );
+
+		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;
+		}
+	}
+    ///////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+	// duplcate method requirde
+	this.dup = function( world )
+	{
+		// 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 jshader();
+		this._shader.def = radialBlurMaterialDef;
+		this._shader.init();
+
+		// set up the material node
+		this._materialNode = createMaterialNode("radialBlurMaterial");
+		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 = g_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( 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] );
+				var color = this.getProperty( "color" );
+				color[0] = this._time;
+				this.setProperty( "color", color );
+				//console.log( "update color to: " + color );
+				this._time += this._dTime;
+			}
+		}
+	}
+
+	this.setResolution = function( res )
+	{
+		var material = this._materialNode;
+		if (material)
+		{
+			var technique = material.shaderProgram.default;
+			var renderer = g_Engine.getContext().renderer;
+			if (renderer && technique)
+			{
+				technique.u_resolution.set( res );
+			}
+		}
+	}
+
+	this.export = function()
+	{
+		// every material needs the base type and instance name
+		var exportStr = "material: " + this.getShaderName() + "\n";
+		exportStr += "name: " + this.getName() + "\n";
+		
+		// every material needs to terminate like this
+		exportStr += "endMaterial\n";
+
+		return exportStr;
+	}
+
+	this.import = function( importStr )
+	{
+		var pu = new ParseUtils( importStr );
+		var material = pu.nextValue( "material: " );
+		if (material != this.getShaderName())  throw new Error( "ill-formed material" );
+		this.setName(  pu.nextValue( "name: ") );
+
+		var rtnStr;
+		
+		return rtnStr;
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+// RDGE shader
+ 
+// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
+var radialBlurMaterialDef =
+{'shaders': 
+	{
+		'defaultVShader':"assets/shaders/Basic.vert.glsl",
+		'defaultFShader':"assets/shaders/radialBlur.frag.glsl"
+	},
+	'techniques':
+	{ 
+		'default':
+		[
+			{
+				'vshader' : 'defaultVShader',
+				'fshader' : 'defaultFShader',
+				// attributes
+				'attributes' :
+				{
+					'vert'  :   { 'type' : 'vec3' },
+					'normal' :  { 'type' : 'vec3' },
+					'texcoord'  :   { 'type' : 'vec2' }
+				},
+				// parameters
+				'params' : 
+				{
+					'u_tex0': { 'type' : 'tex2d' },
+					'u_time' : { 'type' : 'float' },
+					'u_resolution'  :   { 'type' : 'vec2' },
+					'color' :   { 'type' : 'vec4' }
+				},
+
+				// render states
+				'states' : 
+				{
+					'depthEnable' : true,
+					'offset':[1.0, 0.1]
+				},
+			},
+		]
+	}
+};
+
+
+
+
-- 
cgit v1.2.3


From 7b9b1e6dab88875b85230fc6f4fa0fca94e8b82f Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 16:21:39 -0800
Subject: PulseMaterial and RadialBlurMaterial had typos in their import code.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/RDGE/Materials/RadialBlurMaterial.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'js/helper-classes/RDGE/Materials/RadialBlurMaterial.js')

diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
index 732800cf..a5fb134c 100644
--- a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
+++ b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
@@ -192,6 +192,17 @@ function RadialBlurMaterial()
 		this.setName(  pu.nextValue( "name: ") );
 
 		var rtnStr;
+        try
+        {
+            var endKey = "endMaterial\n";
+            var index = importStr.indexOf( endKey );
+            index += endKey.length;
+            rtnStr = importStr.substr( index );
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + importStr );
+        }
 		
 		return rtnStr;
 	}
-- 
cgit v1.2.3