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/material.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index c1d13b15..157fa7db 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -252,6 +252,29 @@ var Material = function GLMaterial( world ) {
 		return tex;
 	};
 
+    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.export = function() {
 		// this function should be overridden by subclasses
 		var exportStr = "material: " + this.getShaderName() + "\n" + "endMaterial\n";
-- 
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/material.js | 95 ---------------------------------------
 1 file changed, 95 deletions(-)

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 157fa7db..13251ce8 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -252,29 +252,6 @@ var Material = function GLMaterial( world ) {
 		return tex;
 	};
 
-    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.export = function() {
 		// this function should be overridden by subclasses
 		var exportStr = "material: " + this.getShaderName() + "\n" + "endMaterial\n";
@@ -290,78 +267,6 @@ var Material = function GLMaterial( world ) {
 		return rtnStr;
 	};
 
-	/*
-	this.setRenderProperties = function( glContext, shaderProgram )
-	{
-		glContext.uniform1f( shaderProgram.materialShininessUniform, this._shininess );
-
-		if (this._texture)
-			this.prepareTextureForRender( 0 );
-		else
-			glContext.uniform1i( shaderProgram.useTextureUniform,	false  );
-
-		var amb = this._ambient,  diff = this._diffuse,  spec = this._specular;
-		glContext.uniform4f( shaderProgram.materialAmbientUniform,		 amb[0],  amb[1],  amb[2],  amb[3]);
-		glContext.uniform4f( shaderProgram.materialDiffuseUniform,		diff[0], diff[1], diff[2], diff[3]);
-		glContext.uniform4f( shaderProgram.materialSpecularUniform,		spec[0], spec[1], spec[2], spec[3]);
-	}
- 
- 
- 
-    this.prepareTextureForRender = function ( index )
-	{
-		// we will need to be able to handle multiple textures.
-		// currently only dealing with 1.
-		index = 0;
-		var texture = this._texture;
-
-		var gl = this.getWorld().getGLContext();
-		var shaderProgram = this.getWorld().getShaderProgram();
-
-		gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, texture);
-		gl.uniform1i(shaderProgram.samplerUniform, 0);
-		gl.uniform1i( shaderProgram.useTextureUniform,	true  );
-    }
- 
-    this.textureLoadHandler = function (event)
-	{
-		var texture = this._texture;
-
-		var gl = this._world.getGLContext();
-		var shaderProgram = this._world.getShaderProgram();
-
-		gl.activeTexture(gl.TEXTURE0);
-        gl.bindTexture(gl.TEXTURE_2D, texture);
-        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
-        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, texture.image);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
-        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
-
-//		gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
-//		gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
-		gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
-		gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
-
-        gl.bindTexture(gl.TEXTURE_2D, null);
-
-		this._material._texture = this._texture;
-		this._world.render();
-	}
- 
- 
-    this.loadTexture = function( path )
-	{
-        var gl = this.getWorld().getGLContext();
-		var tex = gl.createTexture();
-        tex.image = new Image();
-		tex.image._world = this._world;
-		tex.image._material = this;
-		tex.image._texture = tex;
-        tex.image.onload = this.textureLoadHandler;
-        tex.image.src = path;
-    }
-	*/
 };
 
 if (typeof exports === "object") {
-- 
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/material.js | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 13251ce8..a81ca18f 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -38,6 +38,11 @@ var Material = function GLMaterial( world ) {
 	this._shader = null;
 	this._materialNode = null;
 
+	// vertex deformation variables
+	this._hasVertexDeformation = false;
+	this._vertexDeformationRange = [0, 0, 1, 1];	// (xMin, yMin, xMax, yMax)
+	this._vertexDeformationTolerance = 0.02;
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-- 
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/material.js | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index a81ca18f..bc4c8e6b 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -257,6 +257,13 @@ var Material = function GLMaterial( world ) {
 		return tex;
 	};
 
+	this.updateTextures = function()
+	{
+		// this function is called whenever a world that generates textuers for
+		// the current world changes in some way.  Sub-classes with textures
+		// should override this function.
+	}
+
 	this.export = function() {
 		// this function should be overridden by subclasses
 		var exportStr = "material: " + this.getShaderName() + "\n" + "endMaterial\n";
-- 
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/material.js | 7 -------
 1 file changed, 7 deletions(-)

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 4b8a5d6b..77220bf7 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -257,13 +257,6 @@ var Material = function GLMaterial( world ) {
 		return tex;
 	};
 
-	this.updateTextures = function()
-	{
-		// this function is called whenever a world that generates textuers for
-		// the current world changes in some way.  Sub-classes with textures
-		// should override this function.
-	}
-
 };
 
 if (typeof exports === "object") {
-- 
cgit v1.2.3


From 725c2175f20b5e0829518f725fd26cc077748bdf Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 25 May 2012 13:35:10 -0700
Subject: Parameters for twistVertex material

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

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 9f0ae6f1..b9de9988 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -192,6 +192,7 @@ var Material = function GLMaterial( world ) {
 							rtnVal = ((valType == "object") && (value.length >= 3));
 							break;
 
+						case "angle":
 						case "float":
 							rtnVal = (valType == "number");
 							break;
-- 
cgit v1.2.3


From f0bbd7688bcf2c6b8f749c7c6061ac09640ab08c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 4 Jun 2012 11:35:17 -0700
Subject: Avoid throwing shader errors in the console for 'color' property at a
 base class level.

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

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index b9de9988..856513e2 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -210,7 +210,7 @@ var Material = function GLMaterial( world ) {
 			console.log( "setting invalid material property: " + prop + ", value: " + value );
 		}
 		
-		if (!rtnVal) {
+		if (!rtnVal && (prop != 'color')) {
 			console.log( "invalid material property: " + prop + " : " + value );
         }
 
-- 
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/material.js | 219 ++++++++++++++++++++++++++++++--------
 1 file changed, 176 insertions(+), 43 deletions(-)

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 856513e2..d2586b58 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -4,6 +4,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
+var Texture = require("js/lib/rdge/texture").Texture;
+
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      GL representation of a material.
@@ -15,19 +18,16 @@ var Material = function GLMaterial( world ) {
 	this._name = "GLMaterial";
 	this._shaderName = "undefined";
 
+	this._time = 0.0;
+	this._dTime = 0.01;
+
 	// keep a reference to the owning GLWorld
 	this._world = null;
     if(world) {
         this._world = world;
     }
 
-	this._shininess = 60;
-		
-	this._ambient  = [0.0, 0.0, 0.0,  1.0];
-	this._diffuse  = [0.0, 0.0, 0.0,  1.0];
-	this._specular = [0.0, 0.0, 0.0,  1.0];
-
-	this._texture = null;
+	this._glTextures = [];		// indexed by uniform name
 
 	// vertex deformation variables
 	this._hasVertexDeformation = false;
@@ -46,13 +46,6 @@ var Material = function GLMaterial( world ) {
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	this.getShininess = function() {
-        return this._shininess;
-    };
-
-	this.setShininess = function(s) {
-        this._shininess = s;
-    };
 
 	this.setName = function(n) {
         this._name = n;
@@ -78,30 +71,6 @@ var Material = function GLMaterial( world ) {
         return this._world;
     };
 
-	this.setAmbient	= function(r, g, b, a)	{
-        this._ambient = [r, g, b, a];
-    };
-
-	this.getAmbient = function() {
-        return [this._ambient[0], this._ambient[1], this._ambient[2], this._ambient[3]];
-    };
-
-	this.setDiffuse	= function(r, g, b, a)	{
-        this._diffuse = [r, g, b, a];
-    };
-
-	this.getDiffuse	= function() {
-        return [this._diffuse[0], this._diffuse[1], this._diffuse[2], this._diffuse[3]];
-    };
-
-	this.setSpecular = function(r, g, b, a)	{
-        this._specular = [r, g, b, a];
-    };
-
-	this.getSpecular = function() {
-        return [this._specular[0], this._specular[1], this._specular[2], this._specular[3]];
-    };
-
 	this.getShader = function() {
         return this._shader;
     };
@@ -116,6 +85,10 @@ var Material = function GLMaterial( world ) {
         return false;
     };
 
+	this.getTechniqueName	= function() {
+		return 'default'
+	};
+
 	// the vertex shader can apply deformations requiring refinement in
 	// certain areas.
 	this.hasVertexDeformation = function()	{
@@ -166,6 +139,43 @@ var Material = function GLMaterial( world ) {
 		}
 	};
 
+	this.hasProperty = function( prop )
+	{
+		var propNames = [],  dummy = [];
+		this.getAllProperties( propNames, dummy, dummy, dummy )
+		for (var i=0;  i<propNames.length;  i++)
+		{
+			if (prop === propNames[i])  return true;
+		}
+	};
+
+	this.getPropertyType = function( prop )
+	{
+		var n = this.getPropertyCount();
+		for (var i=0;  i<n;  i++)
+		{
+			if (prop === this._propNames[i])  return this._propTypes[i];
+		}
+	};
+
+    this.dup = function ()
+	{
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+		var MaterialLibrary = require("js/models/materials-model").MaterialsModel;
+        var newMat = MaterialLibrary.createMaterialByShaderName( this.getShaderName() );
+
+		// 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.validateProperty = function( prop, value ) {
 		var rtnVal = false;
 		try
@@ -216,16 +226,139 @@ var Material = function GLMaterial( world ) {
 
 		return rtnVal;
 	};
+
+	this.setProperty = function( prop,  value )
+	{
+		var ok = this.validateProperty( prop, value );
+		if (!ok && (prop != 'color')) {
+			console.log( "invalid property in Material:" + prop + " : " + value );
+			return;
+		}
+
+		// get the technique if the shader is instantiated
+		var technique;
+		var material = this._materialNode;
+		if (material)  technique = material.shaderProgram[this.getTechniqueName()];
+
+		switch (this.getPropertyType(prop))
+		{
+			case "angle":
+			case "float":
+				this._propValues[prop] = value;
+				if (technique)  technique[prop].set( [value] );
+				break;
+
+			case "file":
+				this._propValues[prop] = value.slice();
+				if (technique)
+				{
+					var glTex = new Texture( this.getWorld(),  value );
+					this._glTextures[prop] = glTex;
+					glTex.render();
+					var tex = glTex.getTexture();
+					if (tex)  technique[prop].set( tex );
+				}
+				break;
+
+			case "color":
+			case "vector2d":
+			case "vector3d":
+				this._propValues[prop] = value.slice();
+				if (technique)  technique[prop].set( value );
+				break;
+		}
+	};
+
+	this.setShaderValues = function()
+	{
+		var material = this._materialNode;
+		if (material)
+		{
+			var technique = material.shaderProgram[this.getTechniqueName()];
+			if (technique)
+			{
+				var n = this.getPropertyCount();
+				for (var i=0;  i<n;  i++)
+				{
+					var prop = this._propNames[i],
+						value = this._propValues[prop];
+
+					switch (this._propTypes[i])
+					{
+						case "angle":
+						case "float":
+							technique[prop].set( [value] );
+							break;
+
+						case "file":
+							var glTex = this._glTextures[prop];
+							if (glTex)
+							{
+								var tex = glTex.getTexture();
+								if (tex)  technique[prop].set( tex );
+							}
+							else
+								this.setProperty( prop, value );
+							break;
+
+						case "color":
+						case "vector2d":
+						case "vector3d":
+							technique[prop].set( value );
+							break;
+					}
+				}
+			}
+		}
+	};
+
+	// JSON export
+	this.exportJSON = function()
+	{
+		var jObj =
+		{
+			'material'		: this.getShaderName(),
+			'name'			: this.getName(),
+			'dTime'         : this._dTime
+		};
+
+		var n = this.getPropertyCount();
+		for (var i=0;  i<n;  i++)
+		{
+			var	prop  = this._propNames[i],
+				value = this._propValues[prop];
+
+			jObj[prop] = value;
+		}
+
+		return jObj;
+	};
+	
+    this.importJSON = function (jObj) {
+        if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
+        this.setName(jObj.name);
+
+        try
+		{
+			for (var prop in jObj)
+			{
+				if ((prop != 'material') && (prop != 'name'))
+				{
+					var value = jObj[prop];
+					this.setProperty( prop, value );
+				}
+			}
+        }
+        catch (e) {
+            throw new Error("could not import material: " + jObj);
+        }
+    };
+
     ///////////////////////////////////////////////////////////////////////
     
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-	// duplcate method required by sub class
-	this.dup = function() {
-		throw new Error( "Material.dup() must be overridden by subclass" );
-	};
-
 	this.init = function( world ) {
 		throw new Error( "Material.init() must be overridden by subclass" );
 	};
-- 
cgit v1.2.3


From 1d65f82295ea96e019409d08daa5d11e84a44581 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 12 Jun 2012 15:31:48 -0700
Subject: Runtime material fixes

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

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index d2586b58..34529e6b 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -331,6 +331,9 @@ var Material = function GLMaterial( world ) {
 			jObj[prop] = value;
 		}
 
+		if (this.customExport)
+			jObj = this.customExport( jObj );
+
 		return jObj;
 	};
 	
-- 
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/material.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 34529e6b..65448c0c 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -220,9 +220,9 @@ var Material = function GLMaterial( world ) {
 			console.log( "setting invalid material property: " + prop + ", value: " + value );
 		}
 		
-		if (!rtnVal && (prop != 'color')) {
-			console.log( "invalid material property: " + prop + " : " + value );
-        }
+//		if (!rtnVal && (prop != 'color')) {
+//			console.log( "invalid material property: " + prop + " : " + value );
+//        }
 
 		return rtnVal;
 	};
@@ -231,7 +231,7 @@ var Material = function GLMaterial( world ) {
 	{
 		var ok = this.validateProperty( prop, value );
 		if (!ok && (prop != 'color')) {
-			console.log( "invalid property in Material:" + prop + " : " + value );
+			//console.log( "invalid property in Material:" + prop + " : " + value );
 			return;
 		}
 
-- 
cgit v1.2.3