1 files changed, 566 insertions, 566 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 0d302d50..ec3e25b2 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -38,15 +38,15 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 //      Derived from class GeomObj
 ///////////////////////////////////////////////////////////////////////
 exports.Rectangle = Object.create(GeomObj, {
-        // CONSTANTS
-        N_TRIANGLES: { value : 15, writable: false },       // TODO - This is not being used anywhere. Remove?
+    // CONSTANTS
+    N_TRIANGLES: { value : 15, writable: false },       // TODO - This is not being used anywhere. Remove?
 
-        //if (!MaterialsModel)
-        //      MaterialsModel = require("js/models/materials-model").MaterialsModel;
+    //if (!MaterialsModel)
+    //  MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
     _width: { value : 2.0, writable: true },
     _height: { value : 2.0, writable: true },
     _xOffset: { value : 0, writable: true },
@@ -82,7 +82,7 @@ exports.Rectangle = Object.create(GeomObj, {
 
                 this._strokeStyle = strokeStyle;
 
-                        this._matrix = Matrix.I(4);
+            this._matrix = Matrix.I(4);
             }
 
             // the overall radius includes the fill and the stroke.  separate the two based on the stroke width
@@ -101,7 +101,7 @@ exports.Rectangle = Object.create(GeomObj, {
             } else {
                 this._strokeMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
             }
-                        if (strokeColor && this._strokeMaterial.hasProperty( "color" ))  this._strokeMaterial.setProperty( "color",  this._strokeColor );
+            if (strokeColor && this._strokeMaterial.hasProperty( "color" ))  this._strokeMaterial.setProperty( "color",  this._strokeColor );
 
 
             if(fillMaterial) {
@@ -109,11 +109,11 @@ exports.Rectangle = Object.create(GeomObj, {
             } else {
                 this._fillMaterial = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ).dup();
             }
-                        if (fillColor && this._fillMaterial.hasProperty( "color" ))  this._fillMaterial.setProperty( "color",  this._fillColor );
+            if (fillColor && this._fillMaterial.hasProperty( "color" ))  this._fillMaterial.setProperty( "color",  this._fillColor );
         }
     },
 
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
     // TODO - Use getters/setters in the future
@@ -152,7 +152,7 @@ exports.Rectangle = Object.create(GeomObj, {
             this._fillMaterial = m;
         }
     },
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
     // update the "color of the material
     getFillColor: {
         value: function() {
@@ -267,31 +267,31 @@ exports.Rectangle = Object.create(GeomObj, {
         }
     },
 
-        ///////////////////////////////////////////////////////////////////////
-        // Methods
-        ///////////////////////////////////////////////////////////////////////
-        // JSON export
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+    // JSON export
     exportJSON: {
         value: function() {
             var jObj =
             {
-                'type'                  : this.geomType(),
-                'xoff'                  : this._xOffset,
-                'yoff'                  : this._yOffset,
-                'width'                 : this._width,
-                'height'                : this._height,
-                'strokeWidth'   : this._strokeWidth,
-                'strokeColor'   : this._strokeColor,
-                'fillColor'             : this._fillColor,
-                'tlRadius'              : this._tlRadius,
-                'trRadius'              : this._trRadius,
-                'blRadius'              : this._blRadius,
-                'brRadius'              : this._brRadius,
-                'innerRadius'   : this._innerRadius,
-                'strokeStyle'   : this._strokeStyle,
-                'strokeMat'             : this._strokeMaterial ? this._strokeMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
-                'fillMat'               : this._fillMaterial ?  this._fillMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
-                'materials'             : this.exportMaterialsJSON()
+                'type'          : this.geomType(),
+                'xoff'          : this._xOffset,
+                'yoff'          : this._yOffset,
+                'width'         : this._width,
+                'height'        : this._height,
+                'strokeWidth'   : this._strokeWidth,
+                'strokeColor'   : this._strokeColor,
+                'fillColor'     : this._fillColor,
+                'tlRadius'      : this._tlRadius,
+                'trRadius'      : this._trRadius,
+                'blRadius'      : this._blRadius,
+                'brRadius'      : this._brRadius,
+                'innerRadius'   : this._innerRadius,
+                'strokeStyle'   : this._strokeStyle,
+                'strokeMat'     : this._strokeMaterial ? this._strokeMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
+                'fillMat'       : this._fillMaterial ?  this._fillMaterial.getName() :  MaterialsModel.getDefaultMaterialName(),
+                'materials'     : this.exportMaterialsJSON()
             };
 
             return jObj;
@@ -300,21 +300,21 @@ exports.Rectangle = Object.create(GeomObj, {
 
     importJSON: {
         value: function(jObj) {
-            this._xOffset                       = jObj.xoff;
-            this._yOffset                       = jObj.yoff;
-            this._width                         = jObj.width;
-            this._height                        = jObj.height;
-            this._strokeWidth           = jObj.strokeWidth;
-            this._strokeColor           = jObj.strokeColor;
-            this._fillColor                     = jObj.fillColor;
-            this._tlRadius                      = jObj.tlRadius;
-            this._trRadius                      = jObj.trRadius;
-            this._blRadius                      = jObj.blRadius;
-            this._brRadius                      = jObj.brRadius;
-            this._innerRadius           = jObj.innerRadius;
-            this._strokeStyle           = jObj.strokeStyle;
-            var strokeMaterialName      = jObj.strokeMat;
-            var fillMaterialName        = jObj.fillMat;
+            this._xOffset           = jObj.xoff;
+            this._yOffset           = jObj.yoff;
+            this._width             = jObj.width;
+            this._height            = jObj.height;
+            this._strokeWidth       = jObj.strokeWidth;
+            this._strokeColor       = jObj.strokeColor;
+            this._fillColor         = jObj.fillColor;
+            this._tlRadius          = jObj.tlRadius;
+            this._trRadius          = jObj.trRadius;
+            this._blRadius          = jObj.blRadius;
+            this._brRadius          = jObj.brRadius;
+            this._innerRadius       = jObj.innerRadius;
+            this._strokeStyle       = jObj.strokeStyle;
+            var strokeMaterialName  = jObj.strokeMat;
+            var fillMaterialName    = jObj.fillMat;
 
             var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ).dup();
             if (!strokeMat) {
@@ -322,8 +322,8 @@ exports.Rectangle = Object.create(GeomObj, {
                 strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
             }
             this._strokeMaterial = strokeMat;
-                        if (this._strokeMaterial.hasProperty( 'color' ))
-                                this._strokeMaterial.setProperty( 'color', this._strokeColor );
+            if (this._strokeMaterial.hasProperty( 'color' ))
+                this._strokeMaterial.setProperty( 'color', this._strokeColor );
 
             var fillMat = MaterialsModel.getMaterial( fillMaterialName ).dup();
             if (!fillMat) {
@@ -331,8 +331,8 @@ exports.Rectangle = Object.create(GeomObj, {
                 fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() ).dup();
             }
             this._fillMaterial = fillMat;
-                        if (this._fillMaterial.hasProperty( 'color' ))
-                                this._fillMaterial.setProperty( 'color', this._fillColor );
+            if (this._fillMaterial.hasProperty( 'color' ))
+                this._fillMaterial.setProperty( 'color', this._fillColor );
 
             this.importMaterialsJSON( jObj.materials );
         }
@@ -409,7 +409,7 @@ exports.Rectangle = Object.create(GeomObj, {
             // stroke
             var strokeMaterial = this.makeStrokeMaterial();
             var strokePrim = this.createStroke([x,y],  2*xFill,  2*yFill,  strokeSize,  tlRadius, blRadius, brRadius, trRadius, strokeMaterial);
-                strokeMaterial.fitToPrimitive( strokePrim );
+        strokeMaterial.fitToPrimitive( strokePrim );
             this._primArray.push( strokePrim );
             this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
 
@@ -423,7 +423,7 @@ exports.Rectangle = Object.create(GeomObj, {
             var fillMaterial = this.makeFillMaterial();
             //console.log( "fillMaterial: " + fillMaterial.getName() );
             var fillPrim = this.createFill([x,y],  2*xFill,  2*yFill,  tlRadius, blRadius, brRadius, trRadius, fillMaterial);
-                fillMaterial.fitToPrimitive( fillPrim );
+        fillMaterial.fitToPrimitive( fillPrim );
             this._primArray.push( fillPrim );
             this._materialNodeArray.push( fillMaterial.getMaterialNode() );
 
@@ -443,7 +443,7 @@ exports.Rectangle = Object.create(GeomObj, {
                 ctx.quadraticCurveTo(  bPts[index][0],  bPts[index][1],    bPts[index+1][0], bPts[index+1][1] );
                 index += 2;
             }
-            }
+        }
     },
 
     renderPath: {
@@ -455,7 +455,7 @@ exports.Rectangle = Object.create(GeomObj, {
                 hw = 0.5*width,
                 hh = 0.5*height;
 
-            pt = [inset, inset];        // top left corner
+            pt = [inset, inset];    // top left corner
 
             var tlRad = this._tlRadius; //top-left radius
             var trRad = this._trRadius;
@@ -468,36 +468,36 @@ exports.Rectangle = Object.create(GeomObj, {