Merge branch 'integration' of github.com:ericmueller/ninja-internal into Textures

14 files changed, 908 insertions, 29 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index fe8a9dd5..ccd8e3ca 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -190,6 +190,46 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 }
         };
 
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'                      : this.getShaderName(),
+                        'name'                          : this.getName(),
+                        'lightDiff'                     : this.getLightDiff(),
+                        'diffuseTexture'        : this.getDiffuseTexture(),
+                        'specularTexture'       : this.getSpecularTexture(),
+                        'normalMap'                     : this.getNormalTexture()
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj )
+        {
+                if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+                this.setName( jObj.name );
+
+                try
+                {
+                        var lightDiff  = jObj.lightDiff,
+                                dt = jObj.diffuseTexture,
+                                st = jObj.specularTexture,
+                                nt = jObj.normalMap;
+                
+                        this.setProperty( "lightDiff",  lightDiff);
+                        this.setProperty( "diffuseTexture", dt );
+                        this.setProperty( "specularTexture", st );
+                        this.setProperty( "normalMap", nt );
+                }
+                catch (e)
+                {
+                        throw new Error( "could not import BumpMetal material: " + jObj );
+                }
+                
+                return;
+        };
+
         this.export = function()
         {
                 // every material needs the base type and instance name
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js
new file mode 100644
index 00000000..85088f91
--- /dev/null
+++ b/js/lib/rdge/materials/cloud-material.js
@@ -0,0 +1,300 @@
+/* <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;
+///////////////////////////////////////////////////////////////////////
+// Class GLMaterial
+//      RDGE representation of a material.
+///////////////////////////////////////////////////////////////////////
+var CloudMaterial = function CloudMaterial() {
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+        this._name = "CloudMaterial";
+        this._shaderName = "cloud";
+
+        this._texMap = 'assets/images/cloud2.jpg';
+        this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
+
+        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._propValues[this._propNames[0]] ? this._propValues[this._propNames[0]].slice() : null    };
+        this.setTextureMap                      = function(m)           {  this._propValues[this._propNames[0]] = m ? m.slice(0) : null;  this.updateTexture();         };
+
+        this.setDiffuseColor            = function(c)           {  this._propValues[this._propNames[1]] = c.slice(0);  this.updateColor();      };
+        this.getDiffuseColor            = function()            {  return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null;   };
+
+        this.isAnimated                 = function()                    {  return true;                                 };
+
+    ///////////////////////////////////////////////////////////////////////
+    // Material Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+        this._propNames                 = ["texmap",            "diffusecolor"];
+        this._propLabels                = ["Texture map",       "Diffuse Color"];
+        this._propTypes                 = ["file",                      "color"];
+        this._propValues                = [];
+
+        this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+        this._propValues[ this._propNames[1] ] = this._diffuseColor.slice();
+
+    this.setProperty = function( prop, value )
+        {
+                if (prop === 'color')  prop = 'diffusecolor';
+
+                // 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 "diffusecolor":
+                                this.setDiffuseColor( value );
+                                break;
+
+                        case "color":
+                                break;
+                }
+        };
+    ///////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+        // duplcate method requirde
+        this.dup = function( world )
+        {
+                // save the world
+                if (world)  this.setWorld( world );
+
+                // allocate a new uber material
+                var newMat = new CloudMaterial();
+
+                // 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 );
+
+                // this variable declared above is inherited set to a smaller delta.
+                // the cloud material runs a little faster
+                this._dTime = 0.01;
+
+                // set up the shader
+                this._shader = new jshader();
+                this._shader.def = cloudMaterialDef;
+                this._shader.init();
+
+                // set up the material node
+                this._materialNode = createMaterialNode("cloudMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode.setShader(this._shader);
+
+                this._time = 0;
+                if (this._shader && this._shader['default']) {
+                        this._shader['default'].u_time.set( [this._time] );
+                        this._shader['default'].u_DiffuseColor.set( this._diffuseColor );
+        }
+
+                // set the shader values in the shader
+                this.updateTexture();
+                this.update( 0 );
+        };
+
+        this.updateColor = function()
+        {
+                var material = this._materialNode;
+                if (material)
+                {
+                        var technique = material.shaderProgram['default'];
+                        var renderer = g_Engine.getContext().renderer;
+                        if (renderer && technique) {
+                                var color = this._propValues[this._propNames[1]];
+                                technique.u_DiffuseColor.set( this._diffuseColor );
+                        }
+                }
+        }