Merge branch 'refs/heads/ninja-internal' into GIO_Fixes

1 files changed, 22 insertions, 36 deletions

diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js
index 7fcca081..b757afb8 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-material.js
@@ -6,46 +6,44 @@ 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 TwistMaterial = function TwistMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-    this._name = "TwistMaterial";
+    this._name = "Twist";
     this._shaderName = "twist";
 
-    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
+    // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    // 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,  u_speed_index = 1;
+        this._propNames                 = ["u_tex0",            "u_speed" ];
+        this._propLabels                = ["Texture map",       "Speed" ];
+        this._propTypes                 = ["file",                      "float" ];
+        this._propValues                = [];
+    this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+    this._propValues[this._propNames[u_speed_index]] = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
-    // Methods
+    // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    // duplcate method requirde
-    this.dup = function (world) {
-        // allocate a new uber material
-        var newMat = new TwistMaterial();
-
-        // 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.isAnimated         = function()    {  return true;                         };
+        this.getShaderDef       = function()    {  return twistMaterialDef;     };
 
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
     this.init = function (world) {
         // save the world
         if (world) this.setWorld(world);
@@ -65,23 +63,10 @@ var TwistMaterial = function TwistMaterial() {
         }
 
         // set the shader values in the shader
-        this.updateTexture();
+        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,6 +98,7 @@ var twistMaterialDef =
                                 {
                                     'u_tex0': { 'type': 'tex2d' },
                                     'u_time': { 'type': 'float' },
+                                    'u_speed': { 'type': 'float' },
                                     'u_resolution': { 'type': 'vec2' }
                                 },