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

1 files changed, 28 insertions, 28 deletions

diff --git a/js/helper-classes/RDGE/Materials/UberMaterial.js b/js/helper-classes/RDGE/Materials/UberMaterial.js
index 73356b03..c7855c95 100644
--- a/js/helper-classes/RDGE/Materials/UberMaterial.js
+++ b/js/helper-classes/RDGE/Materials/UberMaterial.js
@@ -21,7 +21,7 @@ function UberMaterial()
     ///////////////////////////////////////////////////////////////////////
         this._name = "UberMaterial";
         this._shaderName = "uber";
-        this.getShaderName = function() {  return this._shaderName;  }
+        this.getShaderName = function() {  return this._shaderName;  };
 
         // set some default values
         this._ambientColor  = [ 0.0, 0.0, 0.0, 1.0 ];
@@ -99,7 +99,7 @@ function UberMaterial()
                                         break;
                         }
                 }
-        }
+        };
     ///////////////////////////////////////////////////////////////////////
 
         // define the 4 lights
@@ -151,10 +151,10 @@ function UberMaterial()
         {
                 // ubershader material properties. 
                 'material' : {
-                        'ambientColor'    : this._ambientColor,     // material ambient color
-                        'diffuseColor'    : this._diffuseColor,     // material diffuse color
-                        'specularColor'   : this._specularColor,    // material specular color
-                        'specularPower'   : this._specularPower,    // material specular power (shininess)
+                        'ambientColor'    : this._ambientColor,    // material ambient color
+                        'diffuseColor'    : this._diffuseColor,    // material diffuse color
+                        'specularColor'   : this._specularColor,   // material specular color
+                        'specularPower'   : this._specularPower    // material specular power (shininess)
                 },
  
                 // ubershader supports up to four lights. 
@@ -162,7 +162,7 @@ function UberMaterial()
                         'light0' : this._lights[0],
                         'light1' : this._lights[1],
                         'light2' : this._lights[2],        
-                        'light3' : this._lights[3],                                     
+                        'light3' : this._lights[3]                                     
                 },
     
                 // uvTransform can be used to scale or offset the texture coordinates.
@@ -178,7 +178,7 @@ function UberMaterial()
                 'specularMap' : this._specularMapOb,
     
                 // optional environment map
-                'environmentMap' : this._environmentMapOb,
+                'environmentMap' : this._environmentMapOb
         };
 
         this.updateAmbientColor = function()
@@ -190,7 +190,7 @@ function UberMaterial()
                         var technique = material.shaderProgram.defaultTechnique;    
                         technique.u_ambientColor.set(this._ambientColor);
                 }
-        }
+        };
 
         this.updateDiffuseColor = function()
         {
@@ -202,7 +202,7 @@ function UberMaterial()
                         var technique = material.shaderProgram.defaultTechnique;    
                         technique.u_diffuseColor.set(this._diffuseColor);
                 }
-        }
+        };
 
         this.updateSpecularColor = function( value )
         {
@@ -214,7 +214,7 @@ function UberMaterial()
                         var technique = material.shaderProgram.defaultTechnique;    
                         technique.u_specularColor.set(this._specularColor);
                 }
-        }
+        };
 
         this.updateSpecularPower = function( value)
         {
@@ -226,7 +226,7 @@ function UberMaterial()
                         var technique = material.shaderProgram.defaultTechnique;    
                         technique.u_specularPower.set([this._specularPower]);
                 }
-        }
+        };
 
         this.updateEnvironmentAmount = function(value)
         {
@@ -238,7 +238,7 @@ function UberMaterial()
                         var technique = material.shaderProgram.defaultTechnique;
                         technique.u_envReflection.set([this._environmentMapOb.envReflection]);
                 }
-        }
+        };
 
         this.updateEnvironmentMap = function()
         {
@@ -276,7 +276,7 @@ function UberMaterial()
                                 }
                         }
                 }
-        }
+        };
 
         this.updateDiffuseMap = function(value)
         {
@@ -314,7 +314,7 @@ function UberMaterial()
                                 }
                         }
                 }
-        }
+        };
 
         this.updateSpecularMap = function()
         {
@@ -352,7 +352,7 @@ function UberMaterial()
                                 }
                         }
                 }
-        }
+        };
 
         this.updateNormalMap = function(value)
         {
@@ -390,7 +390,7 @@ function UberMaterial()
                                 }
                         }
                 }
-        }
+        };
         
         // duplcate method requirde
         this.dup = function()
@@ -413,7 +413,7 @@ function UberMaterial()
                         newMat.setProperty( propNames[i], propValues[i] );
 
                 return newMat;
-        } 
+        };
 
         this.init = function( world )
         {
@@ -426,7 +426,7 @@ function UberMaterial()
                 // set up the material node
                 this._materialNode = createMaterialNode("uberMaterial");
                 this._materialNode.setShader(this._shader);
-        }
+        };
 
         this.buildUberShader = function(caps)
         {
@@ -446,7 +446,7 @@ function UberMaterial()
                 {
                         preproc += '#define LIGHTING\n';
                         preproc += '#define SPECULAR\n';
-                        for(i = 0; i < 4; ++i) {
+                        for(var i = 0; i < 4; ++i) {
                                 var light = caps.lighting['light' + i];
                                 var t;
                                 if (typeof light != 'undefined') {
@@ -507,7 +507,7 @@ function UberMaterial()
                 var fshader = preproc + uberFShader;
 
                 // build output jshader  
-                uberJShader = new jshader();
+                var uberJShader = new jshader();
                 uberJShader.def = {
                         'shaders': {
                                 'defaultVShader': vshader,