Merge branch 'refs/heads/master' into binding

1 files changed, 17 insertions, 32 deletions

diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index 7aeec3dc..d89fa594 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -5,15 +5,16 @@
  </copyright> */
 
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
 
 var JuliaMaterial = function JuliaMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "JuliaMaterial";
+        this._name = "Julia";
         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;
@@ -21,25 +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 ) {
-                // allocate a new uber 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] );
-
-                return newMat;
-        };
 
         this.init = function( world ) {
                 // save the world
@@ -60,23 +58,10 @@ var JuliaMaterial = function JuliaMaterial() {
         }
 
                 // 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;
-                        }
-                }
-        };
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -106,8 +91,8 @@ var JuliaMaterialDef =
                                 // parameters
                                 'params' : 
                                 {
-                                        'u_tex0': { 'type' : 'tex2d' },
                                         'u_time' : { 'type' : 'float' },
+                                        'u_speed' : { 'type' : 'float' },
                                         'u_resolution'  :   { 'type' : 'vec2' },
                                 },