1 files changed, 143 insertions, 53 deletions

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index f26aa16c..374a5eae 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -4,16 +4,24 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
-var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
+var Texture = require("js/lib/rdge/texture").Texture;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
 ///////////////////////////////////////////////////////////////////////
-var PulseMaterial = function PulseMaterial() {
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
+var PulseMaterial = function PulseMaterial()
+{
+        var MaterialLibrary = require("js/models/materials-model").MaterialsModel;
+
+   // initialize the inherited members
+        this.inheritedFrom = Material;
+        this.inheritedFrom();
+   
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
         this._name = "PulseMaterial";
         this._shaderName = "pulse";
 
@@ -22,9 +30,13 @@ var PulseMaterial = function PulseMaterial() {
         this._time = 0.0;
         this._dTime = 0.01;
 
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
+        this._xScale = 0.5;
+        this._yScale = 0.4;
+        this._speed  = 1.0;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Property Accessors
+        ///////////////////////////////////////////////////////////////////////
         this.getName            = function()    { return this._name;                    };
         this.getShaderName      = function()    {  return this._shaderName;             };
 
@@ -33,22 +45,25 @@ var PulseMaterial = function PulseMaterial() {
 
         this.isAnimated                 = function()                    {  return true;                                 };
 
-    ///////////////////////////////////////////////////////////////////////
-    // Material Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["texmap"];
-        this._propLabels                = ["Texture map"];
-        this._propTypes                 = ["file"];
+        ///////////////////////////////////////////////////////////////////////
+        // Material Property Accessors
+        ///////////////////////////////////////////////////////////////////////
+        this._propNames                 = ["texmap",            "xscale",               "yscale",               "speed" ];
+        this._propLabels                = ["Texture map",       "X Range",              "Y Range",              "Speed" ];
+        this._propTypes                 = ["file",                      "float",                "float",                "float"];
         this._propValues                = [];
 
         this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+        this._propValues[ this._propNames[1] ] = this._xScale;
+        this._propValues[ this._propNames[2] ] = this._yScale;
+        this._propValues[ this._propNames[3] ] = this._speed;
 
-    this.setProperty = function( prop, value ) {
+        this.setProperty = function( prop, value ) {
                 // make sure we have legitimate imput
                 var ok = this.validateProperty( prop, value );
-                if (!ok) {
-                        console.log( "invalid property in Radial Gradient Material:" + prop + " : " + value );
-        }
+                if (!ok && (prop != 'color')) {
+                        console.log( "invalid property in Material:" + prop + " : " + value );
+                }
 
                 switch (prop)
                 {
@@ -56,31 +71,50 @@ var PulseMaterial = function PulseMaterial() {
                                 this.setTextureMap(value);
                                 break;
 
+                        case "speed":
+                                this._speed = value;
+                                this._propValues[ this._propNames[3] ] = this._speed;
+                                this.updateParameters();
+                                break;
+
+                        case "xscale":
+                                this._xScale = value;
+                                this._propValues[ this._propNames[1] ] = this._xScale;
+                                this.updateParameters();
+                                break;
+
+                        case "yscale":
+                                this._yScale = value;
+                                this._propValues[ this._propNames[2] ] = this._yScale;
+                                this.updateParameters();
+                                break;
+
                         case "color":
                                 break;
                 }
         };
-    ///////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////
 
 
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        ///////////////////////////////////////////////////////////////////////
         // duplicate method required
         this.dup = function( world ) {
                 // save the world
                 if (world)  this.setWorld( world );
 
-                // allocate a new uber material
+                // get the current values;
+                var propNames = [], propValues = [], propTypes = [], propLabels = [];
+                this.getAllProperties(propNames, propValues, propTypes, propLabels);
+                
+                // allocate a new material
                 var newMat = new PulseMaterial();
 
                 // 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] );
-        }
+                for (var i = 0; i < n; i++)
+                        newMat.setProperty(propNames[i], propValues[i]);
 
                 return newMat;
         };
@@ -105,8 +139,12 @@ var PulseMaterial = function PulseMaterial() {
                 this._time = 0;
                 if (this._shader && this._shader['default']) {
                         this._shader['default'].u_time.set( [this._time] );
-        }
+                }
+                this.updateParameters();
 
+                // set up the texture
+                var texMapName = this._propValues[this._propNames[0]];
+                this._glTex = new Texture( world, texMapName );
 
                 // set the shader values in the shader
                 this.updateTexture();
@@ -114,19 +152,51 @@ var PulseMaterial = function PulseMaterial() {
                 this.update( 0 );
         };
 
+        this.updateParameters = function()
+        {
+                this._propValues[ this._propNames[1] ] = this._xScale;
+                this._propValues[ this._propNames[2] ] = this._yScale;
+                this._propValues[ this._propNames[3] ] = this._speed;
+
+                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_speed.set( [this._speed] );
+                                        this._shader['default'].u_xscale.set( [this._xScale] );
+                                        this._shader['default'].u_yscale.set( [this._yScale] );
+                                }
+                        }
+                }
+        }
+
         this.updateTexture = function() {
+                
+                var texMapName = this._propValues[this._propNames[0]];
+                this._glTex = new Texture( this.getWorld(), texMapName );
+
                 var material = this._materialNode;
                 if (material) {
                         var technique = material.shaderProgram['default'];
                         var renderer = RDGE.globals.engine.getContext().renderer;
                         if (renderer && technique) {