Merge branch 'refs/heads/master' into montage-v11-integration

Conflicts:
	js/io/system/ninjalibrary.json

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 12 insertions, 34 deletions

diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js
index a82a4bfc..4f3def4a 100644
--- a/js/lib/rdge/materials/mandel-material.js
+++ b/js/lib/rdge/materials/mandel-material.js
@@ -5,16 +5,15 @@
  </copyright> */
 
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
 
 var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "MandelMaterial";
+        this._name = "Mandel";
         this._shaderName = "mandel";
 
-        this._texMap = 'assets/images/rocky-normal.jpg';
-
         this._time = 0.0;
         this._dTime = 0.01;
 
@@ -26,31 +25,22 @@ var MandelMaterial = function MandelMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
+        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;
 
     ///////////////////////////////////////////////////////////////////////
 
-        this.isAnimated = function()  {
-        return true;
-    };
+        this.isAnimated         = function()    { return true;                                  };
+        this.getShaderDef       = function()    {  return MandelMaterialDef;    }
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
         // duplcate method requirde
-        this.dup = function( world ) {
-                // allocate a new uber 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] );
-        }
-
-                return newMat;
-        };
 
         this.init = function( world ) {
                 // save the world
@@ -71,22 +61,10 @@ var MandelMaterial = function MandelMaterial() {
         }
 
                 // 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;
-                        }
-                }
-        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -116,8 +94,8 @@ var MandelMaterialDef =
                                 // parameters
                                 'params' : 
                                 {
-                                        'u_tex0': { 'type' : 'tex2d' },
                                         'u_time' : { 'type' : 'float' },
+                                        'u_speed' : { 'type' : 'float' },
                                         'u_resolution'  :   { 'type' : 'vec2' },
                                 },