aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/GLCircle.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-23 10:37:04 -0800
committerJose Antonio Marquez2012-02-23 10:37:04 -0800
commit287a0bad5b774a380ec6c8b3ddf24dc03234e248 (patch)
treeedffa1dd9df53f26da4135068686997ccfbdf083 /js/helper-classes/RDGE/GLCircle.js
parent14a8f4c4e373db213b3d42d30edaea8354ae57e3 (diff)
parentcc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff)
downloadninja-287a0bad5b774a380ec6c8b3ddf24dc03234e248.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'js/helper-classes/RDGE/GLCircle.js')
-rwxr-xr-xjs/helper-classes/RDGE/GLCircle.js10
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()
400 ctx.lineWidth = 0; 400 ctx.lineWidth = 0;
401 ctx.fillStyle = "#990000"; 401 ctx.fillStyle = "#990000";
402 if (this._fillColor) 402 if (this._fillColor)
403 ctx.fillStyle = MathUtils.colorToHex( this._fillColor ); 403 {
404 var c = "rgba(" + 255*this._fillColor[0] + "," + 255*this._fillColor[1] + "," + 255*this._fillColor[2] + "," + this._fillColor[3] + ")";
405 ctx.fillStyle = c;
406 }
404 407
405 // draw the fill 408 // draw the fill
406 ctx.beginPath(); 409 ctx.beginPath();
@@ -460,7 +463,10 @@ function GLCircle()
460 ctx.lineWidth = lineWidth; 463 ctx.lineWidth = lineWidth;
461 ctx.strokeStyle = "#0000ff"; 464 ctx.strokeStyle = "#0000ff";
462 if (this._strokeColor) 465 if (this._strokeColor)
463 ctx.strokeStyle = MathUtils.colorToHex( this._strokeColor ); 466 {
467 var c = "rgba(" + 255*this._strokeColor[0] + "," + 255*this._strokeColor[1] + "," + 255*this._strokeColor[2] + "," + this._strokeColor[3] + ")";
468 ctx.strokeStyle = c;
469 }
464 470
465 // draw the stroke 471 // draw the stroke
466 p = MathUtils.transformPoint( bezPts[0], mat ); 472 p = MathUtils.transformPoint( bezPts[0], mat );