3 files changed, 221 insertions, 23 deletions

diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 4cb21a25..803dbb53 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -11,6 +11,7 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 //      Super class for all geometry classes
 ///////////////////////////////////////////////////////////////////////
 exports.GeomObj = Object.create(Object.prototype, {
+{
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
@@ -186,6 +187,8 @@ exports.GeomObj = Object.create(Object.prototype, {
                 nMats = 0;
             if (c) {
                 if (c.gradientMode) {
+            if (c.gradientMode)
+                        {
                     // Gradient support
                     if (this._materialArray && this._materialTypeArray) {
                         nMats = this._materialArray.length;
@@ -201,6 +204,7 @@ exports.GeomObj = Object.create(Object.prototype, {
                     }
 
                     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];
@@ -209,6 +213,9 @@ exports.GeomObj = Object.create(Object.prototype, {
                         if (nMats === this._materialTypeArray.length) {
                             for (i = 0; i < nMats; i++) {
                                 if (this._materialTypeArray[i] == type) {
+                                                {
+                            if (this._materialTypeArray[i] == type)
+                                                        {
                                     this._materialArray[i].setProperty("color" + (n + 1), stop.slice(0));
                                     this._materialArray[i].setProperty("colorStop" + (n + 1), position);
                                 }
@@ -218,12 +225,15 @@ exports.GeomObj = Object.create(Object.prototype, {
                     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);
                     }
 
@@ -231,6 +241,7 @@ exports.GeomObj = Object.create(Object.prototype, {
                         nMats = this._materialArray.length;
                         if (nMats === this._materialTypeArray.length) {
                             for (i = 0; i < nMats; i++) {
+                                                {
                                 if (this._materialTypeArray[i] == type) {
                                     this._materialArray[i].setProperty("color", c.slice(0));
                                 }
@@ -239,17 +250,24 @@ exports.GeomObj = Object.create(Object.prototype, {
                     }
                 }
             } else {
+                else
+                {
                 if (type === "fill") {
                     this._fillColor = null;
                 } else {
+                        else {
                     this._strokeColor = null;
                 }
 
                 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 (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]);
                             }
@@ -271,6 +289,7 @@ exports.GeomObj = Object.create(Object.prototype, {
             if (this.getStrokeMaterial()) {
                 strokeMaterial = this.getStrokeMaterial().dup();
             } else {
+                else {
                 strokeMaterial = MaterialsModel.exportFlatMaterial();
             }
 
@@ -285,6 +304,8 @@ exports.GeomObj = Object.create(Object.prototype, {
                 this.setStrokeColor(this._strokeColor);
             }
 
+        this._strokeMaterial = strokeMaterial;
+
             return strokeMaterial;
         }
     },
@@ -295,6 +316,7 @@ exports.GeomObj = Object.create(Object.prototype, {
             if (this.getFillMaterial()) {
                 fillMaterial = this.getFillMaterial().dup();
             } else {
+                else {
                 fillMaterial = MaterialsModel.exportFlatMaterial();
             }
 
@@ -309,19 +331,25 @@ exports.GeomObj = Object.create(Object.prototype, {
                 this.setFillColor(this._fillColor);
             }
 
+        this._fillMaterial = fillMaterial;
+
             return fillMaterial;
         }
     },
 
     exportMaterialsJSON: {
         value: 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) {
+                        {
                     var arr = [];
 
                     for (var i = 0; i < nMats; i++) {
+                                {
                         var matObj =
                         {
                             'materialNodeName':this._materialNodeArray[i].name,
@@ -345,6 +373,8 @@ exports.GeomObj = Object.create(Object.prototype, {
 
     importMaterialsJSON: {
         value: function(jObj) {
+                MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
             this._materialArray = [];
             this._materialTypeArray = [];
 
@@ -353,10 +383,12 @@ exports.GeomObj = Object.create(Object.prototype, {
             var nMaterials = jObj.nMaterials;
             var matArray = jObj.materials;
             for (var i = 0; i < nMaterials; i++) {
+                {
                 var mat;
                 var matObj = matArray[i].material;
                 var shaderName = matObj.material;
                 switch (shaderName) {
+                        {
                     case "flat":
                     case "radialGradient":
                     case "linearGradient":
@@ -370,6 +402,7 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "tunnel":
                     case "reliefTunnel":
                     case "squareTunnel":
+                case "flag":
                     case "twist":
                     case "fly":
                     case "julia":
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index d75abb05..22cbb5d4 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -14,6 +14,10 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 //      Derived from class GeomObj
 ///////////////////////////////////////////////////////////////////////
 exports.Rectangle = Object.create(GeomObj, {
+{
+        if (!MaterialsModel)
+                MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
         // CONSTANTS
         N_TRIANGLES: { value : 15, writable: false },       // TODO - This is not being used anywhere. Remove?