From 86a801c057fc3b0580d6130be5740c2ee503444f Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 27 Jan 2012 15:52:36 -0800
Subject: updated from old repo

---
 js/helper-classes/RDGE/Materials/UberMaterial.js | 25 +++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

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

diff --git a/js/helper-classes/RDGE/Materials/UberMaterial.js b/js/helper-classes/RDGE/Materials/UberMaterial.js
index a8254465..afb745d1 100644
--- a/js/helper-classes/RDGE/Materials/UberMaterial.js
+++ b/js/helper-classes/RDGE/Materials/UberMaterial.js
@@ -270,6 +270,7 @@ function UberMaterial()
 					if (renderer && technique)
 					{
 						var tex = renderer.getTextureByName(value, caps.environmentMap.wrap);
+						this.registerTexture( tex );
 						technique.s_environmentMap.set( tex );
 					}
 				}
@@ -307,6 +308,7 @@ function UberMaterial()
 					if (renderer && technique)
 					{
 						var tex = renderer.getTextureByName(value, caps.diffuseMap.wrap);
+						this.registerTexture( tex );
 						technique.s_diffuseMap.set( tex );
 					}
 				}
@@ -344,6 +346,7 @@ function UberMaterial()
 					if (renderer && technique)
 					{
 						var tex = renderer.getTextureByName(value, caps.specularMap.wrap);
+						this.registerTexture( tex );
 						technique.s_specularMap.set( tex );
 					}
 				}
@@ -381,6 +384,7 @@ function UberMaterial()
 					if (renderer && technique)
 					{
 						var tex = renderer.getTextureByName(value, caps.normalMap.wrap);
+						this.registerTexture( tex );
 						technique.s_normalMap.set( tex );
 					}
 				}
@@ -411,8 +415,11 @@ function UberMaterial()
 		return newMat;
 	} 
 
-	this.init = function()
+	this.init = function( world )
 	{
+		// save the world
+		if (world)  this.setWorld( world );
+
 		// set up the shader
 		this._shader = this.buildUberShader( this._ubershaderCaps );
 
@@ -579,16 +586,24 @@ function UberMaterial()
 	
 		renderer = g_Engine.getContext().renderer;
 		if(this._useDiffuseMap) {
-			technique.s_diffuseMap.set(renderer.getTextureByName(caps.diffuseMap.texture, caps.diffuseMap.wrap, caps.diffuseMap.mips));
+			var tex = renderer.getTextureByName(caps.diffuseMap.texture, caps.diffuseMap.wrap, caps.diffuseMap.mips);
+			this.registerTexture( tex );
+			technique.s_diffuseMap.set( tex );
 		}
 		if(this._useNormalMap) {
-			technique.s_normalMap.set(renderer.getTextureByName(caps.normalMap.texture, caps.normalMap.wrap, caps.normalMap.mips));
+			var tex = renderer.getTextureByName(caps.normalMap.texture, caps.normalMap.wrap, caps.normalMap.mips);
+			this.registerTexture( tex );
+			technique.s_normalMap.set( tex );
 		}    
 		if(this._useSpecularMap) {
-			technique.s_specMap.set(renderer.getTextureByName(caps.specularMap.texture, caps.specularMap.wrap));
+			var tex = renderer.getTextureByName(caps.specularMap.texture, caps.specularMap.wrap);
+			this.registerTexture( tex );
+			technique.s_specMap.set( tex );
 		}
 		if(this._useEnvironmentMap) {
-			technique.s_envMap.set(renderer.getTextureByName(caps.environmentMap.texture, caps.environmentMap.wrap));
+			var tex = renderer.getTextureByName(caps.environmentMap.texture, caps.environmentMap.wrap);
+			this.registerTexture( tex );
+			technique.s_envMap.set( tex );
 			technique.u_envReflection.set([ caps.environmentMap.envReflection || 1.0 ] );
 		}
 
-- 
cgit v1.2.3


From 2d68f944e93b201deb46015392e706b7a24201c9 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 8 Feb 2012 14:24:48 -0800
Subject: Fixed several typos in Materials import/export code to support
 toggling between 2d and 3d shape modes.

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

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

diff --git a/js/helper-classes/RDGE/Materials/UberMaterial.js b/js/helper-classes/RDGE/Materials/UberMaterial.js
index a8254465..f3acdaa6 100644
--- a/js/helper-classes/RDGE/Materials/UberMaterial.js
+++ b/js/helper-classes/RDGE/Materials/UberMaterial.js
@@ -45,9 +45,9 @@ function UberMaterial()
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["ambientColor",	"diffuseColor",		"specularColor",	"specularPower"	,	"diffuseMap",	"normalMap",	"specularMap",		"environmentMap",		"environmentAmount",			"dummy" ];
-	this._propLabels		= ["Ambient Color",	"Diffuse Color",	"Specular Color",	"Specular Power",	"Texture Map",	"Bump Map",		"Specular Map",		"Environment Map",		"Environment Map Amount",		"Dummy" ];
-	this._propTypes			= ["color",			"color",			"color",			"float",			"file",			"file",			"file",				"file",					"float",						"checkbox"];
+	this._propNames			= ["ambientColor",	"diffuseColor",		"specularColor",	"specularPower"	,	"diffuseMap",	"normalMap",	"specularMap",		"environmentMap",		"environmentAmount" ];
+	this._propLabels		= ["Ambient Color",	"Diffuse Color",	"Specular Color",	"Specular Power",	"Texture Map",	"Bump Map",		"Specular Map",		"Environment Map",		"Environment Map Amount" ];
+	this._propTypes			= ["color",			"color",			"color",			"float",			"file",			"file",			"file",				"file",					"float"		];
 	this._propValues		= [];
 
 	this._propValues[ this._propNames[0] ] = this._ambientColor.slice(0);
-- 
cgit v1.2.3