From 19c975cfb16f1cccc9e9f86255575499315d421e Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 2 Apr 2012 10:23:28 -0700
Subject: texture abstraction

---
 js/lib/rdge/materials/uber-material.js | 232 +++++----------------------------
 1 file changed, 34 insertions(+), 198 deletions(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index c1d1913c..ca244629 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -6,6 +6,7 @@
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
+var Texture = require("js/lib/rdge/texture").Texture;
 
 var UberMaterial = function UberMaterial() {
     ///////////////////////////////////////////////////////////////////////
@@ -23,7 +24,8 @@ var UberMaterial = function UberMaterial() {
 	this._environmentAmount = 0.2;		// 0 .. 1
 
 	// set the default maps
-	this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
+	//this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
+	this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
 	this._normalMapOb = { 'texture' : 'assets/images/rocky-normal.jpg', 'wrap' : 'REPEAT' };
 	this._specularMapOb = { 'texture' : 'assets/images/rocky-spec.jpg', 'wrap' : 'REPEAT' };
 	this._environmentMapOb = { 'texture' : 'assets/images/silver.png', 'wrap' : 'CLAMP', 'envReflection' : this._environmentAmount };
@@ -34,6 +36,9 @@ var UberMaterial = function UberMaterial() {
 	this._useEnvironmentMap	= true;
 	this._useLights			= [true, true, true, true];
 
+    // these are the abstracted texture objects - defined where they are set
+    this._diffuseTexture;
+
 	this._MAX_LIGHTS		= 4;
 
     ///////////////////////////////////////////////////////////////////////
@@ -189,6 +194,7 @@ var UberMaterial = function UberMaterial() {
 		if (material) {
 			var technique = material.shaderProgram.defaultTechnique;    
 			technique.u_diffuseColor.set(this._diffuseColor);
+            this.getWorld().restartRenderLoop();
 		}
 	};
 
@@ -258,6 +264,7 @@ var UberMaterial = function UberMaterial() {
 		if ((value == null) || (value.length == 0)) {
 			if (this._useDiffuseMap) {
 				this._useDiffuseMap = false;
+                this._diffuseTexture = undefined;
 				this.rebuildShader();
 			}
 		} else {
@@ -270,8 +277,8 @@ var UberMaterial = function UberMaterial() {
 					var technique = material.shaderProgram.defaultTechnique;
 					var renderer = g_Engine.getContext().renderer;
 					if (renderer && technique) {
-						var tex = renderer.getTextureByName(value, caps.diffuseMap.wrap);
-						this.registerTexture( tex );
+                        this._diffuseTexture = new Texture( this.getWorld(), value,  caps.diffuseMap.wrap );
+                        var tex = this._diffuseTexture.getTexture();
 						technique.s_diffuseMap.set( tex );
 					}
 				}
@@ -370,118 +377,29 @@ var UberMaterial = function UberMaterial() {
 		this._materialNode.setShader(this._shader);
 	};
 
-	this.import = function( importStr )
-	{
-		// limit the key searches to this material
-        var endKey = "endMaterial\n";
-        var index = importStr.indexOf( endKey );
-        index += endKey.length;
-        importStr = importStr.slice( 0, index );
-		var pu = new MaterialParser( importStr );
-
-		var matProps = pu.nextValue( "materialProps: " );
-		if (matProps)
-		{
-			var ambientColor  = eval( "[" + pu.nextValue("ambientColor: ")   + ']' );	 this.setProperty( "ambientColor", ambientColor );
-			var diffuseColor  = eval( "[" + pu.nextValue( "diffuseColor: ")  + ']' );	 this.setProperty( "diffuseColor", diffuseColor );
-			var specularColor = eval( "[" + pu.nextValue( "specularColor: ") + ']' );	 this.setProperty( "specularColor", specularColor );
-			var specularPower = eval( "[" + pu.nextValue( "specularPower: ") + ']' );    this.setProperty( "specularPower", specularPower );
-		}
-
-		var lightProps = pu.nextValue( "lightProps: " );
-		if (lightProps)
-		{
-			this._lights = [];
-			var lightStr;
-			for (var i=0;  i<this._MAX_LIGHTS;  i++)
-			{
-				var type = pu.nextValue( "light" + i + ": " );
-				if (type)
-				{
-						var light = new Object;
-						switch (type)
-						{
-							case "directional":
-								lightStr = pu.nextValue( 'light' + i + 'Dir: ');
-								light.direction = eval( "[" + lightStr + "]" );
-								break;
-
-							case "spot":
-								lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
-								light.position =  eval( "[" + lightStr + "]" );
-
-								lightStr = pu.nextValue( 'light' + i + 'OuterSpotCutoff: ' );
-								light['spotInnerCutoff'] = Number( lightStr );
-
-								lightStr = pu.nextValue( 'light' + i + 'InnerSpotCutoff: ' );
-								light['spotOuterCutoff'] = Number( lightStr );
-								break;
-
-							case "point":
-								lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
-								light.position =  eval( "[" + lightStr + "]" );
-
-								lightStr = pu.nextValue( 'light' + i + 'Attenuation: ' );
-								light.attenuation =  eval( "[" + lightStr + "]" );
-								break;
-
-							default:
-								throw new Error( "unrecognized light type on import: " + type );
-								break;
-						}
-
-						// common to all lights
-						light.diffuseColor = eval( "[" + pu.nextValue( 'light' + i + 'Color: ') + "]" );
-						light.specularColor = eval( "[" + pu.nextValue( 'light' + i + 'SpecularColor: ') + "]" );
-
-						// push the light
-						this._lights.push( light );
-				}
-				else
-					this._lights[i] = 'undefined';
-
-				// advance to the next light
-				var endLightKey = "endMaterial\n";
-				index = importStr.indexOf( endLightKey );
-				if (index < 0)  throw new Error( "ill-formed light encountered in import" );
-				index += endLightKey.length;
-				importStr = importStr.slice( 0, index );
-
-			}
-
-			if (this._lights.length > 0)
-			{
-				this._ubershaderCaps.lighting =
-				{
-					'light0' : this._lights[0],
-					'light1' : this._lights[1],
-					'light2' : this._lights[2],        
-					'light3' : this._lights[3]                                     
-				}
-			}
-		}
-
-		var diffuseMap = pu.nextValue( "diffuseMap: "  )
-		if(diffuseMap)
-			this.setProperty( "diffuseMap", diffuseMap );
-
-		var normalMap = pu.nextValue( "normalMap: "  );
-		if(normalMap)
-			this.setProperty( "normalMap", normalMap );
-
-		var specularMap = pu.nextValue( "specularMap: "  );
-		if(specularMap)
-			this.setProperty( "specularMap", specularMap );
-
-		var environmentMap = pu.nextValue( "environmentMap: "  );
-		if(environmentMap)
-		{
-			this.setProperty( "environmentMap", environmentMap );
-			this.setProperty( "environmentAmount", Number( pu.nextValue( "environmentAmount" ) ) );
-		}
+    this.update = function()
+    {
+		var material = this._materialNode;
+		if (material)
+        {
+		    var technique = material.shaderProgram.defaultTechnique;
+		    var renderer = g_Engine.getContext().renderer;
+		    if (renderer && technique)
+            {
+                if (this._diffuseTexture && this._diffuseTexture.isAnimated())
+                {
+                    this._diffuseTexture.rerender();
+				    technique.s_diffuseMap.set( this._diffuseTexture.getTexture() );
+                }
+            }
+        }
+    }
 
-		this.rebuildShader();
-	}
+    this.isAnimated	= function()
+    {
+        var anim = (this._diffuseTexture && this._diffuseTexture.isAnimated());
+        return anim;
+    }
 
 	this.importJSON = function( jObj )
 	{
@@ -658,88 +576,6 @@ var UberMaterial = function UberMaterial() {
 		return jObj;
 	}
 
-
-	this.export = function()
-	{
-		// every material needs the base type and instance name
-		var exportStr = "material: " + this.getShaderName() + "\n";
-		exportStr += "name: " + this.getName() + "\n";
-
-		var caps = this._ubershaderCaps;
-		
-		// export the material properties
-		if (typeof caps.material != 'undefined')
-		{
-			exportStr += "materialProps: true\n";
-			exportStr += "ambientColor: " + this._ambientColor + "\n";
-			exportStr += "diffuseColor: " + this._diffuseColor + "\n";
-			exportStr += "specularColor: " + this._specularColor + "\n";
-			exportStr += "specularPower: " + this._specularPower + "\n";
-		}
-
-		if (typeof caps.lighting != 'undefined')
-		{
-			exportStr += "lightProps: true\n";
-
-			var light = caps.lighting['light' + i];
-			for (var i=0;  i<this._MAX_LIGHTS;  i++)
-			{
-				var light = caps.lighting["light" + i];
-				if( typeof light != "undefined")
-				{
-					exportStr += "light" + i + ': ' + light.type + "\n";
-
-					// output the light secific data
-					if (light.type === 'directional')
-					{
-						exportStr += 'light' + i + 'Dir: ' + light['direction'] + '\n';
-					}
-					else if (light.type === 'spot')
-					{
-						exportStr += 'light' + i + 'Pos: ' + light['position'] + '\n';
-						exportStr += 'light' + i + 'SpotInnerCutoff: ' + light['spotInnerCutoff'] + '\n';
-						exportStr += 'light' + i + 'SpotOuterCutoff: ' + light['spotOuterCutoff'] + '\n';
-					}
-					else		// light.type === 'point'
-					{
-						exportStr += 'light' + i + 'Pos: ' + (light['position'] || [ 0, 0, 0 ]) + '\n';
-						exportStr += 'light' + i + 'Attenuation: ' + (light['attenuation'] || [ 1, 0, 0 ]) + '\n';
-					}
-
-					// common to all lights
-					exportStr += 'light' + i + 'Color: ' + (light['diffuseColor'] || [ 1,1,1,1 ]) + '\n';
-					exportStr += 'light' + i + 'SpecularColor: ' + (light['specularColor'] || [ 1, 1, 1, 1 ]) + '\n'; 
-					
-					exportStr += "endlight\n";          
-				}
-			}
-		}
-
-		var world = this.getWorld();
-		if (!world)
-			throw new Error( "no world in material.export, " + this.getName() );
-
-		if(typeof caps.diffuseMap != 'undefined')
-			exportStr += "diffuseMap: " + caps.diffuseMap.texture + "\n";
-
-		if(typeof caps.normalMap != 'undefined')
-			exportStr += "normalMap: " + caps.normalMap.texture + "\n";
-
-		if(typeof caps.specularMap != 'undefined')
-			exportStr += "specularMap: " + caps.specularMap.texture + "\n";
-
-		if(typeof caps.environmentMap != 'undefined')
-		{
-			exportStr += "environmentMap: " + caps.environmentMap.texture + "\n";
-			exportStr += "environmentAmount: " + caps.environmentMap.envReflection + "\n";
-		}
-		
-		// every material needs to terminate like this
-		exportStr += "endMaterial\n";
-
-		return exportStr;
-	}
-
 	this.buildUberShader = function(caps)
 	{
 		var preproc = "";
@@ -894,8 +730,8 @@ var UberMaterial = function UberMaterial() {
 	
 		var renderer = g_Engine.getContext().renderer;
 		if(this._useDiffuseMap) {
-			var tex = renderer.getTextureByName(caps.diffuseMap.texture, caps.diffuseMap.wrap, caps.diffuseMap.mips);
-			this.registerTexture( tex );
+            this._diffuseTexture = new Texture( this.getWorld(), caps.diffuseMap.texture,  caps.diffuseMap.wrap, caps.diffuseMap.mips );
+            var tex = this._diffuseTexture.getTexture();
 			technique.s_diffuseMap.set( tex );
 		}
 
-- 
cgit v1.2.3


From 416ce9d4954e0a7f4ee7b9afe43bf691fdb276f4 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 6 Apr 2012 05:18:48 -0700
Subject: texture notifications

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

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index ca244629..71354216 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -286,6 +286,30 @@ var UberMaterial = function UberMaterial() {
 		}
 	};
 
+		
+	this.updateTextures = function()
+	{
+		var material = this._materialNode;
+		if (material)
+		{
+			var technique = material.shaderProgram.defaultTechnique;
+			var renderer = g_Engine.getContext().renderer;
+			if (renderer && technique)
+			{
+				if (this._diffuseTexture)
+				{
+					if (!this._diffuseTexture.isAnimated())
+					{
+						this._diffuseTexture.rerender();
+                        var tex = this._diffuseTexture.getTexture();
+						technique.s_diffuseMap.set( tex );
+					}
+				}
+			}
+		}
+	}
+
+
 	this.updateSpecularMap = function() {
 		var value = this._propValues[ "specularMap" ];
 		this._specularMapOb.texture = value;
-- 
cgit v1.2.3


From 5b878fdfaa696c1a01afa191c1d65c0ccb006b65 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Sun, 8 Apr 2012 05:26:08 -0700
Subject: Clouds

---
 js/lib/rdge/materials/uber-material.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 71354216..4edb101f 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -300,7 +300,7 @@ var UberMaterial = function UberMaterial() {
 				{
 					if (!this._diffuseTexture.isAnimated())
 					{
-						this._diffuseTexture.rerender();
+						this._diffuseTexture.render();
                         var tex = this._diffuseTexture.getTexture();
 						technique.s_diffuseMap.set( tex );
 					}
@@ -412,7 +412,7 @@ var UberMaterial = function UberMaterial() {
             {
                 if (this._diffuseTexture && this._diffuseTexture.isAnimated())
                 {
-                    this._diffuseTexture.rerender();
+                    this._diffuseTexture.render();
 				    technique.s_diffuseMap.set( this._diffuseTexture.getTexture() );
                 }
             }
-- 
cgit v1.2.3


From f13d0f45f6b449764898e99db309c43b51a33476 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 19 Apr 2012 13:39:54 -0700
Subject: chaned textures

---
 js/lib/rdge/materials/uber-material.js | 64 +++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index d7bc2a87..a2c782d8 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -24,8 +24,8 @@ var UberMaterial = function UberMaterial() {
     this._environmentAmount = 0.2; 	// 0 .. 1
 
     // set the default maps
-	this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
-	//this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
+	//this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
+	this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
     this._normalMapOb = { 'texture': 'assets/images/rocky-normal.jpg', 'wrap': 'REPEAT' };
     this._specularMapOb = { 'texture': 'assets/images/rocky-spec.jpg', 'wrap': 'REPEAT' };
     this._environmentMapOb = { 'texture': 'assets/images/silver.png', 'wrap': 'CLAMP', 'envReflection': this._environmentAmount };
@@ -255,34 +255,34 @@ var UberMaterial = function UberMaterial() {
         }
     };
 
-    this.updateDiffuseMap = function (value) {
-        var value = this._propValues["diffuseMap"];
-        this._diffuseMapOb.texture = value;
+ 	this.updateDiffuseMap = function(value) {
+		var value = this._propValues[ "diffuseMap" ];
+		this._diffuseMapOb.texture = value;
 
-        if ((value == null) || (value.length == 0)) {
-            if (this._useDiffuseMap) {
-                this._useDiffuseMap = false;
+		if ((value == null) || (value.length == 0)) {
+			if (this._useDiffuseMap) {
+				this._useDiffuseMap = false;
                 this._diffuseTexture = undefined;
-                this.rebuildShader();
-            }
-        } else {
-            if (!this._useDiffuseMap) {
-                this._useDiffuseMap = true;
-                this.rebuildShader();
-            } else {
-                var material = this._materialNode;
-                if (material) {
-                    var technique = material.shaderProgram.defaultTechnique;
-                    var renderer = RDGE.globals.engine.getContext().renderer;
-                    if (renderer && technique) {
-                        var tex = renderer.getTextureByName(value, caps.diffuseMap.wrap);
-                        this.registerTexture(tex);
-                        technique.s_diffuseMap.set(tex);
-                    }
-                }
-            }
-        }
-    };
+				this.rebuildShader();
+			}
+		} else {
+			if (!this._useDiffuseMap) {
+				this._useDiffuseMap = true;
+				this.rebuildShader();
+			} else {
+				var material = this._materialNode;
+				if (material) {
+					var technique = material.shaderProgram.defaultTechnique;
+					var renderer = RDGE.globals.engine.getContext().renderer;
+					if (renderer && technique) {
+                        this._diffuseTexture = new Texture( this.getWorld(), value,  caps.diffuseMap.wrap );
+                        var tex = this._diffuseTexture.getTexture();
+						technique.s_diffuseMap.set( tex );
+					}
+				}
+			}
+		}
+	};
 
 		
 	this.updateTextures = function()
@@ -404,7 +404,7 @@ var UberMaterial = function UberMaterial() {
 		if (material)
         {
 		    var technique = material.shaderProgram.defaultTechnique;
-		    var renderer = g_Engine.getContext().renderer;
+		    var renderer = RDGE.globals.engine.getContext().renderer;
 		    if (renderer && technique)
             {
                 if (this._diffuseTexture && this._diffuseTexture.isAnimated())
@@ -738,9 +738,9 @@ var UberMaterial = function UberMaterial() {
 
         var renderer = RDGE.globals.engine.getContext().renderer;
         if (this._useDiffuseMap) {
-            var tex = renderer.getTextureByName(caps.diffuseMap.texture, caps.diffuseMap.wrap, caps.diffuseMap.mips);
-            this.registerTexture(tex);
-            technique.s_diffuseMap.set(tex);
+			this._diffuseTexture = new Texture( this.getWorld(), caps.diffuseMap.texture,  caps.diffuseMap.wrap, caps.diffuseMap.mips );
+            var tex = this._diffuseTexture.getTexture();
+			technique.s_diffuseMap.set( tex );
         }
 
         if (this._useNormalMap) {
-- 
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/uber-material.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index a2c782d8..bc2ba340 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -24,8 +24,8 @@ var UberMaterial = function UberMaterial() {
     this._environmentAmount = 0.2; 	// 0 .. 1
 
     // set the default maps
-	//this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
-	this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
+	this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
+	//this._diffuseMapOb = { 'texture' : 'texture', 'wrap' : 'REPEAT' };
     this._normalMapOb = { 'texture': 'assets/images/rocky-normal.jpg', 'wrap': 'REPEAT' };
     this._specularMapOb = { 'texture': 'assets/images/rocky-spec.jpg', 'wrap': 'REPEAT' };
     this._environmentMapOb = { 'texture': 'assets/images/silver.png', 'wrap': 'CLAMP', 'envReflection': this._environmentAmount };
@@ -366,9 +366,13 @@ var UberMaterial = function UberMaterial() {
 
     // duplcate method requirde
     this.dup = function () {
-        // allocate a new uber material
-        var newMat = new UberMaterial();
 
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new UberMaterial();
         newMat._useDiffuseMap = this._useDiffuseMap;
         newMat._useEnvironmentMap = this._useEnvironmentMap;
         newMat._useLights = this._useLights;
@@ -376,9 +380,7 @@ var UberMaterial = function UberMaterial() {
         newMat._useSpecularMap = this._useSpecularMap;
         newMat.rebuildShader();
 
-        // copy over the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+		// copy over the current values;
         var n = propNames.length;
         for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
-- 
cgit v1.2.3


From d21aaca3d7093b6af968b7f9f764ab54e004f02b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 3 May 2012 16:42:56 -0700
Subject: Cleanup of indirect textures.

---
 js/lib/rdge/materials/uber-material.js | 24 ------------------------
 1 file changed, 24 deletions(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index bc2ba340..9d0cc564 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -284,30 +284,6 @@ var UberMaterial = function UberMaterial() {
 		}
 	};
 
-		
-	this.updateTextures = function()
-	{
-		var material = this._materialNode;
-		if (material)
-		{
-			var technique = material.shaderProgram.defaultTechnique;
-			var renderer = RDGE_globals.engine.getContext().renderer;
-			if (renderer && technique)
-			{
-				if (this._diffuseTexture)
-				{
-					if (!this._diffuseTexture.isAnimated())
-					{
-						this._diffuseTexture.render();
-                        var tex = this._diffuseTexture.getTexture();
-						technique.s_diffuseMap.set( tex );
-					}
-				}
-			}
-		}
-	}
-
-
     this.updateSpecularMap = function () {
         var value = this._propValues["specularMap"];
         this._specularMapOb.texture = value;
-- 
cgit v1.2.3


From cc3b66f817c9d72ca247d5ff789a08ec5b57a2b5 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 22 May 2012 08:38:38 -0700
Subject: Editable material properties

---
 js/lib/rdge/materials/uber-material.js | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 9d0cc564..6de74495 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -180,6 +180,7 @@ var UberMaterial = function UberMaterial() {
     this.updateAmbientColor = function () {
         this._ambientColor = this._propValues['ambientColor'].slice(0);
         var material = this._materialNode;
+		console.log( "ambient color: " + this._ambientColor );
         if (material) {
             var technique = material.shaderProgram.defaultTechnique;
             technique.u_ambientColor.set(this._ambientColor);
-- 
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/uber-material.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 6de74495..0fef78f6 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -247,9 +247,9 @@ var UberMaterial = function UberMaterial() {
                     var technique = material.shaderProgram.defaultTechnique;
                     var renderer = RDGE.globals.engine.getContext().renderer;
                     if (renderer && technique) {
-                        var tex = renderer.getTextureByName(value, caps.environmentMap.wrap);
+                        var tex = renderer.getTextureByName(value, this._ubershaderCaps.environmentMap.wrap);
                         this.registerTexture(tex);
-                        technique.s_environmentMap.set(tex);
+                        technique.s_envMap.set(tex);
                     }
                 }
             }
@@ -276,7 +276,7 @@ var UberMaterial = function UberMaterial() {
 					var technique = material.shaderProgram.defaultTechnique;
 					var renderer = RDGE.globals.engine.getContext().renderer;
 					if (renderer && technique) {
-                        this._diffuseTexture = new Texture( this.getWorld(), value,  caps.diffuseMap.wrap );
+                        this._diffuseTexture = new Texture( this.getWorld(), value,  this._ubershaderCaps.diffuseMap.wrap );
                         var tex = this._diffuseTexture.getTexture();
 						technique.s_diffuseMap.set( tex );
 					}
@@ -304,7 +304,7 @@ var UberMaterial = function UberMaterial() {
                     var technique = material.shaderProgram.defaultTechnique;
                     var renderer = RDGE.globals.engine.getContext().renderer;
                     if (renderer && technique) {
-                        var tex = renderer.getTextureByName(value, caps.specularMap.wrap);
+                        var tex = renderer.getTextureByName(value, this._ubershaderCaps.specularMap.wrap);
                         this.registerTexture(tex);
                         technique.s_specularMap.set(tex);
                     }
@@ -332,7 +332,7 @@ var UberMaterial = function UberMaterial() {
                     var technique = material.shaderProgram.defaultTechnique;
                     var renderer = RDGE.globals.engine.getContext().renderer;
                     if (renderer && technique) {
-                        var tex = renderer.getTextureByName(value, caps.normalMap.wrap);
+                        var tex = renderer.getTextureByName(value, this._ubershaderCaps.normalMap.wrap);
                         this.registerTexture(tex);
                         technique.s_normalMap.set(tex);
                     }
@@ -798,7 +798,7 @@ var UberMaterial = function UberMaterial() {
 
         var material = this._materialNode;
         if (material) {
-            material.setShader(buildUbershader(this._ubershaderCaps));
+            material.setShader( this.buildUberShader(this._ubershaderCaps) );
         }
     };
 };
-- 
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/uber-material.js | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 0fef78f6..9aa0f7ea 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -41,6 +41,9 @@ var UberMaterial = function UberMaterial() {
 
     this._MAX_LIGHTS = 4;
 
+    // array textures indexed by shader uniform name
+    this._glTextures = [];
+
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From bcb0266bb6f9a578d033ad5b7b9869074e4f98a1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 14 Jun 2012 13:55:32 -0700
Subject: Fixed alphabetization of material names.

Removed console output.
Removed texture map field from Mandel material editor.
---
 js/lib/rdge/materials/uber-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 9aa0f7ea..3dffb238 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -183,7 +183,7 @@ var UberMaterial = function UberMaterial() {
     this.updateAmbientColor = function () {
         this._ambientColor = this._propValues['ambientColor'].slice(0);
         var material = this._materialNode;
-		console.log( "ambient color: " + this._ambientColor );
+		//console.log( "ambient color: " + this._ambientColor );
         if (material) {
             var technique = material.shaderProgram.defaultTechnique;
             technique.u_ambientColor.set(this._ambientColor);
-- 
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/uber-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 3dffb238..febf765f 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -12,7 +12,7 @@ var UberMaterial = function UberMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-    this._name = "UberMaterial";
+    this._name = "Uber";
     this._shaderName = "uber";
     this.getShaderName = function () { return this._shaderName; };
 
-- 
cgit v1.2.3


From 9f74616f7727bf8cf988021ba0cd5d3354d67991 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 15 Jun 2012 11:12:20 -0700
Subject: Fix for setting the specular map in the Uber shader.

---
 js/lib/rdge/materials/uber-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index febf765f..31a8756c 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -309,7 +309,7 @@ var UberMaterial = function UberMaterial() {
                     if (renderer && technique) {
                         var tex = renderer.getTextureByName(value, this._ubershaderCaps.specularMap.wrap);
                         this.registerTexture(tex);
-                        technique.s_specularMap.set(tex);
+                        technique.s_specMap.set(tex);
                     }
                 }
             }
-- 
cgit v1.2.3


From 812851b925bf3d7560ebcc10e51e509a08b69db6 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 15 Jun 2012 13:25:12 -0700
Subject: Fixed a problem with Uber shader where new values were getting
 clobbered by old values.

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

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

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index 31a8756c..347e45d3 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -358,13 +358,14 @@ var UberMaterial = function UberMaterial() {
         newMat._useLights = this._useLights;
         newMat._useNormalMap = this._useNormalMap;
         newMat._useSpecularMap = this._useSpecularMap;
-        newMat.rebuildShader();
 
 		// copy over the current values;
         var n = propNames.length;
         for (var i = 0; i < n; i++)
             newMat.setProperty(propNames[i], propValues[i]);
 
+        newMat.rebuildShader();
+
         return newMat;
     };
 
-- 
cgit v1.2.3