archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix rounding errors in fillPoly -> improve vector font rendering

Browse Source
This commit is contained in:
Gordon Williams 2018-06-01 09:05:48 +01:00
parent d22c31e318
commit ed6fad079c
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@
Fix stack overflow if interpreting a file full of '{' (fix #1448)
Fix exception when performing record access on object from getter (fix #1454)
Switch to non-recursive StringExt copy (fix #1451)
Fix rounding errors in fillPoly -> improve vector font rendering
1v99 : Increase jslMatch error buffer size to handle "UNFINISHED TEMPLATE LITERAL" string (#1426)
nRF5x: Make FlashWrite cope with flash writes > 4k

47
libs/graphics/graphics.c
View File

@ -344,30 +344,31 @@ void graphicsDrawLine(JsGraphics *gfx, short x1, short y1, short x2, short y2) {
}
static inline void graphicsFillPolyCreateScanLines(JsGraphics *gfx, short *minx, short *maxx, short x1, short y1,short x2, short y2) {
if (y2 < y1) {
short t;
t=x1;x1=x2;x2=t;
t=y1;y1=y2;y2=t;
}
int xh = x1*256;
int yl = y2-y1;
if (yl==0) yl=1;
int stepx = (x2-x1)*256 / yl;
short y;
for (y=y1;y<=y2;y++) {
int x = xh>>8;
if (x<-32768) x=-32768;
if (x>32767) x=32767;
if (y>=0 && y<gfx->data.height) {
if (x<minx[y]) {
minx[y] = (short)x;
}
if (x>maxx[y]) {
maxx[y] = (short)x;
}
}
xh += stepx;
if (y2 < y1) {
short t;
t=x1;x1=x2;x2=t;
t=y1;y1=y2;y2=t;
}
int xh = x1*256 + 128/*do rounding here rather than when we >>8*/;
int yl = (1+y2)-y1;
int stepx = ((x2-x1)*256 + (yl/2)/*rounding*/) / yl;
short y;
int x = xh>>8;
if (x<-32768) x=-32768;
if (x>32767) x=32767;
for (y=y1;y<=y2;y++) {
int oldx = x;
xh += stepx;
x = xh>>8;
if (x<-32768) x=-32768;
if (x>32767) x=32767;
if (y>=0 && y<gfx->data.height) {
if (oldx<minx[y]) minx[y] = (short)oldx;
if (oldx>maxx[y]) maxx[y] = (short)oldx;
if (x<minx[y]) minx[y] = (short)x;
if (x>maxx[y]) maxx[y] = (short)x;
}
}
}
void graphicsFillPoly(JsGraphics *gfx, int points, short *vertices) {