1 files changed, 624 insertions, 624 deletions

diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index ea12385f..cfa6aae5 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
@@ -121,12 +121,12 @@ exports.Rectangle = Object.create(GeomObj, {
                     this._fillMaterial.setProperty( "color",  this._fillColor );
                 } else if (this._fillMaterial && (this._fillMaterial.gradientType === this._fillColor.gradientMode)) {
                     this._fillMaterial.setGradientData(this._fillColor.color);
-                }
+        }
             }
         }
     },
 
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
     // TODO - Use getters/setters in the future
@@ -165,7 +165,7 @@ exports.Rectangle = Object.create(GeomObj, {
             this._fillMaterial = m;
         }
     },
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
     // update the "color of the material
     getFillColor: {
         value: function() {
@@ -280,31 +280,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;
@@ -313,21 +313,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) {
@@ -335,8 +335,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) {
@@ -344,112 +344,112 @@ 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 );
         }
     },
 
-        buildBuffers: {
-                value: function() {
-                        // get the world
-                        var world = this.getWorld();
-                        if (!world)  throw( "null world in buildBuffers" );
-                        //console.log( "GLRectangle.buildBuffers " + world._worldCount );
-                        if (!world._useWebGL)  return;
-
-                        // make sure RDGE has the correct context
-                        RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
-
-                        // create the gl buffer
-                        var gl = world.getGLContext();
-
-                        var tlRadius = this._tlRadius; //top-left radius
-                        var trRadius = this._trRadius;
-                        var blRadius = this._blRadius;
-                        var brRadius = this._brRadius;
-
-                        // declare the arrays to hold the parts
-                        this._primArray = [];
-                        this._materialArray = [];
-                        this._materialTypeArray = [];
-                        this._materialNodeArray = [];
-
-                        // get the normalized device coordinates (NDC) for
-                        // all position and dimensions.
-                        var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
-                        var xNDC = 2*this._xOffset/vpw,  yNDC = 2*this._yOffset/vph,
-                                xFillNDC = this._width/vpw,  yFillNDC = this._height/vph,
+    buildBuffers: {
+        value: function() {
+            // get the world
+            var world = this.getWorld();
+            if (!world)  throw( "null world in buildBuffers" );
+            //console.log( "GLRectangle.buildBuffers " + world._worldCount );
+            if (!world._useWebGL)  return;
+
+            // make sure RDGE has the correct context
+            RDGE.globals.engine.setContext( world.getCanvas().rdgeid );
+
+            // create the gl buffer
+            var gl = world.getGLContext();
+
+            var tlRadius = this._tlRadius; //top-left radius
+            var trRadius = this._trRadius;
+            var blRadius = this._blRadius;
+            var brRadius = this._brRadius;
+
+            // declare the arrays to hold the parts
+            this._primArray = [];
+            this._materialArray = [];
+            this._materialTypeArray = [];
+            this._materialNodeArray = [];
+
+            // get the normalized device coordinates (NDC) for
+            // all position and dimensions.
+            var vpw = world.getViewportWidth(),  vph = world.getViewportHeight();
+            var xNDC = 2*this._xOffset/vpw,  yNDC = 2*this._yOffset/vph,
+                xFillNDC = this._width/vpw,  yFillNDC = this._height/vph,