Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

1 files changed, 19 insertions, 17 deletions

diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index 328330bf..4354408d 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -5,29 +5,43 @@
  </copyright> */
 
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
 
 var DeformMaterial = function DeformMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-    this._name = "DeformMaterial";
+    this._name = "Deform";
     this._shaderName = "deform";
 
-    this._texMap = 'assets/images/rocky-normal.jpg';
+    this._defaultTexMap = 'assets/images/rocky-normal.jpg';
 
     this._time = 0.0;
     this._dTime = 0.01;
 
+    // array textures indexed by shader uniform name
+    this._glTextures = [];
+
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
     // all defined in parent PulseMaterial.js
     // load the local default value
-    this._propValues[this._propNames[0]] = this._texMap.slice(0);
+        var u_tex0_index        = 0;
+        this._propNames                 = ["u_tex0",            "u_speed" ];
+        this._propLabels                = ["Texture map",       "Speed" ];
+        this._propTypes                 = ["file",                      "float" ];
+        this._propValues                = [];
+    this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
+    this._propValues[this._propNames[1]] = 1.0;
+
+        this._propValues[ this._propNames[  u_tex0_index] ] = this._defaultTexMap.slice(0);
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
+        this.isAnimated                 = function()                    {  return true;         };
+        this.getShaderDef               = function()                    {  return pulseMaterialDef;     }
 
     ///////////////////////////////////////////////////////////////////////
 
@@ -36,19 +50,6 @@ var DeformMaterial = function DeformMaterial() {
     // Methods
     ///////////////////////////////////////////////////////////////////////
     // duplcate method requirde
-    this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new DeformMaterial();
-
-        // 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
@@ -69,7 +70,7 @@ var DeformMaterial = function DeformMaterial() {
         }
 
         // set the shader values in the shader
-        this.updateTexture();
+        this.setShaderValues();
         this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
         this.update(0);
     };
@@ -104,6 +105,7 @@ var deformMaterialDef =
                                 {
                                         'u_tex0': { 'type' : 'tex2d' },
                                         'u_time' : { 'type' : 'float' },
+                                        'u_speed' : { 'type' : 'float' },
                                         'u_resolution'  :   { 'type' : 'vec2' }
                                 },