Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

22 files changed, 4606 insertions, 0 deletions

diff --git a/js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js b/js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
new file mode 100755
index 00000000..a7a3724e
--- /dev/null
+++ b/js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
@@ -0,0 +1,302 @@
+/* <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> */
+
+
+///////////////////////////////////////////////////////////////////////
+// Class GLMaterial
+//      RDGE representation of a material.
+///////////////////////////////////////////////////////////////////////
+function BumpMetalMaterial()
+{
+    // initialize the inherited members
+    this.inheritedFrom = GLMaterial;
+    this.inheritedFrom();
+   
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+        this._name = "BumpMetalMaterial";
+        this._shaderName = "bumpMetal";
+
+        this._lightDiff = [0.3, 0.3, 0.3, 1.0];
+        this._diffuseTexture = "assets/images/metal.png";
+        this._specularTexture = "assets/images/silver.png";
+        this._normalTexture = "assets/images/normalMap.png";
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+        this.getName                    = function()            {       return this._name;                                                              };
+        this.getShaderName              = function()            {       return this._shaderName;                                                };
+
+        this.getLightDiff               = function()            {       return this._lightDiff;                                                 };
+        this.setLightDiff               = function(ld)          {       this._lightDiff = ld;
+                                                                                                        if (this._shader && this._shader.default)
+                                                                                                                this._shader.default.u_light0Diff.set( ld );    };
+
+        this.getDiffuseTexture  = function()            {  return this._propValues[this._propNames[1]] ? this._propValues[this._propNames[1]].slice() : null    };
+        this.setDiffuseTexture  = function(m)           {  this._propValues[this._propNames[1]] = m ? m.slice(0) : null;  this.updateTexture(1);        };
+
+        this.getNormalTexture   = function()            {  return this._propValues[this._propNames[2]] ? this._propValues[this._propNames[2]].slice() : null    };
+        this.setNormalTexture   = function(m)           {  this._propValues[this._propNames[2]] = m ? m.slice(0) : null;  this.updateTexture(2);        };
+
+        this.getSpecularTexture = function()            {  return this._propValues[this._propNames[3]] ? this._propValues[this._propNames[3]].slice() : null    };
+        this.setSpecularTexture = function(m)           {  this._propValues[this._propNames[3]] = m ? m.slice(0) : null;  this.updateTexture(3);        };
+
+        this.isAnimated                 = function()            {  return true;                                 };
+
+    ///////////////////////////////////////////////////////////////////////
+    // Material Property Accessors
+    ///////////////////////////////////////////////////////////////////////
+        this._propNames                 = ["lightDiff",         "diffuseTexture",       "normalMap",    "specularTexture"];
+        this._propLabels                = ["Diffuse Color",     "Diffuse Map",  "Bump Map",             "Specular Map"];
+        this._propTypes                 = ["color",                     "file",                 "file",                 "file"];
+        this._propValues                = [];
+
+        this._propValues[ this._propNames[0] ] = this._lightDiff.slice(0);
+        this._propValues[ this._propNames[1] ] = this._diffuseTexture.slice(0);
+        this._propValues[ this._propNames[2] ] = this._normalTexture.slice(0);
+        this._propValues[ this._propNames[3] ] = this._specularTexture.slice(0);
+
+    // TODO - shader techniques are not all named the same, i.e., FlatMaterial uses "colorMe" and BrickMaterial uses "default"
+    this.setProperty = function( prop, value )
+        {
+                // every material should do something with the "color" property
+                if (prop === "color")  prop = "lightDiff";
+
+                // make sure we have legitimate imput
+                var ok = this.validateProperty( prop, value );
+                if (!ok)
+                {
+                        console.log( "invalid property in Bump Metal Materia;" + prop + " : " + value );
+                        return;
+                }
+
+                switch (prop)
+                {
+                        case "lightDiff":               this.setLightDiff( value );                     break;
+                        case "diffuseTexture":  this.setDiffuseTexture( value );        break;
+                        case "specularTexture": this.setSpecularTexture( value );       break;
+                        case "normalMap":               this.setNormalTexture( value );         break;
+
+                        default:
+                                console.log( "invalid property to Bump Metal Material: " + prop + ", value: " + value );
+                                break;
+                }
+        };
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+        // duplcate method requirde
+        this.dup = function()   {  return new BumpMetalMaterial();      };
+
+        this.init = function( world )
+        {
+                // save the world
+                if (world)  this.setWorld( world );
+
+                // set up the shader
+                this._shader = new jshader();
+                this._shader.def = bumpMetalMaterialDef;
+                this._shader.init();
+                this._shader.default.u_light0Diff.set( this.getLightDiff() );
+
+                // set up the material node
+                this._materialNode = createMaterialNode( this.getShaderName() );
+                this._materialNode.setShader(this._shader);
+
+                // set some image maps
+                this.updateTexture(1);
+        this.updateTexture(2);
+        this.updateTexture(3);
+        };
+
+        this.updateTexture = function( index )
+        {
+                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[index]];
+                                var wrap = 'REPEAT',  mips = true;
+                                var tex = this.loadTexture( texMapName, wrap, mips );
+
+                                if (tex)
+                                {
+                                        switch (index)
+                                        {
+                                                case 1:         technique.u_colMap.set( tex );          break;
+                                                case 2:         technique.u_normalMap.set( tex );       break;
+                                                case 3:         technique.u_glowMap.set( tex );         break;
+                                                default:        console.log( "invalid map index in BumpMetalMaterial, " + index );
+                                        }
+                                }
+                        }
+                }
+        };
+
+        this.export = function()
+        {
+                // every material needs the base type and instance name
+                var exportStr = "material: " + this.getShaderName() + "\n";
+                exportStr += "name: " + this.getName() + "\n";
+
+                exportStr += "lightDiff: "                      + this.getLightDiff()           + "\n";
+                exportStr += "diffuseTexture: "         + this.getDiffuseTexture()      + "\n";
+                exportStr += "specularTexture: "        + this.getSpecularTexture()     + "\n";
+                exportStr += "normalMap: "              + this.getNormalTexture()       + "\n";
+
+                // every material needs to terminate like this