7 files changed, 85 insertions, 160 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index f3e8b823..0a950658 100644
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -9,14 +9,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //      Class to do hit testing of objects in the html page
 ///////////////////////////////////////////////////////////////////////
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
-var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
-var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
-var HitRecord = require("js/helper-classes/3D/hit-record").HitRecord;
-var Snap2DRecord = require("js/helper-classes/3D/snap-2d-record").Snap2DRecord;
-var NJUtils = require("js/lib/NJUtils").NJUtils;
+    Component = require("montage/ui/component").Component,
+    viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
+    vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
+    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
+    HitRecord = require("js/helper-classes/3D/hit-record").HitRecord,
+    Snap2DRecord = require("js/helper-classes/3D/snap-2d-record").Snap2DRecord,
+    NJUtils = require("js/lib/NJUtils").NJUtils;
 
 var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 8f7a5d30..942eb528 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -33,14 +33,6 @@ function GLCircle()
 
                 this._ovalHeight = this._ovalHeight = 2.0*this.radius;
 
-                // stroke and fill colors
-                this._strokeColor = [0.4, 0.4, 0.4, 1.0];
-                this._fillColor = [0.0, 0.6,  0.0,  1.0];
-
-                // stroke and fill materials
-                this._fillMaterial;
-                this._strokeMaterial;
-
                 this._strokeStyle = "Solid";
 
                 this._aspectRatio = 1.0;
@@ -191,19 +183,19 @@ function GLCircle()
                 var reverseRotMat = Matrix.RotationZ( -angle );
 
                 // calculate matrices to scale the circle and stroke to fit the bounds of the ellipse
-                strokeScaleMat = Matrix.I(4);
+                var strokeScaleMat = Matrix.I(4);
                 strokeScaleMat[0] = xRad;
                 strokeScaleMat[5] = yRad;
 
-                fillScaleMat = Matrix.I(4);
+                var fillScaleMat = Matrix.I(4);
                 fillScaleMat[0] = xRad - xStroke;
                 fillScaleMat[5] = yRad - yStroke;
 
-                innerRadiusScaleMat = Matrix.I(4);
+                var innerRadiusScaleMat = Matrix.I(4);
                 innerRadiusScaleMat[0] = xInnRad;
                 innerRadiusScaleMat[5] = yInnRad;
 
-                innerStrokeScaleMat = Matrix.I(4);
+                var innerStrokeScaleMat = Matrix.I(4);
                 innerStrokeScaleMat[0] = xInnRad - xStroke;
                 innerStrokeScaleMat[5] = yInnRad - yStroke;
 
@@ -235,69 +227,24 @@ function GLCircle()
 
                 if (fillPrim)
                 {
-                        this._primArray.push(   fillPrim  );
-
-                        if (this.getFillMaterial())
-                                fillMaterial = this.getFillMaterial().dup();
-                        else
-                                fillMaterial = new FlatMaterial();
+            fillMaterial = this.makeFillMaterial();
 
-                        if (fillMaterial)
-                        {
-                                fillMaterial.init( this.getWorld() );
-                if(!this.getFillMaterial() && this._fillColor)
-                {
-                    fillMaterial.setProperty("color", this._fillColor);
-                }
-                                this._materialArray.push( fillMaterial );
-                                this._materialTypeArray.push( "fill" );
-                                var matNode = fillMaterial.getMaterialNode();
-                                this._materialNodeArray.push( matNode );
-                        }
+            this._primArray.push( fillPrim );
+            this._materialNodeArray.push( fillMaterial.getMaterialNode() );
                 }
                 if (strokePrim0)
                 {
-                        if (this.getStrokeMaterial())
-                                strokeMaterial = this.getStrokeMaterial().dup();
-                        else
-                                strokeMaterial = new FlatMaterial();
+            strokeMaterial0 = this.makeStrokeMaterial();
 
-                        if (strokeMaterial)
-                        {
-                                strokeMaterial.init( this.getWorld() );
-                if(!this.getStrokeMaterial() && this._strokeColor)
-                {
-                    strokeMaterial.setProperty("color", this._strokeColor);
-                }
-                                this._primArray.push( strokePrim0 );
-
-                                var materialNode = createMaterialNode("ovalFillMaterial");
-                                this._materialArray.push( strokeMaterial );
-                                this._materialTypeArray.push( "stroke" );
-                                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
-                        }
+            this._primArray.push( strokePrim0 );
+            this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
                 }
                 if (strokePrim1)
                 {
-                        if (this.getStrokeMaterial())
-                                strokeMaterial = this.getStrokeMaterial().dup();
-                        else
-                                strokeMaterial = new FlatMaterial();
+            strokeMaterial2 = this.makeStrokeMaterial();
 
-                        if (strokeMaterial)
-                        {
-                                strokeMaterial.init( this.getWorld() );
-                if(!this.getStrokeMaterial() && this._strokeColor)
-                {
-                    strokeMaterial.setProperty("color", this._strokeColor);
-                }
-                                this._primArray.push( strokePrim1 );
-
-                                var materialNode = createMaterialNode("ovalFillMaterial");
-                                this._materialArray.push( strokeMaterial );
-                                this._materialTypeArray.push( "stroke" );
-                                this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
-                        }
+            this._primArray.push( strokePrim1 );
+            this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
                 }
 
         world.updateObject(this);
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js
index e04b3283..5d7497ad 100644
--- a/js/helper-classes/RDGE/GLGeomObj.js
+++ b/js/helper-classes/RDGE/GLGeomObj.js
@@ -37,6 +37,10 @@ function GLGeomObj()
 
     this.m_world = null;
 
+    // stroke and fill colors
+    this._strokeColor;
+    this._fillColor;
+
         // stroke and fill materials
         this._fillMaterial;
         this._strokeMaterial;
@@ -107,6 +111,53 @@ function GLGeomObj()
         this.setFillColor   = function(c)               {  this.setMaterialColor(c, "fill");            }
         this.setStrokeColor = function(c)               {  this.setMaterialColor(c, "stroke");          }
 
+    this.makeStrokeMaterial = function()
+    {
+        var strokeMaterial;
+        if (this.getStrokeMaterial())
+            strokeMaterial = this.getStrokeMaterial().dup();
+        else
+            strokeMaterial = new FlatMaterial();
+
+        if (strokeMaterial)
+        {
+            strokeMaterial.init( this.getWorld() );
+            if(this._strokeColor)
+             {
+                strokeMaterial.setProperty("color", this._strokeColor);
+            }
+        }
+
+        this._materialArray.push( strokeMaterial );
+        this._materialTypeArray.push( "stroke" );
+
+        return strokeMaterial;
+    }
+
+    this.makeFillMaterial = function()
+    {
+        var fillMaterial;
+        if (this.getFillMaterial())
+            fillMaterial = this.getFillMaterial().dup();
+        else
+            fillMaterial = new FlatMaterial();
+
+        if (fillMaterial)
+        {
+            fillMaterial.init( this.getWorld() );
+            //if(!this.getFillMaterial() && this._fillColor)
+            if (this._fillColor)
+            {
+                fillMaterial.setProperty("color", this._fillColor);
+            }
+        }
+