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

choozi - Extract drawing of arcs into lib for others to use

pull/2415/head
Martin Boonk 2022-12-18 20:32:53 +01:00
parent f8d241bac4
commit f467227d8d
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/choozi/app.js
View File

@ -4,7 +4,7 @@
* *
* James Stanley 2021 * James Stanley 2021
*/ */
const GU = require("graphics_utils");
var colours = ['#ff0000', '#00ff00', '#0000ff', '#ffff00', '#00ffff', '#ff00ff', '#ffffff']; var colours = ['#ff0000', '#00ff00', '#0000ff', '#ffff00', '#00ffff', '#ff00ff', '#ffffff'];
var colours2 = ['#808080', '#404040', '#000040', '#004000', '#400000', '#ff8000', '#804000', '#4000c0']; var colours2 = ['#808080', '#404040', '#000040', '#004000', '#400000', '#ff8000', '#804000', '#4000c0'];
@ -51,35 +51,6 @@ function shuffle (array) {
} }
} }
// draw an arc between radii minR and maxR, and between
// angles minAngle and maxAngle
function arc(minR, maxR, minAngle, maxAngle) {
var step = stepAngle;
var angle = minAngle;
var inside = [];
var outside = [];
var c, s;
while (angle < maxAngle) {
c = Math.cos(angle);
s = Math.sin(angle);
inside.push(centreX+c*minR); // x
inside.push(centreY+s*minR); // y
// outside coordinates are built up in reverse order
outside.unshift(centreY+s*maxR); // y
outside.unshift(centreX+c*maxR); // x
angle += step;
}
c = Math.cos(maxAngle);
s = Math.sin(maxAngle);
inside.push(centreX+c*minR);
inside.push(centreY+s*minR);
outside.unshift(centreY+s*maxR);
outside.unshift(centreX+c*maxR);
var vertices = inside.concat(outside);
g.fillPoly(vertices, true);
}
// draw the arc segments around the perimeter // draw the arc segments around the perimeter
function drawPerimeter() { function drawPerimeter() {
g.setBgColor('#000000'); g.setBgColor('#000000');
@ -87,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;
arc(perimMin,perimMax,minAngle,minAngle+arclen); GU.drawArc(g, perimMin,perimMax,minAngle,minAngle+arclen);
} }
} }
@ -144,8 +115,8 @@ 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)
arc(i, perimMax, minAngle, maxAngle); GU.drawArc(g, i, perimMax, minAngle, maxAngle);
arc(0, perimMax, minAngle, maxAngle); GU.drawArc(g, 0, perimMax, minAngle, maxAngle);
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);
g.fillCircle(centreX,centreY,segmentMax); g.fillCircle(centreX,centreY,segmentMax);

27
modules/graphics_utils.js Normal file
View File

@ -0,0 +1,27 @@
// draw an arc between radii minR and maxR, and between angles minAngle and maxAngle
exports.drawArc = function(graphics, minR, maxR, minAngle, maxAngle) {
var step = stepAngle;
var angle = minAngle;
var inside = [];
var outside = [];
var c, s;
while (angle < maxAngle) {
c = Math.cos(angle);
s = Math.sin(angle);
inside.push(centreX+c*minR); // x
inside.push(centreY+s*minR); // y
// outside coordinates are built up in reverse order
outside.unshift(centreY+s*maxR); // y
outside.unshift(centreX+c*maxR); // x
angle += step;
}
c = Math.cos(maxAngle);
s = Math.sin(maxAngle);
inside.push(centreX+c*minR);
inside.push(centreY+s*minR);
outside.unshift(centreY+s*maxR);
outside.unshift(centreX+c*maxR);
var vertices = inside.concat(outside);
graphics.fillPoly(vertices, true);
}