Merge branch 'refs/heads/NinjaInternal' into Color

1 files changed, 51 insertions, 36 deletions

diff --git a/js/helper-classes/RDGE/Materials/UberMaterial.js b/js/helper-classes/RDGE/Materials/UberMaterial.js
index a8254465..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 ];
@@ -45,9 +45,9 @@ function UberMaterial()
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
-        this._propNames                 = ["ambientColor",      "diffuseColor",         "specularColor",        "specularPower" ,       "diffuseMap",   "normalMap",    "specularMap",          "environmentMap",               "environmentAmount",                    "dummy" ];
-        this._propLabels                = ["Ambient Color",     "Diffuse Color",        "Specular Color",       "Specular Power",       "Texture Map",  "Bump Map",             "Specular Map",         "Environment Map",              "Environment Map Amount",               "Dummy" ];
-        this._propTypes                 = ["color",                     "color",                        "color",                        "float",                        "file",                 "file",                 "file",                         "file",                                 "float",                                                "checkbox"];
+        this._propNames                 = ["ambientColor",      "diffuseColor",         "specularColor",        "specularPower" ,       "diffuseMap",   "normalMap",    "specularMap",          "environmentMap",               "environmentAmount" ];
+        this._propLabels                = ["Ambient Color",     "Diffuse Color",        "Specular Color",       "Specular Power",       "Texture Map",  "Bump Map",             "Specular Map",         "Environment Map",              "Environment Map Amount" ];
+        this._propTypes                 = ["color",                     "color",                        "color",                        "float",                        "file",                 "file",                 "file",                         "file",                                 "float"         ];
         this._propValues                = [];
 
         this._propValues[ this._propNames[0] ] = this._ambientColor.slice(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()
         {
@@ -270,12 +270,13 @@ function UberMaterial()
                                         if (renderer && technique)
                                         {
                                                 var tex = renderer.getTextureByName(value, caps.environmentMap.wrap);
+                                                this.registerTexture( tex );
                                                 technique.s_environmentMap.set( tex );
                                         }
                                 }
                         }
                 }
-        }
+        };
 
         this.updateDiffuseMap = function(value)
         {
@@ -307,12 +308,13 @@ function UberMaterial()
                                         if (renderer && technique)
                                         {
                                                 var tex = renderer.getTextureByName(value, caps.diffuseMap.wrap);
+                                                this.registerTexture( tex );
                                                 technique.s_diffuseMap.set( tex );
                                         }
                                 }
                         }
                 }
-        }
+        };
 
         this.updateSpecularMap = function()
         {
@@ -344,12 +346,13 @@ function UberMaterial()
                                         if (renderer && technique)
                                         {
                                                 var tex = renderer.getTextureByName(value, caps.specularMap.wrap);
+                                                this.registerTexture( tex );
                                                 technique.s_specularMap.set( tex );
                                         }
                                 }
                         }
                 }
-        }
+        };
 
         this.updateNormalMap = function(value)
         {
@@ -381,12 +384,13 @@ function UberMaterial()
                                         if (renderer && technique)
                                         {
                                                 var tex = renderer.getTextureByName(value, caps.normalMap.wrap);