Merge pull request #60 from mqg734/WebGLMaterials

Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.

1 files changed, 8 insertions, 2 deletions

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 );