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

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

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index a85bd6f7..c1eb2b6d 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-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 JuliaMaterial = function JuliaMaterial() {
     ///////////////////////////////////////////////////////////////////////
@@ -59,6 +60,10 @@ var JuliaMaterial = function JuliaMaterial() {
 			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/julia-material.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index e35062a0..a06b1771 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -29,17 +29,19 @@ var JuliaMaterial = function JuliaMaterial() {
     ///////////////////////////////////////////////////////////////////////
 	// duplcate method requirde
 	this.dup = function( world ) {
-		// allocate a new uber material
-		var newMat = new JuliaMaterial();
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new JuliaMaterial();
 
 		// 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 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/julia-material.js | 52 ++++++++++-----------------------
 1 file changed, 15 insertions(+), 37 deletions(-)

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

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index a06b1771..63367e16 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -14,7 +14,7 @@ var JuliaMaterial = function JuliaMaterial() {
 	this._name = "JuliaMaterial";
 	this._shaderName = "julia";
 
-	this._texMap = 'assets/images/rocky-normal.jpg';
+	this._defaultTexMap = 'assets/images/rocky-normal.jpg';
 
 	this._time = 0.0;
 	this._dTime = 0.01;
@@ -22,27 +22,22 @@ var JuliaMaterial = function JuliaMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
-	// properties inherited from PulseMaterial
+	var  u_speed_index = 0;
+	this._propNames			= [ "u_speed" ];
+	this._propLabels		= [ "Speed" ];
+	this._propTypes			= [ "float" ];
+	this._propValues		= [];
+    this._propValues[this._propNames[u_speed_index]] = 1.0;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Material Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+	this.isAnimated			= function()			{  return true;		};
+	this.getShaderDef		= function()			{  return JuliaMaterialDef;	}
 
     ///////////////////////////////////////////////////////////////////////
     // 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 JuliaMaterial();
-
-		// 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
@@ -62,28 +57,11 @@ var JuliaMaterial = function JuliaMaterial() {
 			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;
-			}
-		}
-	};
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -113,8 +91,8 @@ var JuliaMaterialDef =
 				// 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/julia-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index 63367e16..d89fa594 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -11,7 +11,7 @@ var JuliaMaterial = function JuliaMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-	this._name = "JuliaMaterial";
+	this._name = "Julia";
 	this._shaderName = "julia";
 
 	this._defaultTexMap = 'assets/images/rocky-normal.jpg';
-- 
cgit v1.2.3