1 files changed, 59 insertions, 15 deletions

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index f26aa16c..bb8833b4 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -4,13 +4,21 @@
  (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() {
+var PulseMaterial = function PulseMaterial()
+{
+    var MaterialLibrary = require("js/models/materials-model").MaterialsModel;
+
+   // initialize the inherited members
+    this.inheritedFrom = Material;
+    this.inheritedFrom();
+   
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -18,6 +26,8 @@ var PulseMaterial = function PulseMaterial() {
         this._shaderName = "pulse";
 
         this._texMap = 'assets/images/cubelight.png';
+        //this._texMap = 'assets/images/cloud10.png';
+        //this._texMap = 'texture';
 
         this._time = 0.0;
         this._dTime = 0.01;
@@ -71,18 +81,19 @@ var PulseMaterial = function PulseMaterial() {
                 // save the world
                 if (world)  this.setWorld( world );
 
-                // allocate a new uber material
-                var newMat = new PulseMaterial();
+        // 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] );
-        }
+        var n = propNames.length;
+        for (var i = 0; i < n; i++)
+            newMat.setProperty(propNames[i], propValues[i]);
 
-                return newMat;
+        return newMat;
         };
 
         this.init = function( world ) {
@@ -107,6 +118,9 @@ var PulseMaterial = function PulseMaterial() {
                         this._shader['default'].u_time.set( [this._time] );
         }
 
+        // 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();
@@ -120,9 +134,14 @@ var PulseMaterial = function PulseMaterial() {
                         var technique = material.shaderProgram['default'];
                         var renderer = RDGE.globals.engine.getContext().renderer;
                         if (renderer && technique) {
-                                var texMapName = this._propValues[this._propNames[0]];
                                 var wrap = 'REPEAT',  mips = true;
-                                var tex = this.loadTexture( texMapName, wrap, mips );
+                var tex;
+                if (this._glTex)
+                {
+                    if (this._glTex.isAnimated())
+                        this._glTex.render();
+                    tex = this._glTex.getTexture();
+                }
                                 
                                 if (tex) {
                                         technique.u_tex0.set( tex );
@@ -131,6 +150,20 @@ var PulseMaterial = function PulseMaterial() {
                 }
         };
 
+        
+        this.updateTextures = function()
+        {
+                if (this._glTex)
+                {
+                        if (!this._glTex.isAnimated())
+                        {
+                                this._glTex.render();
+                                this.updateTexture();
+                        }
+                }
+        }
+
+
         this.update = function( time )
         {
                 var material = this._materialNode;
@@ -138,7 +171,18 @@ var PulseMaterial = function PulseMaterial() {
                 {
                         var technique = material.shaderProgram['default'];
                         var renderer = RDGE.globals.engine.getContext().renderer;
-                        if (renderer && technique) {
+                        if (renderer && technique)
+            {
+                if (this._glTex)
+                {
+                    //this.updateTexture();
+                    if (this._glTex.isAnimated())
+                        this._glTex.render();
+                    tex = this._glTex.getTexture();
+                                    if (tex)
+                                            technique.u_tex0.set( tex );
+                }
+
                                 if (this._shader && this._shader['default']) {
                                         this._shader['default'].u_time.set( [this._time] );
                 }
@@ -235,7 +279,7 @@ var pulseMaterialDef =
         }
 };
 
-PulseMaterial.prototype = new Material();
+//PulseMaterial.prototype = new Material();
 
 if (typeof exports === "object") {
     exports.PulseMaterial = PulseMaterial;