From 36557e4f5ea5f721f450de7c71e56900ba72335c Mon Sep 17 00:00:00 2001 From: Martin Boonk Date: Mon, 19 Dec 2022 13:01:28 +0100 Subject: [PATCH] choozi - Rename drawArc to fillArc --- apps/choozi/app.js | 6 +++--- modules/graphics_utils.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/choozi/app.js b/apps/choozi/app.js index 517628470..b9f53bc89 100644 --- a/apps/choozi/app.js +++ b/apps/choozi/app.js @@ -58,7 +58,7 @@ function drawPerimeter() { for (var i = 0; i < N; i++) { g.setColor(colours[i%colours.length]); var minAngle = (i/N)*radians; - GU.drawArc(g, perimMin,perimMax,minAngle,minAngle+arclen, centreX, centreY, stepAngle); + GU.fillArc(g, centreX, centreY, perimMin,perimMax,minAngle,minAngle+arclen, stepAngle); } } @@ -115,10 +115,10 @@ function choose() { animateChoice((minAngle+maxAngle)/2); g.setColor(colours[chosen%colours.length]); for (var i = segmentMax-segmentStep; i >= 0; i -= segmentStep){ - GU.drawArc(g, i, perimMax, minAngle, maxAngle, centreX, centreY, stepAngle); + GU.fillArc(g, centreX, centreY, i, perimMax, minAngle, maxAngle, stepAngle); if (process.env.HWVERSION == 2) g.flip(); } - GU.drawArc(g, 0, perimMax, minAngle, maxAngle, centreX, centreY, stepAngle); + GU.fillArc(g, centreX, centreY, 0, perimMax, minAngle, maxAngle, stepAngle); for (var r = 1; r < segmentMax; r += circleStep){ g.fillCircle(centreX,centreY,r); if (process.env.HWVERSION == 2) g.flip(); diff --git a/modules/graphics_utils.js b/modules/graphics_utils.js index 925502afb..5c08188bc 100644 --- a/modules/graphics_utils.js +++ b/modules/graphics_utils.js @@ -1,5 +1,5 @@ -// draw an arc between radii minR and maxR, and between angles minAngle and maxAngle, all angles are radians -exports.drawArc = function(graphics, minR, maxR, minAngle, maxAngle, X, Y, stepAngle) { +// draw an arc between radii minR and maxR, and between angles minAngle and maxAngle centered at X,Y. All angles are radians. +exports.fillArc = function(graphics, X, Y, minR, maxR, minAngle, maxAngle, stepAngle) { var step = stepAngle || 0.2; var angle = minAngle; var inside = [];