Merge branch 'pentool' into brushtool

1 files changed, 72 insertions, 1 deletions

diff --git a/js/helper-classes/backup-delete/Materials/UberMaterial.js b/js/helper-classes/backup-delete/Materials/UberMaterial.js
index c7855c95..1652b4c9 100755
--- a/js/helper-classes/backup-delete/Materials/UberMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/UberMaterial.js
@@ -30,6 +30,8 @@ function UberMaterial()
         this._specularPower = 32.0;
         this._environmentAmount = 0.2;          // 0 .. 1
 
+        this._MAX_LIGHTS = 4;
+
         // set the default maps
         this._diffuseMapOb = { 'texture' : 'assets/images/rocky-diffuse.jpg', 'wrap' : 'REPEAT' };
         this._normalMapOb = { 'texture' : 'assets/images/rocky-normal.jpg', 'wrap' : 'REPEAT' };
@@ -424,10 +426,79 @@ function UberMaterial()
                 this._shader = this.buildUberShader( this._ubershaderCaps );
 
                 // set up the material node
-                this._materialNode = createMaterialNode("uberMaterial");
+                this._materialNode = 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.substr( index );
+        }
+
+        this.export = function()
+        {
+                // every material needs the base type and instance name
+                var exportStr = "material: " + this.getShaderName() + "\n";
+                exportStr += "name: " + this.getName() + "\n";
+
+                var caps = this._ubershaderCaps;
+                
+                // export the material properties
+                if (typeof caps.material != 'undefined')
+                {
+                        exportStr += "material: true\n";
+                        exportStr += "ambientColor: " + caps.material.ambientColor + "\n";
+                        exportStr += "diffuseColor: " + caps.material.diffuseColor + "\n";
+                        exportStr += "specularColor: " + caps.material.specularColor + "\n";
+                        exportStr += "specularPower: " + caps.material.specularPower + "\n";
+                }
+
+                if (typeof caps.lighting != 'undefined')
+                {
+                        var light = caps.lighting['light' + i];
+                        var t;
+                        for (var i=0;  i<this._MAX_LIGHTS;  i++)
+                        {
+                                var light = caps.lighting["light" + i];
+                                if( typeof light != "undefined")
+                                {
+                                        exportStr += "light" + i + ': ' + light.type + "\n";
+
+                                        if (light.type === 'directional')
+                                        {
+                                                exportStr += 'light' + i + 'Dir: ' + light['direction'] + '\n';
+                                        }
+                                        else if (light.type === 'spot')
+                                        {
+                                                exportStr += 'light' + i + 'Pos: ' + light['position'] + '\n';
+
+                                                var deg2Rad = Math.PI / 180;
+                                                exportStr += 'light' + i + 'Spot: ' + [ Math.cos( ( light['spotInnerCutoff'] || 45.0 )  * deg2Rad ), 
+                                                                                                                                Math.cos( ( light['spotOuterCutoff'] || 90.0 ) * deg2Rad )] + '\n';
+                                        }
+                                        else            // light.type === 'point'
+                                        {
+                                                technique['u_light'+i+'Pos'].set(light['position'] || [ 0, 0, 0 ]);                        
+                                                technique['u_light'+i+'Atten'].set(light['attenuation'] || [ 1,0,0 ]);                
+                                        }
+                                        exportStr += 'light' + i + 'Color: ' + light['diffuseColor'] || [ 1,1,1,1 ] + '\n';
+                                        exportStr += 'light' + i + 'SpecularColor: ' + light['specularColor'] || [ 1, 1, 1, 1 ] + '\n'; 
+                                        
+                                        exportStr += "endlight\n";          
+                                }
+                        }
+                }
+                
+                // every material needs to terminate like this
+                exportStr += "endMaterial\n";
+
+                return exportStr;
+        }
+
         this.buildUberShader = function(caps)
         {
                 var preproc = "";