1 files changed, 14 insertions, 94 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 44daa291..56cf7c98 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -111,14 +111,16 @@ var GeomObj = function GLGeomObj() {
         return this.GEOM_TYPE_UNDEFINED;
     };
 
-        this.getPrimitiveArray = function() {  return this._primArray;
+    this.getPrimitiveArray = function () {
+        return this._primArray;
     };
 
         this.getMaterialNodeArray = function() {
         return this._materialNodeArray;
     };
 
-        this.getMaterialArray = function() {  return this._materialArray;
+    this.getMaterialArray = function () {
+        return this._materialArray;
     };
 
         this.getTransformNode = function() {
@@ -266,18 +268,14 @@ var GeomObj = function GLGeomObj() {
         return fillMaterial;
     };
 
-        this.exportMaterialsJSON = function()
-        {
+    this.exportMaterialsJSON = function () {
                 var jObj;
-                if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL())
-                {
+        if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
                         var nMats = this._materialArray.length;
-                        if (nMats > 0)
-                        {
+            if (nMats > 0) {
                                 var arr = [];
 
-                                for (var i=0;  i<nMats;  i++)
-                                {
+                for (var i = 0; i < nMats; i++) {
                                         var matObj = 
                                         {
                                                 'materialNodeName'      : this._materialNodeArray[i].name,
@@ -298,8 +296,7 @@ var GeomObj = function GLGeomObj() {
                 return jObj;
         }
 
-        this.importMaterialsJSON = function( jObj )
-        {
+    this.importMaterialsJSON = function (jObj) {
                 this._materialArray = [];
                 this._materialTypeArray = [];
 
@@ -307,13 +304,11 @@ var GeomObj = function GLGeomObj() {
 
                 var nMaterials = jObj.nMaterials;
                 var matArray = jObj.materials;
-                for (var i=0;  i<nMaterials;  i++)
-                {
+        for (var i = 0; i < nMaterials; i++) {
                         var mat;
                         var matObj = matArray[i].material;
                         var shaderName = matObj.material;
-                        switch (shaderName)
-                        {
+            switch (shaderName) {
                                 case "flat":
                                 case "radialGradient":
                                 case "linearGradient":
@@ -345,8 +340,7 @@ var GeomObj = function GLGeomObj() {
                                         break;
                         }
 
-                        if (mat)
-                        {
+            if (mat) {
                                 mat.importJSON( matObj );
                                 this._materialArray.push( mat );
                                 this._materialTypeArray.push( matObj.type );
@@ -355,80 +349,7 @@ var GeomObj = function GLGeomObj() {
                                 else  this._strokeMaterial = mat;
                         }
                 }
-        }
-
-        this.exportMaterials = function()
-        {
-                var rtnStr = "";
-                if (this._materialArray && this._materialNodeArray)
-                {
-                        var nMats = this._materialArray.length;
-                        rtnStr += "nMaterials: " + nMats + "\n";
-                        for (var i=0;  i<nMats;  i++)
-                        {
-                                var matNode  = this._materialNodeArray[i];
-                                rtnStr += "materialNodeName: " + matNode.name + "\n";
-
-                                var material = this._materialArray[i];
-                                rtnStr += material.export();
-                        }
-                }
-                else
-                        rtnStr += "nMaterials: 0\n" ;
-
-                return rtnStr;
-        }
-
-        this.importMaterials = function(importStr)
-        {
-                var nMaterials = Number( this.getPropertyFromString( "nMaterials: ", importStr )  );
-                for (var i=0;  i<nMaterials;  i++)
-                {
-                        var mat;
-                        var materialType = this.getPropertyFromString( "material: ",    importStr );
-                        switch (materialType)
-                        {
-                                case "flat":
-                                case "radialGradient":
-                                case "linearGradient":
-                                case "bumpMetal":
-                                case "uber":
-                                case "plasma":
-                                case "deform":
-                                case "water":
-                                case "paris":
-                                case "raiders":
-                                case "tunnel":
-                                case "reliefTunnel":
-                                case "squareTunnel":
-                                case "twist":
-                                case "fly":
-                                case "julia":
-                                case "mandel":
-                                case "star":
-                                case "zinvert":
-                                case "keleidoscope":
-                                case "radialBlur":
-                                case "pulse":
-                                        mat = MaterialsModel.getMaterialByShader( materialType );
-                                        if (mat)  mat = mat.dup();
-                                        break;
-
-                                default:
-                                        console.log( "material type: " + materialType + " is not supported" );
-                                        break;
-                        }
-
-                        if (mat)
-                                mat.import( importStr );
-
-                        // pull off the end of the material 
-                        var endMat = "endMaterial\n";
-                        var endIndex = importStr.indexOf( endMat );
-                        if (endIndex < 0)  break;
-                        importStr = importStr.substr( endIndex + endMat.length );
-                }
-        }
+    };
 
     this.translate   = function(v) {
         var mat = Matrix.Translation( v );
@@ -524,8 +445,7 @@ var GeomObj = function GLGeomObj() {
 
         stops = gradientStr.split(";");
         len = stops.length;
-        for(i=0; i<len; i++)
-        {
+        for (i = 0; i < len; i++) {
             stop = stops[i].split("@");
             c = stop[0].split(",");
             rtnArr.push({ position: Number(stop[1]), value:{r:Number(c[0]), g:Number(c[1]), b:Number(c[2]), a:Number(c[3])} });