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

1 files changed, 21 insertions, 17 deletions

diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index 37bef66a..4e8bd9b5 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -5,43 +5,46 @@
  </copyright> */
 
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
+var Texture = require("js/lib/rdge/texture").Texture;
 
 var FlyMaterial = function FlyMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "FlyMaterial";
+        this._name = "Fly";
         this._shaderName = "fly";
 
-        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,  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;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Material Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+        this.isAnimated                 = function()                    {  return true;         };
+        this.getShaderDef               = function()                    {  return flyMaterialDef;       };
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
         // duplcate method requirde
-        this.dup = function( world ) {
-                // allocate a new uber material
-                var newMat = new FlyMaterial();
-
-                // 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
@@ -62,7 +65,7 @@ var FlyMaterial = function FlyMaterial() {
         }
 
                 // set the shader values in the shader
-                this.updateTexture();
+        this.setShaderValues();
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
@@ -98,6 +101,7 @@ var flyMaterialDef =
                                 {
                                         'u_tex0': { 'type' : 'tex2d' },
                                         'u_time' : { 'type' : 'float' },
+                                        'u_speed'  : { 'type' : 'float' },
                                         'u_resolution'  :   { 'type' : 'vec2' },
                                 },