Merge branch 'master' into pentool

1 files changed, 244 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
new file mode 100644
index 00000000..41e68182
--- /dev/null
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -0,0 +1,244 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (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() {
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+        this._name = "RadialBlurMaterial";
+        this._shaderName = "radialBlur";
+
+        this._texMap = 'assets/images/cubelight.png';
+        this._color = [1,0,0,1];
+
+        this._time = 0.0;
+        this._dTime = 0.01;
+
+    ///////////////////////////////////////////////////////////////////////
+    // 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;         };
+
+    ///////////////////////////////////////////////////////////////////////
+    // Material Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+        this._propNames                 = ["texmap",                    "color"];
+        this._propLabels                = ["Texture map",               "Color"];
+        this._propTypes                 = ["file",                              "color"];
+        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;
+                }
+        };
+    ///////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+        // duplcate method requirde
+        this.dup = function( ) {
+                // allocate a new uber material
+                var newMat = new RadialBlurMaterial();
+
+                // 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
+                if (world)  this.setWorld( world );
+
+                // set up the shader
+                this._shader = new jshader();
+                this._shader.def = radialBlurMaterialDef;
+                this._shader.init();
+
+                // set up the material node
+                this._materialNode = createMaterialNode("radialBlurMaterial");
+                this._materialNode.setShader(this._shader);
+
+                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.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
+                this.update( 0 );
+        };
+
+        this.updateTexture = function() {
+                var material = this._materialNode;
+                if (material) {
+                        var technique = material.shaderProgram['default'];
+                        var renderer = g_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;
+                if (material) {
+                        var technique = material.shaderProgram['default'];
+                        var renderer = g_Engine.getContext().renderer;
+                        if (renderer && technique) {
+                                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;
+                        }
+                }
+        };
+
+        this.setResolution = function( res ) {
+                var material = this._materialNode;
+                if (material)
+                {
+                        var technique = material.shaderProgram['default'];
+                        var renderer = g_Engine.getContext().renderer;
+                        if (renderer && technique) {
+                                technique.u_resolution.set( res );
+                        }
+                }
+        };
+
+        this.export = function() {
+                // every material needs the base type and instance name
+                var exportStr = "material: " + this.getShaderName() + "\n";
+                exportStr += "name: " + this.getName() + "\n";
+                
+                // every material needs to terminate like this
+                exportStr += "endMaterial\n";
+
+                return exportStr;
+        };
+
+        this.import = function( importStr ) {
+                var pu = new MaterialParser( importStr );
+                var material = pu.nextValue( "material: " );
+                if (material != this.getShaderName())  throw new Error( "ill-formed material" );
+                this.setName(  pu.nextValue( "name: ") );
+
+                var rtnStr;
+        try
+        {
+            var endKey = "endMaterial\n";
+            var index = importStr.indexOf( endKey );
+            index += endKey.length;
+            rtnStr = importStr.substr( index );
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + importStr );
+        }
+                
+                return rtnStr;
+        }
+};
+
+///////////////////////////////////////////////////////////////////////////////////////
+// RDGE shader
+ 
+// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
+var radialBlurMaterialDef =
+{'shaders': 
+        {
+                'defaultVShader':"assets/shaders/Basic.vert.glsl",
+                'defaultFShader':"assets/shaders/radialBlur.frag.glsl"
+        },
+        'techniques':
+        { 
+                'default':
+                [
+                        {
+                                'vshader' : 'defaultVShader',
+                                'fshader' : 'defaultFShader',
+                                // attributes