From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:36:19 -0800
Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including
 adding back WebGL materials."

This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
---
 js/helper-classes/RDGE/GLCircle.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 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 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 );
-- 
cgit v1.2.3