Merge branch 'refs/heads/Ninja-Internal' into FileIO

1 files changed, 26 insertions, 24 deletions

diff --git a/js/lib/rdge/materials/z-invert-material.js b/js/lib/rdge/materials/z-invert-material.js
index fc7632eb..b8870eb4 100644
--- a/js/lib/rdge/materials/z-invert-material.js
+++ b/js/lib/rdge/materials/z-invert-material.js
@@ -6,44 +6,45 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
 
 var ZInvertMaterial = function ZInvertMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-    this._name = "ZInvertMaterial";
+    this._name = "Z-Invert";
     this._shaderName = "zinvert";
 
-    this._texMap = 'assets/images/rocky-normal.jpg';
+    this._defaultTexMap = 'assets/images/rocky-normal.jpg';
 
     this._time = 0.0;
     this._dTime = 0.01;
 
-    ///////////////////////////////////////////////////////////////////////
-    // Properties
-    ///////////////////////////////////////////////////////////////////////
-    // all defined in parent PulseMaterial.js
-    // load the local default value
-    this._propValues[this._propNames[0]] = this._texMap.slice(0);
+    // array textures indexed by shader uniform name
+    this._glTextures = [];
+
+        this.isAnimated                 = function()                    {  return true;                         };
+        this.getShaderDef               = function()                    {  return zInvertMaterialDef;   };
+
+        ///////////////////////////////////////////////////////////////////////
+        // Properties
+        ///////////////////////////////////////////////////////////////////////
+        // all defined in parent PulseMaterial.js
+        // load the local default value
+        this._propNames                 = ["u_tex0",            "u_speed"];
+        this._propLabels                = ["Texture map",       "Speed"];
+        this._propTypes                 = ["file",                      "float"];
+
+        var u_tex_index                 = 0,
+                u_speed_index           = 1;
+
+        this._propValues                = [];
+        this._propValues[ this._propNames[u_tex_index           ] ]     = this._defaultTexMap.slice(0);
+        this._propValues[ this._propNames[u_speed_index         ] ]     = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-    // duplicate method required
-    this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new ZInvertMaterial();
-
-        // 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
@@ -64,7 +65,7 @@ var ZInvertMaterial = function ZInvertMaterial() {
         }
 
         // set the shader values in the shader
-        this.updateTexture();
+                this.setShaderValues();
         this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
         this.update(0);
     };
@@ -99,6 +100,7 @@ var zInvertMaterialDef =
                                 {
                                     'u_tex0': { 'type': 'tex2d' },
                                     'u_time': { 'type': 'float' },
+                                    'u_speed': { 'type': 'float' },
                                     'u_resolution': { 'type': 'vec2' }
                                 },