Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

choozi - Fix library not working standalone

master
Martin Boonk 2022-12-19 12:52:33 +01:00
parent 68523875a8
commit d8543f4d41
2 changed files with 23 additions and 15 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++) {
g.setColor(colours[i%colours.length]);
var minAngle = (i/N)*radians;
GU.drawArc(g, perimMin,perimMax,minAngle,minAngle+arclen);
GU.drawArc(g, perimMin,perimMax,minAngle,minAngle+arclen, centreX, centreY, 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);
GU.drawArc(g, i, perimMax, minAngle, maxAngle, centreX, centreY, stepAngle);
if (process.env.HWVERSION == 2) g.flip();
}
GU.drawArc(g, 0, perimMax, minAngle, maxAngle);
GU.drawArc(g, 0, perimMax, minAngle, maxAngle, centreX, centreY, stepAngle);
for (var r = 1; r < segmentMax; r += circleStep){
g.fillCircle(centreX,centreY,r);
if (process.env.HWVERSION == 2) g.flip();

32
modules/graphics_utils.js
View File

@ -1,6 +1,6 @@
// 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;
// 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) {
var step = stepAngle || 0.2;
var angle = minAngle;
var inside = [];
var outside = [];
@ -8,20 +8,28 @@ exports.drawArc = function(graphics, minR, maxR, minAngle, maxAngle) {
while (angle < maxAngle) {
c = Math.cos(angle);
s = Math.sin(angle);
inside.push(centreX+c*minR); // x
inside.push(centreY+s*minR); // y
inside.push(X+c*minR); // x
inside.push(Y+s*minR); // y
// outside coordinates are built up in reverse order
outside.unshift(centreY+s*maxR); // y
outside.unshift(centreX+c*maxR); // x
outside.unshift(Y+s*maxR); // y
outside.unshift(X+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);
inside.push(X+c*minR);
inside.push(Y+s*minR);
outside.unshift(Y+s*maxR);
outside.unshift(X+c*maxR);
var vertices = inside.concat(outside);
graphics.fillPoly(vertices, true);
}
exports.degreesToRadians = function(degrees){
return Math.PI/180 * degrees;
}
exports.radiansToDegrees = function(radians){
return 180/Math.PI * degrees;
}