32 files changed, 437 insertions, 3675 deletions

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 5b32547e..08057778 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -400,10 +400,7 @@ function GLCircle()
                         ctx.lineWidth = 0;
                         ctx.fillStyle   = "#990000";
                         if (this._fillColor)
-                        {
-                                var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
-                                ctx.fillStyle = c;
-                        }
+                                ctx.fillStyle = MathUtils.colorToHex( this._fillColor );
 
                         // draw the fill
                         ctx.beginPath();
@@ -463,10 +460,7 @@ function GLCircle()
                         ctx.lineWidth   = lineWidth;
                         ctx.strokeStyle = "#0000ff";
                         if (this._strokeColor)
-                        {
-                                var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";  
-                                ctx.strokeStyle = c;
-                        }
+                                ctx.strokeStyle = MathUtils.colorToHex( this._strokeColor );
                         
                         // draw the stroke
                         p = MathUtils.transformPoint( bezPts[0],   mat );
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 0d815145..5ec51230 100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -11,74 +11,74 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ///////////////////////////////////////////////////////////////////////
 function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj)
 {
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
-        this._width = 2.0;
-        this._height = 2.0;
-        this._xOffset = 0;
-        this._yOffset = 0;
-
-        // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
-        this._xAdj = 0;
-        this._yAdj = 0;
-        
-        this._slope = 0;
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+    this._width = 2.0;
+    this._height = 2.0;
+    this._xOffset = 0;
+    this._yOffset = 0;
 
-        this._strokeWidth = 0.25;
+    // If line doesn't fit in canvas world, we had to grow the canvas by this much on either side
+    this._xAdj = 0;
+    this._yAdj = 0;
+    
+    this._slope = 0;
 
-        this._strokeStyle = "Solid";
-        this._scaleX = 1.0;
-        this._scaleY = 1.0;
+    this._strokeWidth = 0.25;
 
-        if (arguments.length > 0)
-        {
-                this._width = width;
-                this._height = height;
-                this._xOffset = xOffset;
-                this._yOffset = yOffset;
+    this._strokeStyle = "Solid";
+    this._scaleX = 1.0;
+    this._scaleY = 1.0;
 
-                this._xAdj = xAdj;
-                this._yAdj = yAdj;
+    if (arguments.length > 0)
+    {
+        this._width = width;
+        this._height = height;
+        this._xOffset = xOffset;
+        this._yOffset = yOffset;
 
-                this._slope = slope;
-                this._strokeWidth = strokeSize;
-                this._strokeColor = strokeColor;
+        this._xAdj = xAdj;
+        this._yAdj = yAdj;
 
-                this._strokeStyle = strokeStyle;
-                this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
-        }
+        this._slope = slope;
+        this._strokeWidth = strokeSize;
+        this._strokeColor = strokeColor;
 
-        this._strokeVerticesLen = 0;
+        this._strokeStyle = strokeStyle;
+        this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
+    }
 
-        this.m_world = world;
+    this._strokeVerticesLen = 0;
+
+    this.m_world = world;
 
         this._materialAmbient  = [0.2, 0.2, 0.2,  1.0];
         this._materialDiffuse  = [0.4, 0.4, 0.4,  1.0];
         this._materialSpecular = [0.4, 0.4, 0.4,  1.0];
 
-        // initialize the inherited members
-        this.inheritedFrom = GLGeomObj;
-        this.inheritedFrom();
+    // initialize the inherited members
+    this.inheritedFrom = GLGeomObj;
+    this.inheritedFrom();
 
-        if(strokeMaterial)
-        {
-                this._strokeMaterial = strokeMaterial;
-        }
+    if(strokeMaterial)
+    {
+        this._strokeMaterial = strokeMaterial;
+    }
 
-        ///////////////////////////////////////////////////////////////////////
-        // Property Accessors
-        ///////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////
+    // Property Accessors
+    ///////////////////////////////////////////////////////////////////////
         this.getStrokeWidth             = function()            {  return this._strokeWidth;    }
         this.setStrokeWidth             = function(w)           {  this._strokeWidth = w;               }
 
         this.getStrokeMaterial  = function()            {  return this._strokeMaterial; }
         this.setStrokeMaterial  = function(m)           {  this._strokeMaterial = m;    }
 
-        this.getStrokeColor             = function()            {  return this._strokeColor;    }
+    this.getStrokeColor         = function()            {  return this._strokeColor;    }
         //this.setStrokeColor   = function(c)           {  this._strokeColor = c;               }
 
-        this.getStrokeStyle             = function()            {  return this._strokeStyle;    }
+    this.getStrokeStyle         = function()            {  return this._strokeStyle;    }
         this.setStrokeStyle             = function(s)           {  this._strokeStyle = s;               }
 
         this.getFillMaterial    = function()            {  return null;         }
@@ -86,24 +86,24 @@ function GLLine( world, xOffset, yOffset, width, height, slope, strokeSize, stro
         this.setStrokeMaterial  = function(m)            {  this._strokeMaterial = m;            }
         this.getStrokeMaterial  = function()            {  return this._strokeMaterial;         }
 
-        this.getWidth                   = function()            {  return this._width;                          }
+    this.getWidth                       = function()            {  return this._width;                          }
         this.setWidth                   = function(w)           {  this._width = w;                                     }
 
         this.getHeight                  = function()            {  return this._height;                         }
         this.setHeight                  = function(h)           {  this._height = h;                            }
 
-        this.getXAdj                    = function()            {  return this._xAdj;                   }
+    this.getXAdj                        = function()            {  return this._xAdj;                   }
         this.setXAdj            = function(x)           {  this._xAdj = x;                              }