Merge branch 'refs/heads/Ninja-Internal' into Color

1 files changed, 0 insertions, 673 deletions

diff --git a/js/helper-classes/RDGE/Materials/UberMaterial.js b/js/helper-classes/RDGE/Materials/UberMaterial.js
deleted file mode 100755
index c7855c95..00000000
--- a/js/helper-classes/RDGE/Materials/UberMaterial.js
+++ /dev/null
@@ -1,673 +0,0 @@
-/* <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 UberMaterial
-////      RDGE representation of a material.
-/////////////////////////////////////////////////////////////////////////
-function UberMaterial()
-{
-    // initialize the inherited members
-    this.inheritedFrom = GLMaterial;
-    this.inheritedFrom();
-   
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-        this._name = "UberMaterial";
-        this._shaderName = "uber";
-        this.getShaderName = function() {  return this._shaderName;  };
-
-        // set some default values
-        this._ambientColor  = [ 0.0, 0.0, 0.0, 1.0 ];
-        this._diffuseColor  = [ 1.0, 1.0, 1.0, 1.0 ];
-        this._specularColor = [ 1.0, 1.0, 1.0, 1.0 ];
-        this._specularPower = 32.0;
-        this._environmentAmount = 0.2;          // 0 .. 1
-
-        // set the default maps
-        this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
-        this._normalMapOb = { 'texture' : 'assets/images/rocky-normal.jpg', 'wrap' : 'REPEAT' };
-        this._specularMapOb = { 'texture' : 'assets/images/rocky-spec.jpg', 'wrap' : 'REPEAT' };
-        this._environmentMapOb = { 'texture' : 'assets/images/silver.png', 'wrap' : 'CLAMP', 'envReflection' : this._environmentAmount };
-
-        this._useDiffuseMap             = true;
-        this._useNormalMap              = true;
-        this._useSpecularMap    = true;
-        this._useEnvironmentMap = true;
-        this._useLights                 = [true, true, true, true];
-
-    ///////////////////////////////////////////////////////////////////////
-    // Material Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-        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);
-        this._propValues[ this._propNames[1] ] = this._diffuseColor.slice(0);
-        this._propValues[ this._propNames[2] ] = this._specularColor.slice(0);
-        this._propValues[ this._propNames[3] ] = this._specularPower;
-        this._propValues[ this._propNames[4] ] = this._diffuseMapOb['texture'];
-        this._propValues[ this._propNames[5] ] = this._normalMapOb['texture'];
-        this._propValues[ this._propNames[6] ] = this._specularMapOb['texture'];
-        this._propValues[ this._propNames[7] ] = this._environmentMapOb['texture'];
-        this._propValues[ this._propNames[8] ] = this._environmentMapOb['envReflection'];
-
-        this.setProperty = function( prop, value )
-        {
-                if (prop == "color")  prop = "ambientColor";
-                var valid = this.validateProperty( prop, value );
-                if (valid)
-                {
-                        this._propValues[prop] = value;
-
-                        switch (prop)
-                        {
-                                case "diffuseMap":
-                                        this.updateDiffuseMap();
-                                        break;
-                                case "normalMap":
-                                        this.updateNormalMap();
-                                        break;
-                                case "specularMap":
-                                        this.updateSpecularMap();
-                                        break;
-                                case "environmentMap":
-                                        this.updateEnvironmentMap();
-                                        break;
-                                case "environmentAmount":
-                                        this.updateEnvironmentAmount( value );
-                                        break;
-                                case "specularPower":
-                                        this.updateSpecularPower( value );
-                                        break;
-                                case "ambientColor":
-                                        this.updateAmbientColor( value );
-                                        break;
-                                case "diffuseColor":
-                                        this.updateDiffuseColor( value );
-                                        break;
-                                case "specularColor":
-                                        this.updateSpecularColor( value );
-                                        break;
-                        }
-                }
-        };
-    ///////////////////////////////////////////////////////////////////////
-
-        // define the 4 lights
-        this._lights = [
-
-                {
-                        'type' : 'point',                           // can be 'directional', 'point' or 'spot'
-                        'spotInnerCutoff' : 14.0,                   // fragments in the inner cutoff 'cone' are full intensity.
-                        'spotOuterCutoff' : 15.0,                   // fragments outside the outer cutoff 'cone' are unlit.
-                        'position' : [ 8.0, 2.0, 8.0 ],             // light position; ignored for directional lights
-                        'direction' : [ -1.0, -1.0, -1.0 ],         // light direction; ignored for point lights
-                        'attenuation' : [ 1.0, 0.025, 0.00125 ],    // light attenuation; constant, linear, quadratic 
-                        'diffuseColor' : [ 1.0, 0.5, 0.5, 1.0 ],    // diffuse light color
-                        'specularColor' : [ 1.0, 1.0, 1.0, 1.0 ]    // specular light color  
-                },
-                {
-                        'type' : 'point',
-                        'spotInnerCutoff' : 9.0,               
-                        'spotOuterCutoff' : 20.0,               
-                        'position' : [ -8.0, 2.0, 8.0 ],         
-                        'direction' : [ 1.0, -1.0, -1.0 ],
-                        'attenuation' : [ 1.0, 0.025, 0.00125 ],
-                        'diffuseColor' : [ 0.5, 1.0, 0.5, 1.0 ],
-                        'specularColor' : [ 1.0, 1.0, 1.0, 1.0 ]
-                },
-                {
-                        'type' : 'point',
-                        'spotInnerCutoff' : 9.0,               
-                        'spotOuterCutoff' : 20.0,               
-                        'position' : [ -8.0, 2.0, -8.0 ],
-                        'direction' : [ 1.0, -1.0, 1.0 ],
-                        'attenuation' : [ 1.0, 0.25, 0.0125 ], 
-                        'diffuseColor' : [ 0.5, 0.5, 1.0, 1.0 ],
-                        'specularColor' : [ 1.0, 1.0, 1.0, 1.0 ]
-                },
-                {
-                        'type' : 'point',
-                        'spotInnerCutoff' : 9.0,               
-                        'spotOuterCutoff' : 20.0,               
-                        'position' : [ 8.0, 4.0, -8.0 ],
-                        'direction' : [ -1.0, -1.0, 1.0 ],
-                        'attenuation' : [ 1.0, 0.25, 0.0125 ],
-                        'diffuseColor' : [ 1.0, 1.0, 0.5, 1.0 ],
-                        'specularColor' : [ 1.0, 1.0, 1.0, 1.0 ]
-                }
-        ];
-
-        this._ubershaderCaps =
-        {
-                // 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)
-                },
- 
-                // ubershader supports up to four lights. 
-                'lighting' : {
-                        'light0' : this._lights[0],
-                        'light1' : this._lights[1],
-                        'light2' : this._lights[2],        
-                        'light3' : this._lights[3]                                     
-                },
-    
-                // uvTransform can be used to scale or offset the texture coordinates.
-                'uvTransform' : [ 2.0, 0, 0, 0, 0, 2.0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1],
-    
-                // optional diffuse map
-                'diffuseMap' : this._diffuseMapOb,
-    
-                // optional normal map
-                'normalMap' : this._normalMapOb,
-    
-                // optional specular map
-                'specularMap' : this._specularMapOb,
-    
-                // optional environment map
-                'environmentMap' : this._environmentMapOb
-        };
-
-        this.updateAmbientColor = function()
-        {
-                this._ambientColor = this._propValues['ambientColor'].slice(0);
-                var material = this._materialNode;
-                if (material)
-                {
-                        var technique = material.shaderProgram.defaultTechnique;    
-                        technique.u_ambientColor.set(this._ambientColor);
-                }
-        };
-
-        this.updateDiffuseColor = function()
-        {
-                this._diffuseColor = this._propValues['diffuseColor'].slice(0);
-
-                var material = this._materialNode;
-                if (material)
-                {