Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

27 files changed, 3039 insertions, 2631 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 3db3df1d..044dc59b 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -40,92 +40,104 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._name = "Bump Metal";
-        this._shaderName = "bumpMetal";
+    this._name = "Bump Metal";
+    this._shaderName = "bumpMetal";
 
 
+        this._defaultLightDiff = [0.3, 0.3, 0.3, 1.0];
     this._defaultDiffuseTexture = "assets/images/metal.png";
     this._defaultSpecularTexture = "assets/images/silver.png";
-        this._defaultNormalTexture = "assets/images/normalMap.png";
+    this._defaultNormalTexture = "assets/images/normalMap.png";
 
     // array textures indexed by shader uniform name
     this._glTextures = [];
 
-        this._speed = 1.0;
+    this._speed = 1.0;
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this.isAnimated                 = function()            {  return true;                                 };
-        this.getShaderDef               = function()            {  return bumpMetalMaterialDef; };
+    this.isAnimated         = function()        {  return true;                 };
+    this.getShaderDef       = function()        {  return bumpMetalMaterialDef; };
 
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["u_light0Diff",              "u_colMap",                     "u_normalMap",  "u_glowMap" ];
-        this._propLabels                = ["Diffuse Color",             "Diffuse Map",          "Bump Map",             "Specular Map" ];
-        this._propTypes                 = ["color",                             "file",                         "file",                 "file" ];
-        this._propValues                = [];
+    this._propNames         = ["u_light0Diff",      "u_colMap",         "u_normalMap",  "u_glowMap" ];
+    this._propLabels        = ["Diffuse Color",     "Diffuse Map",      "Bump Map",     "Specular Map" ];
+    this._propTypes         = ["color",             "file",             "file",         "file" ];
+    this._propValues        = [];
 
-        this._propValues[ this._propNames[0] ] = [0.3, 0.3, 0.3, 1.0];
-        this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
-        this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
-        this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
+        this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
+    this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+    this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+    this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
 
 
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
 
-        this.init = function( world )
-        {
-                // save the world
-                if (world) {
-                         this.setWorld( world );
+    this.init = function( world )
+    {
+        // save the world
+        if (world) {
+             this.setWorld( world );
         }
 
-                // set up the shader
-                this._shader = new RDGE.jshader();
-                this._shader.def = bumpMetalMaterialDef;
-                this._shader.init();
+        // set up the shader
+        this._shader = new RDGE.jshader();
+        this._shader.def = bumpMetalMaterialDef;
+        this._shader.init();
+
+        // set up the material node
+        this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
+        this._materialNode.setShader(this._shader);
 
-                // set up the material node
-                this._materialNode = RDGE.createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
-                this._materialNode.setShader(this._shader);
+        this.setShaderValues();
+        this.update(0);
+    };
 
-                this.setShaderValues();
-                this.update(0);
-        };
+        this.resetToDefault = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
+                this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+                this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+                this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
+                for (var i=0; i<4;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+};
 };
 
+
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
- 
+
 // shader spec (can also be loaded from a .JSON file, or constructed at runtime)
 var bumpMetalMaterialDef = bumpMetalShaderDef =
 {
-        'shaders':
-        {
-                // this shader is being referenced by file
-                'defaultVShader':"assets/shaders/test_vshader.glsl",
-                'defaultFShader':"assets/shaders/test_fshader.glsl",
-                        
-                // this shader is inline
-                'dirLightVShader': "\
-                        uniform mat4 u_mvMatrix;\
-                        uniform mat4 u_normalMatrix;\
-                        uniform mat4 u_projMatrix;\
-                        uniform mat4 u_worldMatrix;\
-                        attribute vec3  a_pos;\
-                        attribute vec3  a_nrm;\
-                        varying vec3 vNormal;\
-                        varying vec3 vPos;\
-                        void main() {\
-                                vNormal.xyz = (u_normalMatrix*vec4(a_nrm, 0.0)).xyz;\
-                                gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0);\
-                                vPos = (u_worldMatrix * vec4(a_pos,1.0)).xyz;\
-                        }",             
-                'dirLightFShader': "\
+    'shaders':
+    {
+        // this shader is being referenced by file
+        'defaultVShader':"assets/shaders/test_vshader.glsl",
+        'defaultFShader':"assets/shaders/test_fshader.glsl",
+
+        // this shader is inline
+        'dirLightVShader': "\
+            uniform mat4 u_mvMatrix;\
+            uniform mat4 u_normalMatrix;\
+            uniform mat4 u_projMatrix;\
+            uniform mat4 u_worldMatrix;\
+            attribute vec3  a_pos;\
+            attribute vec3  a_nrm;\
+            varying vec3 vNormal;\
+            varying vec3 vPos;\
+            void main() {\
+                vNormal.xyz = (u_normalMatrix*vec4(a_nrm, 0.0)).xyz;\
+                gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0);\
+                vPos = (u_worldMatrix * vec4(a_pos,1.0)).xyz;\
+            }",
+        'dirLightFShader': "\
             precision highp float;\
             uniform vec4 u_light1Diff;\
             uniform vec3 u_light1Pos;\
@@ -142,37 +154,37 @@ var bumpMetalMaterialDef = bumpMetalShaderDef =
                 float alpha2 = max(0.0, 1.0 - ( (light2.x*light2.x)/range + (light2.y*light2.y)/range + (light2.z*light2.z)/range));\