From 4b199cf04af83f59895d4d1e9a2d8443c1ec8e06 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 3 Apr 2012 09:36:14 -0700
Subject: started the flag material

---
 js/lib/rdge/materials/flag-material.js | 142 +++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 js/lib/rdge/materials/flag-material.js

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
new file mode 100644
index 00000000..77991a8c
--- /dev/null
+++ b/js/lib/rdge/materials/flag-material.js
@@ -0,0 +1,142 @@
+/* <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 PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
+
+var FlagMaterial = function FlagMaterial() {
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+	this._name = "FlagMaterial";
+	this._shaderName = "flag";
+
+	this._texMap = 'assets/images/us_flag.png';
+
+	this._time = 0.0;
+	this._dTime = 0.1;
+
+    this._defaultWaveWidth = 1.0;
+    this._defaultWaveHeight = 1.0;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Properties
+    ///////////////////////////////////////////////////////////////////////
+	// all defined in parent PulseMaterial.js
+	// load the local default value
+	this._propNames			= ["texmap",        "wavewidth",        "waveheight" ];
+	this._propLabels		= ["Texture map",   "Wave Width",       "Wave Height" ];
+	this._propTypes			= ["file",          "float",            "float" ];
+	this._propValues		= [];
+
+	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+    this._propValues[ this._propNames[1] ] = this._defaultWaveWidth;
+    this._propValues[ this._propNames[2] ] = this._defaultWaveHeight;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+	// duplcate method requirde
+	this.dup = function( world ) {
+		// allocate a new uber material
+		var newMat = new FlagMaterial();
+
+		// 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 = flagMaterialDef;
+		this._shader.init();
+
+		// set up the material node
+		this._materialNode = createMaterialNode("flagMaterial" + "_" + 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_waveWidth.set(  [this._propValues[ this._propNames[1] ]] );
+            this._shader['default'].u_waveHeight.set( [this._propValues[ this._propNames[2] ]] );
+        }
+
+        // set up the texture
+        var texMapName = this._propValues[this._propNames[0]];
+        this._glTex = new Texture( world, texMapName );
+
+		// set the shader values in the shader
+		this.updateTexture();
+		this.update( 0 );
+	}
+};
+
+///////////////////////////////////////////////////////////////////////////////////////
+// RDGE shader
+ 
+// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
+var flagMaterialDef =
+{'shaders': 
+	{
+		'defaultVShader':"assets/shaders/Flag.vert.glsl",
+		'defaultFShader':"assets/shaders/Flag.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_waveWidth'  :   { 'type' : 'float' },
+					'u_waveHeight'  :   { 'type' : 'float' }
+				},
+
+				// render states
+				'states' : 
+				{
+					'depthEnable' : true,
+					'offset':[1.0, 0.1]
+				}
+			}
+		]
+	}
+};
+
+FlagMaterial.prototype = new PulseMaterial();
+
+if (typeof exports === "object") {
+    exports.FlagMaterial = FlagMaterial;
+}
+
+
+
+
-- 
cgit v1.2.3


From 0f31002ca696c1ef303d2926a504afd27305e94f Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 4 Apr 2012 05:52:54 -0700
Subject: Added Flag material

---
 js/lib/rdge/materials/flag-material.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index 77991a8c..8d4d1ee3 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -23,6 +23,8 @@ var FlagMaterial = function FlagMaterial() {
     this._defaultWaveWidth = 1.0;
     this._defaultWaveHeight = 1.0;
 
+	this._hasVertexDeformation = true;
+
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
@@ -37,6 +39,10 @@ var FlagMaterial = function FlagMaterial() {
     this._propValues[ this._propNames[1] ] = this._defaultWaveWidth;
     this._propValues[ this._propNames[2] ] = this._defaultWaveHeight;
 
+	// a material can be animated or not. default is not.  
+	// Any material needing continuous rendering should override this method
+	this.isAnimated	= function() {  return true;  };
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From 5a1965bf2ed9a54601ca16fd67555335c510ce08 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 26 Apr 2012 16:40:05 -0700
Subject: Update materials to the new texture model.

Create local world for deleted source canvases
---
 js/lib/rdge/materials/flag-material.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index 8d4d1ee3..312ca1c1 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -5,6 +5,7 @@
  </copyright> */
 
 
+var Material = require("js/lib/rdge/materials/material").Material;
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
 var Texture = require("js/lib/rdge/texture").Texture;
 
@@ -47,19 +48,21 @@ var FlagMaterial = function FlagMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
 	// duplcate method requirde
-	this.dup = function( world ) {
-		// allocate a new uber material
-		var newMat = new FlagMaterial();
+	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 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] );
-        }
+        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 )
@@ -68,12 +71,12 @@ var FlagMaterial = function FlagMaterial() {
 		if (world)  this.setWorld( world );
 
 		// set up the shader
-		this._shader = new jshader();
+		this._shader = new RDGE.jshader();
 		this._shader.def = flagMaterialDef;
 		this._shader.init();
 
 		// set up the material node
-		this._materialNode = createMaterialNode("flagMaterial" + "_" + world.generateUniqueNodeID());
+		this._materialNode = RDGE.createMaterialNode("flagMaterial" + "_" + world.generateUniqueNodeID());
 		this._materialNode.setShader(this._shader);
 
 		this._time = 0;
-- 
cgit v1.2.3


From 50ede4afa801f53caff7939dad0408f9a0a8b744 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 22 May 2012 15:44:51 -0700
Subject: Editable parameters for flag, pulse, uber, and radial gradient
 materials.

---
 js/lib/rdge/materials/flag-material.js | 81 +++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 7 deletions(-)

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index 312ca1c1..fa844cc3 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -21,8 +21,9 @@ var FlagMaterial = function FlagMaterial() {
 	this._time = 0.0;
 	this._dTime = 0.1;
 
-    this._defaultWaveWidth = 1.0;
-    this._defaultWaveHeight = 1.0;
+	this._speed = 1.0;
+    this._waveWidth = 1.0;
+    this._waveHeight = 1.0;
 
 	this._hasVertexDeformation = true;
 
@@ -31,14 +32,16 @@ var FlagMaterial = function FlagMaterial() {
     ///////////////////////////////////////////////////////////////////////
 	// all defined in parent PulseMaterial.js
 	// load the local default value
-	this._propNames			= ["texmap",        "wavewidth",        "waveheight" ];
-	this._propLabels		= ["Texture map",   "Wave Width",       "Wave Height" ];
-	this._propTypes			= ["file",          "float",            "float" ];
+	this._propNames			= ["texmap",        "wavewidth",        "waveheight",		"speed" ];
+	this._propLabels		= ["Texture map",   "Wave Width",       "Wave Height",		"Speed" ];
+	this._propTypes			= ["file",          "float",            "float",			"float" ];
 	this._propValues		= [];
 
 	this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-    this._propValues[ this._propNames[1] ] = this._defaultWaveWidth;
-    this._propValues[ this._propNames[2] ] = this._defaultWaveHeight;
+    this._propValues[ this._propNames[1] ] = this._waveWidth;
+    this._propValues[ this._propNames[2] ] = this._waveHeight;
+    this._propValues[ this._propNames[3] ] = this._speed;
+
 
 	// a material can be animated or not. default is not.  
 	// Any material needing continuous rendering should override this method
@@ -65,6 +68,68 @@ var FlagMaterial = function FlagMaterial() {
         return newMat;
 	};
 
+	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 "wavewidth":
+				this._waveWidth = value;
+				this._propValues[ this._propNames[1] ] = this._waveWidth;
+				this.updateParameters();
+				break;
+
+			case "waveheight":
+				this._waveHeight = value;
+				this._propValues[ this._propNames[2] ] = this._waveHeight;
+				this.updateParameters();
+				break;
+
+			case "speed":
+				this._speed = value;
+				this._propValues[ this._propNames[3] ] = this._speed;
+				this.updateParameters();
+				break;
+
+			case "color":
+				break;
+		}
+	};
+
+
+	this.updateParameters = function()
+	{
+		this._propValues[ this._propNames[1] ] = this._waveWidth;
+		this._propValues[ this._propNames[2] ] = this._waveHeight;
+		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_waveWidth.set( [this._waveWidth] );
+					this._shader['default'].u_waveHeight.set( [this._waveHeight] );
+				}
+			}
+		}
+	};
+
+
 	this.init = function( world )
 	{
 		// save the world
@@ -91,6 +156,7 @@ var FlagMaterial = function FlagMaterial() {
         this._glTex = new Texture( world, texMapName );
 
 		// set the shader values in the shader
+		this.updateParameters();
 		this.updateTexture();
 		this.update( 0 );
 	}
@@ -125,6 +191,7 @@ var flagMaterialDef =
 				{
 					'u_tex0': { 'type' : 'tex2d' },
 					'u_time' : { 'type' : 'float' },
+					'u_speed' : { 'type' : 'float' },
 					'u_waveWidth'  :   { 'type' : 'float' },
 					'u_waveHeight'  :   { 'type' : 'float' }
 				},
-- 
cgit v1.2.3


From 335ce503996e3ccbd2909086328d0a31fbd03370 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 31 May 2012 17:07:10 -0700
Subject: Added the flag shader to the runtime.

---
 js/lib/rdge/materials/flag-material.js | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index fa844cc3..d1788fb8 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -160,6 +160,37 @@ var FlagMaterial = function FlagMaterial() {
 		this.updateTexture();
 		this.update( 0 );
 	}
+
+	this.exportJSON = function () {
+		var jObj =
+		{
+			'material'		: this.getShaderName(),
+			'name'			: this.getName(),
+
+			'texMap'		: this._propValues[this._propNames[0]],
+			'waveWidth'		: this._propValues[this._propNames[1]],
+			'waveHeight'	: this._propValues[this._propNames[2]],
+			'speed'			: this._propValues[this._propNames[3]]
+		};
+
+		return jObj;
+	};
+
+	this.importJSON = function (jObj) {
+		if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
+		this.setName(jObj.name);
+
+		try {
+
+			this._texMap	 = this._propValues[this._propNames[0]] = jObj.texMap;
+			this._waveWidth  = this._propValues[this._propNames[1]] = jObj.waveWidth;
+			this._waveHeight = this._propValues[this._propNames[2]] = jObj.waveHeight;
+			this._speed		 = this._propValues[this._propNames[3]] = jObj.speed;
+		}
+		catch (e) {
+			throw new Error("could not import material: " + importStr);
+		}
+	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


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/flag-material.js | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'js/lib/rdge/materials/flag-material.js')

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 )
 	{
-- 
cgit v1.2.3


From db2bb0ab5d2747f0d07878e3b8a7d2d10c755110 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 7 Jun 2012 17:07:21 -0700
Subject: Material cleanup

---
 js/lib/rdge/materials/flag-material.js | 110 ++-------------------------------
 1 file changed, 5 insertions(+), 105 deletions(-)

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index aaf36ebf..a8c319e4 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -32,7 +32,7 @@ var FlagMaterial = function FlagMaterial() {
     ///////////////////////////////////////////////////////////////////////
 	// all defined in parent PulseMaterial.js
 	// load the local default value
-	this._propNames			= ["texmap",        "wavewidth",        "waveheight",		"speed" ];
+	this._propNames			= ["u_tex0",        "u_waveWidth",      "u_waveHeight",		"u_speed" ];
 	this._propLabels		= ["Texture map",   "Wave Width",       "Wave Height",		"Speed" ];
 	this._propTypes			= ["file",          "float",            "float",			"float" ];
 	this._propValues		= [];
@@ -45,75 +45,14 @@ var FlagMaterial = function FlagMaterial() {
 
 	// a material can be animated or not. default is not.  
 	// Any material needing continuous rendering should override this method
-	this.isAnimated	= function() {  return true;  };
+	this.isAnimated	= function()			{  return true;  };
+	this.getShaderDef		= function()	{  return flagMaterialDef;	}
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
 	// duplcate method requirde
 
-	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 "wavewidth":
-				this._waveWidth = value;
-				this._propValues[ this._propNames[1] ] = this._waveWidth;
-				this.updateParameters();
-				break;
-
-			case "waveheight":
-				this._waveHeight = value;
-				this._propValues[ this._propNames[2] ] = this._waveHeight;
-				this.updateParameters();
-				break;
-
-			case "speed":
-				this._speed = value;
-				this._propValues[ this._propNames[3] ] = this._speed;
-				this.updateParameters();
-				break;
-
-			case "color":
-				break;
-		}
-	};
-
-
-	this.updateParameters = function()
-	{
-		this._propValues[ this._propNames[1] ] = this._waveWidth;
-		this._propValues[ this._propNames[2] ] = this._waveHeight;
-		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_waveWidth.set( [this._waveWidth] );
-					this._shader['default'].u_waveHeight.set( [this._waveHeight] );
-				}
-			}
-		}
-	};
-
-
 	this.init = function( world )
 	{
 		// save the world
@@ -129,52 +68,13 @@ var FlagMaterial = function FlagMaterial() {
 		this._materialNode.setShader(this._shader);
 
 		this._time = 0;
-		if (this._shader && this._shader['default']) {
+		if (this._shader && this._shader['default'])
 			this._shader['default'].u_time.set( [this._time] );
-            this._shader['default'].u_waveWidth.set(  [this._propValues[ this._propNames[1] ]] );
-            this._shader['default'].u_waveHeight.set( [this._propValues[ this._propNames[2] ]] );
-        }
-
-        // set up the texture
-        var texMapName = this._propValues[this._propNames[0]];
-        this._glTex = new Texture( world, texMapName );
 
 		// set the shader values in the shader
-		this.updateParameters();
-		this.updateTexture();
+		this.setShaderValues();
 		this.update( 0 );
 	}
-
-	this.exportJSON = function () {
-		var jObj =
-		{
-			'material'		: this.getShaderName(),
-			'name'			: this.getName(),
-
-			'texMap'		: this._propValues[this._propNames[0]],
-			'waveWidth'		: this._propValues[this._propNames[1]],
-			'waveHeight'	: this._propValues[this._propNames[2]],
-			'speed'			: this._propValues[this._propNames[3]]
-		};
-
-		return jObj;
-	};
-
-	this.importJSON = function (jObj) {
-		if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
-		this.setName(jObj.name);
-
-		try {
-
-			this._texMap	 = this._propValues[this._propNames[0]] = jObj.texMap;
-			this._waveWidth  = this._propValues[this._propNames[1]] = jObj.waveWidth;
-			this._waveHeight = this._propValues[this._propNames[2]] = jObj.waveHeight;
-			this._speed		 = this._propValues[this._propNames[3]] = jObj.speed;
-		}
-		catch (e) {
-			throw new Error("could not import material: " + importStr);
-		}
-	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From a7aa51e6b91623772eef54b827616432838b560e Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 13 Jun 2012 13:56:10 -0700
Subject: Material bug fixes - reset texture array.

---
 js/lib/rdge/materials/flag-material.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index a8c319e4..d0bf522f 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -27,6 +27,9 @@ var FlagMaterial = function FlagMaterial() {
 
 	this._hasVertexDeformation = true;
 
+    // array textures indexed by shader uniform name
+    this._glTextures = [];
+
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From f0fc7a5678093cce986bd99fef2c5c88add19b68 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 14 Jun 2012 16:09:31 -0700
Subject: Fix for line color.

Name change for all materials
---
 js/lib/rdge/materials/flag-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/lib/rdge/materials/flag-material.js')

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index d0bf522f..7e3c17f9 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -13,7 +13,7 @@ var FlagMaterial = function FlagMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "FlagMaterial";
+	this._name = "Flag";
 	this._shaderName = "flag";
 
 	this._texMap = 'assets/images/us_flag.png';
-- 
cgit v1.2.3