Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

78 files changed, 2740 insertions, 1325 deletions

diff --git a/js/helper-classes/RDGE/GLAnchorPoint.js b/js/helper-classes/RDGE/GLAnchorPoint.js
index 716f59d4..716f59d4 100644..100755
--- a/js/helper-classes/RDGE/GLAnchorPoint.js
+++ b/js/helper-classes/RDGE/GLAnchorPoint.js
diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js
index 8fb6ab25..8fb6ab25 100644..100755
--- a/js/helper-classes/RDGE/GLBrushStroke.js
+++ b/js/helper-classes/RDGE/GLBrushStroke.js
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 942eb528..5b32547e 100644..100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -133,6 +133,9 @@ function GLCircle()
         if (!world)  throw( "null world in buildBuffers" );
 
                 if (!world._useWebGL)  return;
+                
+                // make sure RDGE has the correct context
+                g_Engine.setContext( world.getCanvas().uuid );
 
          // create the gl buffer
         var gl = world.getGLContext();
@@ -397,7 +400,10 @@ function GLCircle()
                         ctx.lineWidth = 0;
                         ctx.fillStyle   = "#990000";
                         if (this._fillColor)
-                                ctx.fillStyle = MathUtils.colorToHex( this._fillColor );
+                        {
+                                var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";  
+                                ctx.fillStyle = c;
+                        }
 
                         // draw the fill
                         ctx.beginPath();
@@ -457,7 +463,10 @@ function GLCircle()
                         ctx.lineWidth   = lineWidth;
                         ctx.strokeStyle = "#0000ff";
                         if (this._strokeColor)
-                                ctx.strokeStyle = MathUtils.colorToHex( this._strokeColor );
+                        {
+                                var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";  
+                                ctx.strokeStyle = c;
+                        }
                         
                         // draw the stroke
                         p = MathUtils.transformPoint( bezPts[0],   mat );
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js
index 5d7497ad..5d7497ad 100644..100755
--- a/js/helper-classes/RDGE/GLGeomObj.js
+++ b/js/helper-classes/RDGE/GLGeomObj.js
diff --git a/js/helper-classes/RDGE/GLLight.js b/js/helper-classes/RDGE/GLLight.js
index 2bd5f77e..2bd5f77e 100644..100755
--- a/js/helper-classes/RDGE/GLLight.js
+++ b/js/helper-classes/RDGE/GLLight.js
diff --git a/js/helper-classes/RDGE/GLLine.js b/js/helper-classes/RDGE/GLLine.js
index 67379b52..0d815145 100644..100755
--- a/js/helper-classes/RDGE/GLLine.js
+++ b/js/helper-classes/RDGE/GLLine.js
@@ -11,76 +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;
-    
+        ///////////////////////////////////////////////////////////////////////
+        // 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;
+