From 9d3589feb0174c09d1c1bac405660f8900259c7d Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 22 Feb 2012 04:44:07 -0800
Subject: Adding bug fixes.

---
 js/helper-classes/RDGE/GLCircle.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'js/helper-classes/RDGE/GLCircle.js')

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 08057778..5b32547e 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -400,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();
@@ -460,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 );
-- 
cgit v1.2.3


From 2bb869eb1c0b71e379f159eb0f95dfa168496d8d Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 22 Feb 2012 15:22:13 -0800
Subject: Runtime classes

---
 js/helper-classes/RDGE/GLCircle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/helper-classes/RDGE/GLCircle.js')

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 5b32547e..712544c0 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -135,7 +135,7 @@ function GLCircle()
 		if (!world._useWebGL)  return;
 		
 		// make sure RDGE has the correct context
-		g_Engine.setContext( world.getCanvas().uuid );
+		g_Engine.setContext( world.getCanvas().rdgeid );
 
          // create the gl buffer
         var gl = world.getGLContext();
-- 
cgit v1.2.3