1 files changed, 388 insertions, 1 deletions

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index e2f86511..4ff3676a 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -4,6 +4,7 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 
+var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
 
 var UberMaterial = function UberMaterial() {
@@ -33,6 +34,8 @@ var UberMaterial = function UberMaterial() {
         this._useEnvironmentMap = true;
         this._useLights                 = [true, true, true, true];
 
+        this._MAX_LIGHTS                = 4;
+
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
@@ -363,10 +366,394 @@ var UberMaterial = function UberMaterial() {
                 this._shader = this.buildUberShader( this._ubershaderCaps );
 
                 // set up the material node
-                this._materialNode = RDGE.createMaterialNode("uberMaterial");
+                this._materialNode = RDGE.createMaterialNode("uberMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
         };
 
+        this.import = function( importStr )
+        {
+                // limit the key searches to this material
+        var endKey = "endMaterial\n";
+        var index = importStr.indexOf( endKey );
+        index += endKey.length;
+        importStr = importStr.slice( 0, index );
+                var pu = new MaterialParser( importStr );
+
+                var matProps = pu.nextValue( "materialProps: " );
+                if (matProps)
+                {
+                        var ambientColor  = eval( "[" + pu.nextValue("ambientColor: ")   + ']' );        this.setProperty( "ambientColor", ambientColor );
+                        var diffuseColor  = eval( "[" + pu.nextValue( "diffuseColor: ")  + ']' );        this.setProperty( "diffuseColor", diffuseColor );
+                        var specularColor = eval( "[" + pu.nextValue( "specularColor: ") + ']' );        this.setProperty( "specularColor", specularColor );
+                        var specularPower = eval( "[" + pu.nextValue( "specularPower: ") + ']' );    this.setProperty( "specularPower", specularPower );
+                }
+
+                var lightProps = pu.nextValue( "lightProps: " );
+                if (lightProps)
+                {
+                        this._lights = [];
+                        var lightStr;
+                        for (var i=0;  i<this._MAX_LIGHTS;  i++)
+                        {
+                                var type = pu.nextValue( "light" + i + ": " );
+                                if (type)
+                                {
+                                                var light = new Object;
+                                                switch (type)
+                                                {
+                                                        case "directional":
+                                                                lightStr = pu.nextValue( 'light' + i + 'Dir: ');
+                                                                light.direction = eval( "[" + lightStr + "]" );
+                                                                break;
+
+                                                        case "spot":
+                                                                lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
+                                                                light.position =  eval( "[" + lightStr + "]" );
+
+                                                                lightStr = pu.nextValue( 'light' + i + 'OuterSpotCutoff: ' );
+                                                                light['spotInnerCutoff'] = Number( lightStr );
+
+                                                                lightStr = pu.nextValue( 'light' + i + 'InnerSpotCutoff: ' );
+                                                                light['spotOuterCutoff'] = Number( lightStr );
+                                                                break;
+
+                                                        case "point":
+                                                                lightStr = pu.nextValue( 'light' + i + 'Pos: ' );
+                                                                light.position =  eval( "[" + lightStr + "]" );
+
+                                                                lightStr = pu.nextValue( 'light' + i + 'Attenuation: ' );
+                                                                light.attenuation =  eval( "[" + lightStr + "]" );
+                                                                break;
+
+                                                        default:
+                                                                throw new Error( "unrecognized light type on import: " + type );
+                                                                break;
+                                                }
+
+                                                // common to all lights
+                                                light.diffuseColor = eval( "[" + pu.nextValue( 'light' + i + 'Color: ') + "]" );
+                                                light.specularColor = eval( "[" + pu.nextValue( 'light' + i + 'SpecularColor: ') + "]" );
+
+                                                // push the light
+                                                this._lights.push( light );
+                                }
+                                else {
+                                        this._lights[i] = 'undefined';
+}
+
+                                // advance to the next light
+                                var endLightKey = "endMaterial\n";
+                                index = importStr.indexOf( endLightKey );
+                                if (index < 0)  throw new Error( "ill-formed light encountered in import" );
+                                index += endLightKey.length;
+                                importStr = importStr.slice( 0, index );
+
+                        }
+
+                        if (this._lights.length > 0)
+                        {
+                                this._ubershaderCaps.lighting =
+                                {
+                                        'light0' : this._lights[0],
+                                        'light1' : this._lights[1],
+                                        'light2' : this._lights[2],        
+                                        'light3' : this._lights[3]                                     
+                                }
+                        }
+                }
+
+                var diffuseMap = pu.nextValue( "diffuseMap: "  )
+                if(diffuseMap) {
+                        this.setProperty( "diffuseMap", diffuseMap );
+}
+
+                var normalMap = pu.nextValue( "normalMap: "  );
+                if(normalMap) {
+                        this.setProperty( "normalMap", normalMap );
+}
+
+                var specularMap = pu.nextValue( "specularMap: "  );
+                if(specularMap) {
+                        this.setProperty( "specularMap", specularMap );
+}
+
+                var environmentMap = pu.nextValue( "environmentMap: "  );
+                if(environmentMap)
+                {
+                        this.setProperty( "environmentMap", environmentMap );
+                        this.setProperty( "environmentAmount", Number( pu.nextValue( "environmentAmount" ) ) );
+                }
+
+                this.rebuildShader();
+        };
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName(  jObj.name );
+
+                if (jObj.materialProps)
+                {
+                        var ambientColor  = jObj.materialProps.ambientColor;     this.setProperty( "ambientColor", ambientColor );
+                        var diffuseColor  = jObj.materialProps.diffuseColor;     this.setProperty( "diffuseColor", diffuseColor );
+                        var specularColor = jObj.materialProps.specularColor;    this.setProperty( "specularColor", specularColor );
+                        var specularPower = jObj.materialProps.specularPower;    this.setProperty( "specularPower", specularPower );
+                }
+
+                var lightArray = jObj.lights;
+                if (lightArray)
+                {
+                        this._lights = [];
+                        for (var i=0;  i<this._MAX_LIGHTS;  i++)
+                        {
+                                var lightObj = lightArray[i];
+                                if (lightObj)
+                                {
+                                        var type = lightObj['light'+i];
+                                        if (type)
+                                        {
+                                                var light = new Object;
+                                                switch (type)
+                                                {
+                                                        case "directional":
+                                                                light.direction = lightObj['light' + i + 'Dir'];
+                                                                break;
+
+                                                        case "spot":
+                                                                light.position = lightObj['light' + i + 'Pos'];
+                                                                light['spotInnerCutoff'] = lightObj['light' + i + 'OuterSpotCutoff'];
+                                                                light['spotOuterCutoff'] = lightObj['light' + i + 'InnerSpotCutoff'];
+                                                                break;
+
+                                                        case "point":
+                                                                light.position = lightObj['light' + i + 'Pos'];
+                                                                light.attenuation = lightObj['light' + i + 'Attenuation'];
+                                                                break;
+
+                                                        default:
+                                                                throw new Error( "unrecognized light type on import: " + type );
+                                                                break;
+                                                }
+
+                                                // common to all lights
+                                                light.diffuseColor  = lightObj['light' + i + 'Color'];
+                                                light.specularColor = lightObj['light' + i + 'SpecularColor'];
+
+                                                // push the light
+                                                this._lights.push( light );
+                                        }
+                                        else
+                                                this._lights[i] = 'undefined';
+                                }
+                        }
+
+                        if (this._lights.length > 0)
+                        {