From 7b6e8194b91168abdeb94702eb350d14f147858b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 8 Mar 2012 17:29:18 -0800
Subject: Canvas IO

---
 js/lib/rdge/materials/uber-material.js | 46 +++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 4 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 0964c9c4..d120ffa1 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -33,6 +33,8 @@ var UberMaterial = function UberMaterial() {
 	this._useEnvironmentMap	= true;
 	this._useLights			= [true, true, true, true];
 
+	this._MAX_LIGHTS		= 4;
+
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -374,6 +376,18 @@ var UberMaterial = function UberMaterial() {
         var index = importStr.indexOf( endKey );
         index += endKey.length;
         importStr = importStr.substr( index );
+		var pu = new MaterialParser( importStr );
+
+		var matProps = pu.nextValue( "materialProps: " );
+		if (matProps)
+		{
+			var ambientColor  = Number( pu.nextValue( "ambientColor: "  ));	 this.setProperty( "ambientColor", ambientColor );
+			var diffuseColor  = Number( pu.nextValue( "diffuseColor: "  ));	 this.setProperty( "diffuseColor", diffuseColor );
+			var specularColor = Number( pu.nextValue( "specularColor: " ));	 this.setProperty( "specularColor", specularColor );
+			var specularPower = Number( pu.nextValue( "specularPower: " ));  this.setProperty( "specularPower", specularPower );
+		}
+
+		var lightProps = pu.nextValue( "theLights" );
 	}
 
 	this.export = function()
@@ -387,7 +401,7 @@ var UberMaterial = function UberMaterial() {
 		// export the material properties
 		if (typeof caps.material != 'undefined')
 		{
-			exportStr += "material: true\n";
+			exportStr += "materialProps: true\n";
 			exportStr += "ambientColor: " + caps.material.ambientColor + "\n";
 			exportStr += "diffuseColor: " + caps.material.diffuseColor + "\n";
 			exportStr += "specularColor: " + caps.material.specularColor + "\n";
@@ -396,8 +410,9 @@ var UberMaterial = function UberMaterial() {
 
 		if (typeof caps.lighting != 'undefined')
 		{
+			exportStr += "lightProps: true\n";
+
 			var light = caps.lighting['light' + i];
-			var t;
 			for (var i=0;  i<this._MAX_LIGHTS;  i++)
 			{
 				var light = caps.lighting["light" + i];
@@ -405,6 +420,7 @@ var UberMaterial = function UberMaterial() {
 				{
 					exportStr += "light" + i + ': ' + light.type + "\n";
 
+					// output the light secific data
 					if (light.type === 'directional')
 					{
 						exportStr += 'light' + i + 'Dir: ' + light['direction'] + '\n';
@@ -419,9 +435,11 @@ var UberMaterial = function UberMaterial() {
 					}
 					else		// light.type === 'point'
 					{
-						technique['u_light'+i+'Pos'].set(light['position'] || [ 0, 0, 0 ]);                        
-						technique['u_light'+i+'Atten'].set(light['attenuation'] || [ 1,0,0 ]);                
+						exportStr += 'light' + i + 'Pos: ' + (light['position'] || [ 0, 0, 0 ]) ;
+						exportStr += 'light' + i + 'Attenuation: ' + (light['attenuation'] || [ 1, 0, 0 ]) ;
 					}
+
+					// 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'; 
 					
@@ -429,6 +447,26 @@ var UberMaterial = function UberMaterial() {
 				}
 			}
 		}
+
+//	this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', '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 };
+		var world = this.getWorld();
+		if (!world)
+			throw new Error( "no world in material.export, " + this.getName() );
+
+		if(typeof caps.diffuseMap != 'undefined')
+			exportStr += "diffuseMap: " + world.cleansePath(caps.diffuseMap.texture) + "\n";
+
+		if(typeof caps.normalMap != 'undefined')
+			exportStr += "normalMap: " + world.cleansePath(caps.normalMap.texture) + "\n";
+
+		if(typeof caps.specularMap != 'undefined')
+			exportStr += "specularMap: " + world.cleansePath(caps.specularMap.texture) + "\n";
+
+		if(typeof caps.environmentMap != 'undefined')
+			exportStr += "environmentMap: " + world.cleansePath(caps.environmentMap.texture) + "\n";
 		
 		// every material needs to terminate like this
 		exportStr += "endMaterial\n";
-- 
cgit v1.2.3


From e92a6da7b84c58803489d70efedf74837ddfe4cd Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 9 Mar 2012 13:34:09 -0800
Subject: Removed asset path replacement at authortime.

---
 js/lib/rdge/materials/uber-material.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 d120ffa1..655d8e2a 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -457,16 +457,16 @@ var UberMaterial = function UberMaterial() {
 			throw new Error( "no world in material.export, " + this.getName() );
 
 		if(typeof caps.diffuseMap != 'undefined')
-			exportStr += "diffuseMap: " + world.cleansePath(caps.diffuseMap.texture) + "\n";
+			exportStr += "diffuseMap: " + caps.diffuseMap.texture + "\n";
 
 		if(typeof caps.normalMap != 'undefined')
-			exportStr += "normalMap: " + world.cleansePath(caps.normalMap.texture) + "\n";
+			exportStr += "normalMap: " + caps.normalMap.texture + "\n";
 
 		if(typeof caps.specularMap != 'undefined')
-			exportStr += "specularMap: " + world.cleansePath(caps.specularMap.texture) + "\n";
+			exportStr += "specularMap: " + caps.specularMap.texture + "\n";
 
 		if(typeof caps.environmentMap != 'undefined')
-			exportStr += "environmentMap: " + world.cleansePath(caps.environmentMap.texture) + "\n";
+			exportStr += "environmentMap: " + caps.environmentMap.texture + "\n";
 		
 		// every material needs to terminate like this
 		exportStr += "endMaterial\n";
-- 
cgit v1.2.3