Material cleanup & bug fixes.

1 files changed, 13 insertions, 106 deletions

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 61ae0017..57f4a6e0 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -4,7 +4,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (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 RadialBlurMaterial = function RadialBlurMaterial() {
@@ -14,8 +13,8 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
     this._name = "RadialBlurMaterial";
     this._shaderName = "radialBlur";
 
-    this._texMap = 'assets/images/cubelight.png';
-    this._color = [1, 0, 0, 1];
+    this._defaultTexMap = 'assets/images/cubelight.png';
+    this._defaultColor = [1, 0, 0, 1];
 
     this._time = 0.0;
     this._dTime = 0.01;
@@ -23,68 +22,27 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this.getName = function () { return this._name; };
-    this.getShaderName = function () { return this._shaderName; };
-
-    this.getTextureMap = function () { return this._texMap.slice(0); };
-    this.setTextureMap = function (m) { this._propValues[this._propNames[0]] = m.slice(0); this.updateTexture(); };
-
-    this.isAnimated = function () { return true; };
+    this.getName                = function ()   { return this._name;                            };
+    this.getShaderName  = function ()   { return this._shaderName;                      };
+        this.getShaderDef       = function()    {  return radialBlurMaterialDef;        };
+    this.isAnimated             = function ()   { return true;                                          };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-    this._propNames = ["texmap", "color"];
-    this._propLabels = ["Texture map", "Color"];
-    this._propTypes = ["file", "color"];
+    this._propNames  = ["u_tex0",               "u_speed"];
+    this._propLabels = ["Texture map",  "Speed" ];
+    this._propTypes  = ["file",                 "float" ];
     this._propValues = [];
 
-    this._propValues[this._propNames[0]] = this._texMap.slice(0);
-    this._propValues[this._propNames[1]] = this._color.slice(0);
-
-    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);
-        }
-
-        switch (prop) {
-            case "texmap":
-                this.setTextureMap(value);
-                break;
-
-            case "color":
-                this._propValues[prop] = value.slice(0);
-                if (this._shader && this._shader['default']) {
-                    this._shader['default'][prop].set(value);
-                }
-                break;
-        }
-    };
+    this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
+    this._propValues[this._propNames[1]] = 1.0;
     ///////////////////////////////////////////////////////////////////////
 
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-    // duplicate method required
-    this.dup = function () {
-        // get the current values;
-        var propNames = [], propValues = [], propTypes = [], propLabels = [];
-        this.getAllProperties(propNames, propValues, propTypes, propLabels);
-        
-        // allocate a new material
-        var newMat = new RadialBlurMaterial();
-
-                // copy over the current values;
-        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
         if (world) this.setWorld(world);
@@ -101,31 +59,13 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
         this._time = 0;
         if (this._shader && this._shader['default'])
             this._shader['default'].u_time.set([this._time]);
-        this.setProperty("color", [this._time, 0, 0, 1]);
 
         // set the shader values in the shader
-        this.updateTexture();
+        this.setShaderValues();
         this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
         this.update(0);
     };
 
-    this.updateTexture = function () {
-        var material = this._materialNode;
-        if (material) {
-            var technique = material.shaderProgram['default'];
-            var renderer = RDGE.globals.engine.getContext().renderer;
-            if (renderer && technique) {
-                var texMapName = this._propValues[this._propNames[0]];
-                var tex = renderer.getTextureByName(texMapName, 'REPEAT');
-                //                              if (tex)
-                //                              {
-                //                                      var res = [tex.image.naturalWidth, tex.image.naturalHeight];
-                //                                      this.setResoloution( res );
-                //                              }
-                technique.u_tex0.set(tex);
-            }
-        }
-    };
 
     this.update = function () {
         var material = this._materialNode;
@@ -136,11 +76,6 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
                 if (this._shader && this._shader['default']) {
                     this._shader['default'].u_time.set([this._time]);
                 }
-
-                var color = this.getProperty("color");
-                color[0] = this._time;
-                this.setProperty("color", color);
-                //console.log( "update color to: " + color );
                 this._time += this._dTime;
             }
         }
@@ -156,34 +91,6 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
             }
         }
     };
-
-    this.exportJSON = function () {
-        var jObj =
-                {
-                    'material': this.getShaderName(),
-                    'name': this.getName(),
-                    'color': this._propValues["color"],
-                    'texture': this._propValues[this._propNames[0]]
-                };
-
-        return jObj;
-    };
-
-    this.importJSON = function (jObj) {
-        if (this.getShaderName() != jObj.material) throw new Error("ill-formed material");
-        this.setName(jObj.name);
-
-        var rtnStr;
-        try {
-            this._propValues[this._propNames[0]] = jObj.texture;
-            this.updateTexture();
-        }
-        catch (e) {
-            throw new Error("could not import material: " + importStr);
-        }
-
-        return rtnStr;
-    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -215,8 +122,8 @@ var radialBlurMaterialDef =
                                 {
                                     'u_tex0': { 'type': 'tex2d' },
                                     'u_time': { 'type': 'float' },
+                                    'u_speed': { 'type': 'float' },
                                     'u_resolution': { 'type': 'vec2' },
-                                    'color': { 'type': 'vec4' }
                                 },
 
                             // render states