From 947bad893335e1023bcbe177ff8db454c27c4bf8 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 30 Mar 2012 06:23:53 -0700
Subject: converted materials to new texture structure

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

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

diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index e7b105e1..4babe239 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -5,6 +5,7 @@
  </copyright> */
 
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
 
 var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
@@ -70,6 +71,10 @@ var MandelMaterial = function MandelMaterial() {
 			this._shader['default'].u_time.set( [this._time] );
         }
 
+        // set up the texture
+        var texMapName = this._propValues[this._propNames[0]];
+        this._glTex = new Texture( world, texMapName );
+
 		// set the shader values in the shader
 		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
 		this.update( 0 );
-- 
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/mandel-material.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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

diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index 35ac8ec4..e75d74ba 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -39,18 +39,19 @@ var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
 	// duplcate method requirde
 	this.dup = function( world ) {
-		// allocate a new uber material
-		var newMat = new MandelMaterial();
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new MandelMaterial();
 
 		// copy over the current values;
-		var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
-		this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
-		var n = propNames.length;
-		for (var i=0;  i<n;  i++) {
-			newMat.setProperty( propNames[i], propValues[i] );
-        }
+        var n = propNames.length;
+        for (var i = 0; i < n; i++)
+            newMat.setProperty(propNames[i], propValues[i]);
 
-		return newMat;
+        return newMat;
 	};
 
 	this.init = function( world ) {
-- 
cgit v1.2.3


From d4ca478ad313c6c20834e410ba14ad3a5e7b20bf Mon Sep 17 00:00:00 2001
From: hwc487
Date: Tue, 12 Jun 2012 10:28:26 -0700
Subject: Material cleanup & bug fixes.

---
 js/lib/rdge/materials/mandel-material.js | 48 ++++++++------------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

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

diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index e75d74ba..e1c19145 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -14,7 +14,7 @@ var MandelMaterial = function MandelMaterial() {
 	this._name = "MandelMaterial";
 	this._shaderName = "mandel";
 
-	this._texMap = 'assets/images/rocky-normal.jpg';
+	this._defaultTexMap = 'assets/images/rocky-normal.jpg';
 
 	this._time = 0.0;
 	this._dTime = 0.01;
@@ -27,32 +27,23 @@ var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
+	var u_tex0_index	= 0,  u_speed_index = 1;
+	this._propNames			= ["u_tex0",		"u_speed" ];
+	this._propLabels		= ["Texture map",	"Speed" ];
+	this._propTypes			= ["file",			"float" ];
+	this._propValues		= [];
+    this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+    this._propValues[this._propNames[u_speed_index]] = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
 
-	this.isAnimated = function()  {
-        return true;
-    };
+	this.isAnimated		= function()	{ return true;					};
+	this.getShaderDef	= function()	{  return MandelMaterialDef;	}
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
 	// duplcate method requirde
-	this.dup = function( world ) {
-        // get the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
-        
-        // allocate a new material
-        var newMat = new MandelMaterial();
-
-		// 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.init = function( world ) {
 		// save the world
@@ -72,27 +63,11 @@ var MandelMaterial = function MandelMaterial() {
 			this._shader['default'].u_time.set( [this._time] );
         }
 
-        // set up the texture
-        var texMapName = this._propValues[this._propNames[0]];
-        this._glTex = new Texture( world, texMapName );
-
 		// set the shader values in the shader
+        this.setShaderValues();
 		this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
 		this.update( 0 );
 	};
-
-	this.update = function( time ) {
-		var material = this._materialNode;
-		if (material) {
-			var technique = material.shaderProgram['default'];
-			var renderer = RDGE.globals.engine.getContext().renderer;
-			if (renderer && technique) {
-				if (this._shader && this._shader['default'])
-					this._shader['default'].u_time.set( [this._time] );
-				this._time = time;
-			}
-		}
-	};
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -124,6 +99,7 @@ var MandelMaterialDef =
 				{
 					'u_tex0': { 'type' : 'tex2d' },
 					'u_time' : { 'type' : 'float' },
+					'u_speed' : { 'type' : 'float' },
 					'u_resolution'  :   { 'type' : 'vec2' },
 				},
 
-- 
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/mandel-material.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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

diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index e1c19145..af477f2b 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -14,8 +14,6 @@ var MandelMaterial = function MandelMaterial() {
 	this._name = "MandelMaterial";
 	this._shaderName = "mandel";
 
-	this._defaultTexMap = 'assets/images/rocky-normal.jpg';
-
 	this._time = 0.0;
 	this._dTime = 0.01;
 
@@ -27,12 +25,11 @@ var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-	var u_tex0_index	= 0,  u_speed_index = 1;
-	this._propNames			= ["u_tex0",		"u_speed" ];
-	this._propLabels		= ["Texture map",	"Speed" ];
-	this._propTypes			= ["file",			"float" ];
+	var u_speed_index = 0;
+	this._propNames			= [ "u_speed" ];
+	this._propLabels		= [ "Speed" ];
+	this._propTypes			= [	"float" ];
 	this._propValues		= [];
-    this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
     this._propValues[this._propNames[u_speed_index]] = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
@@ -97,7 +94,6 @@ var MandelMaterialDef =
 				// parameters
 				'params' : 
 				{
-					'u_tex0': { 'type' : 'tex2d' },
 					'u_time' : { 'type' : 'float' },
 					'u_speed' : { 'type' : 'float' },
 					'u_resolution'  :   { 'type' : 'vec2' },
-- 
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/mandel-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index af477f2b..4f3def4a 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -11,7 +11,7 @@ var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "MandelMaterial";
+	this._name = "Mandel";
 	this._shaderName = "mandel";
 
 	this._time = 0.0;
-- 
cgit v1.2.3