3 files changed, 264 insertions, 59 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index f2991bdb..2f5559a7 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -10,7 +10,8 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 // Class GLGeomObj
 //      Super class for all geometry classes
 ///////////////////////////////////////////////////////////////////////
-var GeomObj = function GLGeomObj() {
+var GeomObj = function GLGeomObj()
+{
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
@@ -141,14 +142,18 @@ var GeomObj = function GLGeomObj() {
     this.setStrokeColor = function (c) {
         this.setMaterialColor(c, "stroke");
     };
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-    this.setMaterialColor = function (c, type) {
+    this.setMaterialColor = function (c, type)
+        {
         var i = 0,
             nMats = 0;
-        if (c) {
-            if (c.gradientMode) {
+        if (c)
+                {
+            if (c.gradientMode)
+                        {
                 // Gradient support
                 if (this._materialArray && this._materialTypeArray) {
                     nMats = this._materialArray.length;
@@ -163,15 +168,19 @@ var GeomObj = function GLGeomObj() {
                     len = 4;
                 }
 
-                for (var n = 0; n < len; n++) {
+                for (var n = 0; n < len; n++)
+                                {
                     var position = colors[n].position / 100;
                     var cs = colors[n].value;
                     var stop = [cs.r / 255, cs.g / 255, cs.b / 255, cs.a];
                     stops.push(stop);
 
-                    if (nMats === this._materialTypeArray.length) {
-                        for (i = 0; i < nMats; i++) {
-                            if (this._materialTypeArray[i] == type) {
+                    if (nMats === this._materialTypeArray.length)
+                                        {
+                        for (i = 0; i < nMats; i++)
+                                                {
+                            if (this._materialTypeArray[i] == type)
+                                                        {
                                 this._materialArray[i].setProperty("color" + (n + 1), stop.slice(0));
                                 this._materialArray[i].setProperty("colorStop" + (n + 1), position);
                             }
@@ -180,20 +189,24 @@ var GeomObj = function GLGeomObj() {
                 }
                 if (type === "fill") {
                     this._fillColor = c;
-                } else {
+                }
+                                else {
                     this._strokeColor = c;
                 }
-            } else {
+            }
+                        else {
                 if (type === "fill") {
                     this._fillColor = c.slice(0);
-                } else {
+                }
+                                else {
                     this._strokeColor = c.slice(0);
                 }
 
                 if (this._materialArray && this._materialTypeArray) {
                     nMats = this._materialArray.length;
                     if (nMats === this._materialTypeArray.length) {
-                        for (i = 0; i < nMats; i++) {
+                        for (i = 0; i < nMats; i++)
+                                                {
                             if (this._materialTypeArray[i] == type) {
                                 this._materialArray[i].setProperty("color", c.slice(0));
                             }
@@ -201,18 +214,25 @@ var GeomObj = function GLGeomObj() {
                     }
                 }
             }
-        } else {
+        }
+                else
+                {
             if (type === "fill") {
                 this._fillColor = null;
-            } else {
+            }
+                        else {
                 this._strokeColor = null;
             }
 
-            if (this._materialArray && this._materialTypeArray) {
+            if (this._materialArray && this._materialTypeArray)
+                        {
                 nMats = this._materialArray.length;
-                if (nMats === this._materialTypeArray.length) {
-                    for (i = 0; i < nMats; i++) {
-                        if (this._materialTypeArray[i] == type) {
+                if (nMats === this._materialTypeArray.length)
+                                {
+                    for (i = 0; i < nMats; i++)
+                                        {
+                        if (this._materialTypeArray[i] == type)
+                                                {
                             // TODO - Not sure how to set color to null values in shaders
                             this._materialArray[i].setProperty("color", [0, 0, 0, 0]);
                         }
@@ -227,11 +247,13 @@ var GeomObj = function GLGeomObj() {
         }
     };
 
-    this.makeStrokeMaterial = function () {
+    this.makeStrokeMaterial = function ()
+        {
         var strokeMaterial;
         if (this.getStrokeMaterial()) {
             strokeMaterial = this.getStrokeMaterial().dup();
-        } else {
+        }
+                else {
             strokeMaterial = MaterialsModel.exportFlatMaterial();
         }
 
@@ -246,14 +268,18 @@ var GeomObj = function GLGeomObj() {
             this.setStrokeColor(this._strokeColor);
         }
 
+        this._strokeMaterial = strokeMaterial;
+
         return strokeMaterial;
     };
 
-    this.makeFillMaterial = function () {
+    this.makeFillMaterial = function ()
+        {
         var fillMaterial;
         if (this.getFillMaterial()) {
             fillMaterial = this.getFillMaterial().dup();
-        } else {
+        }
+                else {
             fillMaterial = MaterialsModel.exportFlatMaterial();
         }
 
@@ -268,17 +294,24 @@ var GeomObj = function GLGeomObj() {
             this.setFillColor(this._fillColor);
         }
 
+        this._fillMaterial = fillMaterial;
+
         return fillMaterial;
     };
 
-    this.exportMaterialsJSON = function () {
+    this.exportMaterialsJSON = function ()
+        {
+                MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
         var jObj;
         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,
@@ -299,7 +332,10 @@ var GeomObj = function GLGeomObj() {
         return jObj;
     }
 
-    this.importMaterialsJSON = function (jObj) {
+    this.importMaterialsJSON = function (jObj)
+        {
+                MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
         this._materialArray = [];
         this._materialTypeArray = [];
 
@@ -307,11 +343,13 @@ 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;