FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

choozi - Rename drawArc to fillArc

pull/2415/head
Martin Boonk 2022-12-19 13:01:28 +01:00
parent bc20ce3f5b
commit 36557e4f5e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/choozi/app.js
View File

@ -58,7 +58,7 @@ function drawPerimeter() {
for (var i = 0; i < N; i++) { for (var i = 0; i < N; i++) {
g.setColor(colours[i%colours.length]); g.setColor(colours[i%colours.length]);
var minAngle = (i/N)*radians; 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); animateChoice((minAngle+maxAngle)/2);
g.setColor(colours[chosen%colours.length]); g.setColor(colours[chosen%colours.length]);
for (var i = segmentMax-segmentStep; i >= 0; i -= segmentStep){ 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(); 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){ for (var r = 1; r < segmentMax; r += circleStep){
g.fillCircle(centreX,centreY,r); g.fillCircle(centreX,centreY,r);
if (process.env.HWVERSION == 2) g.flip(); if (process.env.HWVERSION == 2) g.flip();

4
modules/graphics_utils.js
View File

@ -1,5 +1,5 @@
// draw an arc between radii minR and maxR, and between angles minAngle and maxAngle, all angles are radians // draw an arc between radii minR and maxR, and between angles minAngle and maxAngle centered at X,Y. All angles are radians.
exports.drawArc = function(graphics, minR, maxR, minAngle, maxAngle, X, Y, stepAngle) { exports.fillArc = function(graphics, X, Y, minR, maxR, minAngle, maxAngle, stepAngle) {
var step = stepAngle || 0.2; var step = stepAngle || 0.2;
var angle = minAngle; var angle = minAngle;
var inside = []; var inside = [];