From 00cd98e49c959906d7c44bb6adcdef1f3d5148ae Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 22 Mar 2012 13:52:09 -0700
Subject: Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
 into Texture

Conflicts:
	assets/shaders/plasma.frag.glsl
	js/helper-classes/RDGE/GLLine.js
	js/helper-classes/RDGE/MaterialsLibrary.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/rectangle.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/panels/Materials/Materials.xml
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/preloader/Preloader.js
---
 js/lib/rdge/materials/bump-metal-material.js | 40 +++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index fa6f5300..fe8a9dd5 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -6,6 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 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;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
@@ -18,7 +20,9 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 	this._shaderName = "bumpMetal";
 
 	this._lightDiff = [0.3, 0.3, 0.3, 1.0];
-	this._diffuseTexture = "assets/images/metal.png";
+	//this._diffuseTexture = "assets/images/metal.png";
+	this._diffuseTexture = "texture";
+    this._diffuseWorld = null;      // the world that the texture is derived from (if there is one).
 	this._specularTexture = "assets/images/silver.png";
 	this._normalTexture = "assets/images/normalMap.png";
 
@@ -119,12 +123,46 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 		this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
 		this._materialNode.setShader(this._shader);
 
+        // DEBUG CODE
+        this.initWorldTextures();
+
 		// set some image maps
 		this.updateTexture(1);
         this.updateTexture(2);
         this.updateTexture(3);
 	};
 
+    this.initWorldTextures = function()
+    {
+        // find the world with the given id
+        var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
+        var root = viewUtils.application.ninja.currentDocument.documentRoot;
+        this._diffuseWorld = this.findWorld( this._diffuseTexture,  root );
+    }
+
+    this.findWorld = function( id,  elt )
+    {
+        if (elt.id && elt.id === id)
+        {
+            if (elt.eltModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
+            {
+                var world = elt.elementModel.shapeModel.GLWorld;
+                return world;
+            }
+        }
+ 
+		if (elt.children)
+		{
+			var nKids = elt.children.length;
+			for (var i=0;  i<nKids;  i++)
+			{
+				var child = elt.children[i];
+				var world = this.findWorld( id, child );
+                if (world)  return world;
+			}
+		}
+   }
+
 	this.updateTexture = function( index )
 	{
 		var material = this._materialNode;
-- 
cgit v1.2.3


From 8fa51b9d8c37896dfd13a5b238cf990fcbdb0c96 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 23 Mar 2012 13:46:40 -0700
Subject: textures

---
 js/lib/rdge/materials/bump-metal-material.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index ccd8e3ca..9c9a189a 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -20,10 +20,13 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 	this._shaderName = "bumpMetal";
 
 	this._lightDiff = [0.3, 0.3, 0.3, 1.0];
-	//this._diffuseTexture = "assets/images/metal.png";
+	
+    //this._diffuseTexture = "assets/images/metal.png";
 	this._diffuseTexture = "texture";
     this._diffuseWorld = null;      // the world that the texture is derived from (if there is one).
-	this._specularTexture = "assets/images/silver.png";
+    this._diffuseTextureObj = null;
+	
+    this._specularTexture = "assets/images/silver.png";
 	this._normalTexture = "assets/images/normalMap.png";
 
     ///////////////////////////////////////////////////////////////////////
@@ -138,13 +141,20 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
         var root = viewUtils.application.ninja.currentDocument.documentRoot;
         this._diffuseWorld = this.findWorld( this._diffuseTexture,  root );
+        if (this._diffuseWorld)
+        {
+            var world = this.getWorld();
+            var tex = new Texture( world );
+            this._diffuseTextureObj = tex;
+            tex.loadFromCanvas( world.getCanvas() );
+        }
     }
 
     this.findWorld = function( id,  elt )
     {
         if (elt.id && elt.id === id)
         {
-            if (elt.eltModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
+            if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
             {
                 var world = elt.elementModel.shapeModel.GLWorld;
                 return world;
@@ -174,7 +184,11 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 			{
 				var texMapName = this._propValues[this._propNames[index]];
 				var wrap = 'REPEAT',  mips = true;
-				var tex = this.loadTexture( texMapName, wrap, mips );
+				var tex;
+                if ((index === 1) && this._diffuseTextureObj)
+                    tex = this._diffuseTextureObj.getTexture();
+                else
+                    tex = this.loadTexture( texMapName, wrap, mips );
 
 				if (tex)
 				{
-- 
cgit v1.2.3


From 2f66a9ab38f761b7796800bb37f8146f140db40b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 26 Mar 2012 11:31:23 -0700
Subject: WebGL & Canvas as data for texture maps.

---
 js/lib/rdge/materials/bump-metal-material.js | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 9c9a189a..a3ef9d37 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -146,33 +146,10 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
             var world = this.getWorld();
             var tex = new Texture( world );
             this._diffuseTextureObj = tex;
-            tex.loadFromCanvas( world.getCanvas() );
+            tex.loadFromCanvas( this._diffuseWorld.getCanvas() );
         }
     }
 
-    this.findWorld = function( id,  elt )
-    {
-        if (elt.id && elt.id === id)
-        {
-            if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
-            {
-                var world = elt.elementModel.shapeModel.GLWorld;
-                return world;
-            }
-        }
- 
-		if (elt.children)
-		{
-			var nKids = elt.children.length;
-			for (var i=0;  i<nKids;  i++)
-			{
-				var child = elt.children[i];
-				var world = this.findWorld( id, child );
-                if (world)  return world;
-			}
-		}
-   }
-
 	this.updateTexture = function( index )
 	{
 		var material = this._materialNode;
-- 
cgit v1.2.3


From d7269673dc1f5caf6df3765c6b669d3d1a93bdb1 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 27 Mar 2012 04:53:27 -0700
Subject: Integrated texture wrapper into pulse and bump-metal materials.

---
 js/lib/rdge/materials/bump-metal-material.js | 89 +++++++++++++++-------------
 1 file changed, 47 insertions(+), 42 deletions(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index a3ef9d37..0570e8ed 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -21,14 +21,14 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 
 	this._lightDiff = [0.3, 0.3, 0.3, 1.0];
 	
-    //this._diffuseTexture = "assets/images/metal.png";
-	this._diffuseTexture = "texture";
-    this._diffuseWorld = null;      // the world that the texture is derived from (if there is one).
-    this._diffuseTextureObj = null;
-	
+    this._diffuseTexture = "assets/images/metal.png";
+    //this._diffuseTexture = "texture";
     this._specularTexture = "assets/images/silver.png";
 	this._normalTexture = "assets/images/normalMap.png";
 
+    // keep the array of initialized textures
+    this._textures = [];
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -55,13 +55,13 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     };
 
 	this.getDiffuseTexture	= function()		{  return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null	};
-	this.setDiffuseTexture	= function(m)		{  this._propValues[this._propNames[1]] = m ? m.slice(0) : null;  this.updateTexture(1);  	};
+	this.setDiffuseTexture	= function(m)		{  this._propValues[this._propNames[1]] = m ? m.slice(0) : null;  this.initTexture(1);  	};
 
 	this.getNormalTexture	= function()		{  return this._propValues[this._propNames[2]] ? this._propValues[this._propNames[2]].slice() : null	};
-	this.setNormalTexture	= function(m)		{  this._propValues[this._propNames[2]] = m ? m.slice(0) : null;  this.updateTexture(2);  	};
+	this.setNormalTexture	= function(m)		{  this._propValues[this._propNames[2]] = m ? m.slice(0) : null;  this.initTexture(2);  	};
 
 	this.getSpecularTexture	= function()		{  return this._propValues[this._propNames[3]] ? this._propValues[this._propNames[3]].slice() : null	};
-	this.setSpecularTexture	= function(m)		{  this._propValues[this._propNames[3]] = m ? m.slice(0) : null;  this.updateTexture(3);  	};
+	this.setSpecularTexture	= function(m)		{  this._propValues[this._propNames[3]] = m ? m.slice(0) : null;  this.initTexture(3);  	};
 
 	this.isAnimated			= function()		{  return true;					};
 
@@ -127,29 +127,34 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 		this._materialNode.setShader(this._shader);
 
         // DEBUG CODE
-        this.initWorldTextures();
-
-		// set some image maps
-		this.updateTexture(1);
-        this.updateTexture(2);
-        this.updateTexture(3);
+        this.initTextures();
 	};
 
-    this.initWorldTextures = function()
+    this.initTexture = function( index )
     {
-        // find the world with the given id
-        var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
-        var root = viewUtils.application.ninja.currentDocument.documentRoot;
-        this._diffuseWorld = this.findWorld( this._diffuseTexture,  root );
-        if (this._diffuseWorld)
+        var dstWorld = this.getWorld();
+        if (dstWorld)
         {
-            var world = this.getWorld();
-            var tex = new Texture( world );
-            this._diffuseTextureObj = tex;
-            tex.loadFromCanvas( this._diffuseWorld.getCanvas() );
+            var texMapName = this._propValues[this._propNames[index]];
+            var texture = new Texture( dstWorld, texMapName );
+            this._textures[index] = texture;
+            this.updateTexture( index );
         }
     }
 
+    this.initTextures = function()
+    {
+         var dstWorld = this.getWorld();
+        if (dstWorld)
+        {
+            // find the world with the given id
+            for (var i=1;  i<=3;  i++)
+            {
+                this.initTexture( i );
+            }
+        }
+   }
+
 	this.updateTexture = function( index )
 	{
 		var material = this._materialNode;
@@ -159,24 +164,24 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 			var renderer = g_Engine.getContext().renderer;
 			if (renderer && technique)
 			{
-				var texMapName = this._propValues[this._propNames[index]];
-				var wrap = 'REPEAT',  mips = true;
-				var tex;
-                if ((index === 1) && this._diffuseTextureObj)
-                    tex = this._diffuseTextureObj.getTexture();
-                else
-                    tex = this.loadTexture( texMapName, wrap, mips );
-
-				if (tex)
-				{
-					switch (index)
-					{
-						case 1:		technique.u_colMap.set( tex );		break;
-						case 2:		technique.u_normalMap.set( tex );	break;
-						case 3:		technique.u_glowMap.set( tex );		break;
-						default:	console.log( "invalid map index in BumpMetalMaterial, " + index );
-					}
-				}
+                var glTex = this._textures[ index ];
+                if (glTex)
+                {
+                    if (glTex.isAnimated())
+                        glTex.rerender();
+
+                    var tex = glTex.getTexture();
+ 				    if (tex)
+				    {
+					    switch (index)
+					    {
+						    case 1:		technique.u_colMap.set( tex );		break;
+						    case 2:		technique.u_normalMap.set( tex );	break;
+						    case 3:		technique.u_glowMap.set( tex );		break;
+						    default:	console.log( "invalid map index in BumpMetalMaterial, " + index );
+					    }
+				    }
+                }
 			}
 		}
 	};
-- 
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/bump-metal-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 0570e8ed..7e192a12 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -168,7 +168,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 if (glTex)
                 {
                     if (glTex.isAnimated())
-                        glTex.rerender();
+                        glTex.render();
 
                     var tex = glTex.getTexture();
  				    if (tex)
-- 
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/bump-metal-material.js | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 981edbfd..4bc5dfe8 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -22,7 +22,6 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 	this._lightDiff = [0.3, 0.3, 0.3, 1.0];
 	
     this._diffuseTexture = "assets/images/metal.png";
-    //this._diffuseTexture = "texture";
     this._specularTexture = "assets/images/silver.png";
 	this._normalTexture = "assets/images/normalMap.png";
 
-- 
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/bump-metal-material.js | 58 +++++++++++++++-------------
 1 file changed, 32 insertions(+), 26 deletions(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 4bc5dfe8..4d19c9c1 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -28,6 +28,8 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     // keep the array of initialized textures
     this._textures = [];
 
+	this._speed = 1.0;
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -67,15 +69,14 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["lightDiff",		"diffuseTexture",	"normalMap",	"specularTexture"];
-	this._propLabels		= ["Diffuse Color",	"Diffuse Map",	"Bump Map",		"Specular Map"];
-	this._propTypes			= ["color",			"file",			"file",			"file"];
+	this._propNames			= ["lightDiff",		"diffuseTexture",	"normalMap" ];
+	this._propLabels		= ["Diffuse Color",	"Diffuse Map",		"Bump Map" ];
+	this._propTypes			= ["color",			"file",				"file" ];
 	this._propValues		= [];
 
 	this._propValues[ this._propNames[0] ] = this._lightDiff.slice(0);
 	this._propValues[ this._propNames[1] ] = this._diffuseTexture.slice(0);
 	this._propValues[ this._propNames[2] ] = this._normalTexture.slice(0);
-	this._propValues[ this._propNames[3] ] = this._specularTexture.slice(0);
 
     // TODO - shader techniques are not all named the same, i.e., FlatMaterial uses "colorMe" and BrickMaterial uses "default"
     this.setProperty = function( prop, value )
@@ -127,7 +128,6 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 		this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
 		this._materialNode.setShader(this._shader);
 
-		// DEBUG CODE
 		this.initTextures();
 	};
 
@@ -137,8 +137,14 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 		if (dstWorld)
 		{
 			var texMapName = this._propValues[this._propNames[index]];
-			var texture = new Texture( dstWorld, texMapName );
-			this._textures[index] = texture;
+			if (texMapName)
+			{
+				var texture = new Texture( dstWorld, texMapName );
+				this._textures[index] = texture;
+			}
+			else
+				this._textures[index] = null;
+				
 			this.updateTexture( index );
 		}
 	}
@@ -165,24 +171,25 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 			var renderer = RDGE.globals.engine.getContext().renderer;
 			if (renderer && technique)
 			{
-                var glTex = this._textures[ index ];
-                if (glTex)
-                {
-                    if (glTex.isAnimated())
-                        glTex.render();
-
-                    var tex = glTex.getTexture();
- 				    if (tex)
-				    {
-					    switch (index)
-					    {
-						    case 1:		technique.u_colMap.set( tex );		break;
-						    case 2:		technique.u_normalMap.set( tex );	break;
-						    case 3:		technique.u_glowMap.set( tex );		break;
-						    default:	console.log( "invalid map index in BumpMetalMaterial, " + index );
-					    }
-				    }
-                }
+				var glTex = this._textures[ index ];
+				var tex;
+				if (glTex)
+				{
+					if (glTex.isAnimated())
+						glTex.render();
+
+					tex = glTex.getTexture();
+				}
+
+				{
+					switch (index)
+					{
+						case 1:		technique.u_colMap.set( tex );		break;
+						case 2:		technique.u_normalMap.set( tex );	break;
+						case 3:		technique.u_glowMap.set( tex );		break;
+						default:	console.log( "invalid map index in BumpMetalMaterial, " + index );
+					}
+				}
 			}
 		}
 	};
@@ -291,7 +298,6 @@ var bumpMetalMaterialDef = bumpMetalShaderDef =
 				'params' : 
 				{
 					'u_light0Diff' : { 'type' : 'vec4' },
-					//'u_matDiffuse' : { 'type' : 'vec4' }
 					'u_colMap': { 'type' : 'tex2d' },
 					'u_normalMap': { 'type' : 'tex2d' },
 					'u_glowMap': { 'type' : 'tex2d' }
-- 
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/bump-metal-material.js | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 4d19c9c1..30624f7b 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -108,8 +108,6 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method requirde
-	this.dup = function()	{  return new BumpMetalMaterial();	};
 
 	this.init = function( world )
 	{
-- 
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/bump-metal-material.js | 187 ++-------------------------
 1 file changed, 14 insertions(+), 173 deletions(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 30624f7b..f73f1d34 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -19,11 +19,10 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 	this._name = "BumpMetalMaterial";
 	this._shaderName = "bumpMetal";
 
-	this._lightDiff = [0.3, 0.3, 0.3, 1.0];
-	
-    this._diffuseTexture = "assets/images/metal.png";
-    this._specularTexture = "assets/images/silver.png";
-	this._normalTexture = "assets/images/normalMap.png";
+
+    this._defaultDiffuseTexture = "assets/images/metal.png";
+    this._defaultSpecularTexture = "assets/images/silver.png";
+	this._defaultNormalTexture = "assets/images/normalMap.png";
 
     // keep the array of initialized textures
     this._textures = [];
@@ -33,77 +32,22 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.getName = function() {
-        return this._name;
-    };
-
-    this.getShaderName = function() {
-        return this._shaderName;
-    };
-
-	this.getLightDiff = function() {
-        return this._lightDiff;
-    };
-
-	this.setLightDiff = function(ld) {
-        this._lightDiff = ld;
-        // Bad property name. Commenting for now
-
-        if (this._shader && this._shader['default']){
-            this._shader['default'].u_light0Diff.set( ld );
-        }
-
-    };
-
-	this.getDiffuseTexture	= function()		{  return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null	};
-	this.setDiffuseTexture	= function(m)		{  this._propValues[this._propNames[1]] = m ? m.slice(0) : null;  this.initTexture(1);  	};
-
-	this.getNormalTexture	= function()		{  return this._propValues[this._propNames[2]] ? this._propValues[this._propNames[2]].slice() : null	};
-	this.setNormalTexture	= function(m)		{  this._propValues[this._propNames[2]] = m ? m.slice(0) : null;  this.initTexture(2);  	};
-
-	this.getSpecularTexture	= function()		{  return this._propValues[this._propNames[3]] ? this._propValues[this._propNames[3]].slice() : null	};
-	this.setSpecularTexture	= function(m)		{  this._propValues[this._propNames[3]] = m ? m.slice(0) : null;  this.initTexture(3);  	};
-
 	this.isAnimated			= function()		{  return true;					};
+	this.getShaderDef		= function()		{  return bumpMetalMaterialDef;	};
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this._propNames			= ["lightDiff",		"diffuseTexture",	"normalMap" ];
-	this._propLabels		= ["Diffuse Color",	"Diffuse Map",		"Bump Map" ];
-	this._propTypes			= ["color",			"file",				"file" ];
+	this._propNames			= ["u_light0Diff",		"u_colMap",			"u_normalMap",  "u_glowMap" ];
+	this._propLabels		= ["Diffuse Color",		"Diffuse Map",		"Bump Map",		"Specular Map" ];
+	this._propTypes			= ["color",				"file",				"file",			"file" ];
 	this._propValues		= [];
 
-	this._propValues[ this._propNames[0] ] = this._lightDiff.slice(0);
-	this._propValues[ this._propNames[1] ] = this._diffuseTexture.slice(0);
-	this._propValues[ this._propNames[2] ] = this._normalTexture.slice(0);
-
-    // TODO - shader techniques are not all named the same, i.e., FlatMaterial uses "colorMe" and BrickMaterial uses "default"
-    this.setProperty = function( prop, value )
-	{
-		// every material should do something with the "color" property
-		if (prop === "color")  return;
+	this._propValues[ this._propNames[0] ] = [0.3, 0.3, 0.3, 1.0];
+	this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+	this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+	this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
 
-		// make sure we have legitimate imput
-		var ok = this.validateProperty( prop, value );
-		if (!ok)
-		{
-			console.log( "invalid property in Bump Metal Materia;" + prop + " : " + value );
-			return;
-		}
-
-		switch (prop)
-		{
-			case "lightDiff":		this.setLightDiff( value );			break;
-			case "diffuseTexture":	this.setDiffuseTexture( value );	break;
-			case "specularTexture":	this.setSpecularTexture( value );	break;
-			case "normalMap":		this.setNormalTexture( value );		break;
-
-			default:
-				console.log( "invalid property to Bump Metal Material: " + prop + ", value: " + value );
-				break;
-		}
-	};
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
@@ -120,116 +64,13 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
 		this._shader = new RDGE.jshader();
 		this._shader.def = bumpMetalMaterialDef;
 		this._shader.init();
-		this._shader['default'].u_light0Diff.set( this.getLightDiff() );
 
 		// set up the material node
 		this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
 		this._materialNode.setShader(this._shader);
 
-		this.initTextures();
-	};
-
-	this.initTexture = function( index )
-	{
-		var dstWorld = this.getWorld();
-		if (dstWorld)
-		{
-			var texMapName = this._propValues[this._propNames[index]];
-			if (texMapName)
-			{
-				var texture = new Texture( dstWorld, texMapName );
-				this._textures[index] = texture;
-			}
-			else
-				this._textures[index] = null;
-				
-			this.updateTexture( index );
-		}
-	}
-
-	this.initTextures = function()
-	{
-		 var dstWorld = this.getWorld();
-		if (dstWorld)
-		{
-			// find the world with the given id
-			for (var i=1;  i<=3;  i++)
-			{
-				this.initTexture( i );
-			}
-		}
-   }
-
-	this.updateTexture = function( index )
-	{
-		var material = this._materialNode;
-		if (material)
-		{
-			var technique = material.shaderProgram['default'];
-			var renderer = RDGE.globals.engine.getContext().renderer;
-			if (renderer && technique)
-			{
-				var glTex = this._textures[ index ];
-				var tex;
-				if (glTex)
-				{
-					if (glTex.isAnimated())
-						glTex.render();
-
-					tex = glTex.getTexture();
-				}
-
-				{
-					switch (index)
-					{
-						case 1:		technique.u_colMap.set( tex );		break;
-						case 2:		technique.u_normalMap.set( tex );	break;
-						case 3:		technique.u_glowMap.set( tex );		break;
-						default:	console.log( "invalid map index in BumpMetalMaterial, " + index );
-					}
-				}
-			}
-		}
-	};
-
-	this.exportJSON = function()
-	{
-		var jObj =
-		{
-			'material'			: this.getShaderName(),
-			'name'				: this.getName(),
-			'lightDiff'			: this.getLightDiff(),
-			'diffuseTexture'	: this.getDiffuseTexture(),
-			'specularTexture'	: this.getSpecularTexture(),
-			'normalMap'			: this.getNormalTexture()
-		};
-
-		return jObj;
-	};
-
-	this.importJSON = function( jObj )
-	{
-		if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
-		this.setName( jObj.name );
-
-		try
-		{
-			var lightDiff  = jObj.lightDiff,
-				dt = jObj.diffuseTexture,
-				st = jObj.specularTexture,
-				nt = jObj.normalMap;
-		
-			this.setProperty( "lightDiff",  lightDiff);
-			this.setProperty( "diffuseTexture", dt );
-			this.setProperty( "specularTexture", st );
-			this.setProperty( "normalMap", nt );
-		}
-		catch (e)
-		{
-			throw new Error( "could not import BumpMetal material: " + jObj );
-		}
-		
-		return;
+		this.setShaderValues();
+		this.update(0);
 	};
 };
 
-- 
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/bump-metal-material.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index f73f1d34..4604a89d 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -24,8 +24,8 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     this._defaultSpecularTexture = "assets/images/silver.png";
 	this._defaultNormalTexture = "assets/images/normalMap.png";
 
-    // keep the array of initialized textures
-    this._textures = [];
+    // array textures indexed by shader uniform name
+    this._glTextures = [];
 
 	this._speed = 1.0;
 
-- 
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/bump-metal-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 4604a89d..99a80da2 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -16,7 +16,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "BumpMetalMaterial";
+	this._name = "Bump Metal";
 	this._shaderName = "bumpMetal";
 
 
-- 
cgit v1.2.3