Fix new vector font - accidentally committed one with too few points

Graphics.fillPoly now uses 4 bit fixed point internally

Author: gfwilliams

ChangeLog

@@ -41,6 +41,8 @@
             Pixl.js: fix self-test/terminal print - write to screen immediately after newline unless in IRQ
             Fix issue with iteration over arrays with negative entries (these should be converted to Strings)
             Linux: improve command-line, allow recursive test directory and more than one test (eg wildcard + shell expansion)
+            Added new vector fonts supporting most of ISO8859-1
+            Graphics.fillPoly now uses 4 bit fixed point internally
 
      2v05 : Add Array.includes
             Fix (Number.toFixed) rounding, eg (1234.505).toFixed(2)

libs/graphics/graphics.c

@@ -204,6 +204,17 @@ void graphicsToDeviceCoordinates(const JsGraphics *gfx, int *x, int *y) {
   if (gfx->data.flags & JSGRAPHICSFLAGS_INVERT_Y) *y = (int)(gfx->data.height - (*y+1));
 }
 
+// If graphics is flipped or rotated then the coordinates need modifying
+void graphicsToDeviceCoordinates16x(const JsGraphics *gfx, int *x, int *y) {
+  if (gfx->data.flags & JSGRAPHICSFLAGS_SWAP_XY) {
+    int t = *x;
+    *x = *y;
+    *y = t;
+  }
+  if (gfx->data.flags & JSGRAPHICSFLAGS_INVERT_X) *x = (int)((gfx->data.width-1)*16 - *x);
+  if (gfx->data.flags & JSGRAPHICSFLAGS_INVERT_Y) *y = (int)((gfx->data.height-1)*16 - *y);
+}
+
 unsigned short graphicsGetWidth(const JsGraphics *gfx) {
   return (gfx->data.flags & JSGRAPHICSFLAGS_SWAP_XY) ? gfx->data.height : gfx->data.width;
 }
@@ -409,7 +420,7 @@ void graphicsDrawLine(JsGraphics *gfx, int x1, int y1, int x2, int y2) {
 }
 
 
-
+// Fill poly - each member of vertices is 1/16th pixel
 void graphicsFillPoly(JsGraphics *gfx, int points, short *vertices) {
   typedef struct {
     short x,y;
@@ -423,11 +434,11 @@ void graphicsFillPoly(JsGraphics *gfx, int points, short *vertices) {
     // convert into device coordinates...
     int vx = v[i].x;
     int vy = v[i].y;
-    graphicsToDeviceCoordinates(gfx, &vx, &vy);
+    graphicsToDeviceCoordinates16x(gfx, &vx, &vy);
     v[i].x = (short)vx;
     v[i].y = (short)vy;
     // work out min and max
-    short y = v[i].y;
+    short y = v[i].y>>4;
     if (y<miny) miny=y;
     if (y>maxy) maxy=y;
   }
@@ -442,16 +453,15 @@ void graphicsFillPoly(JsGraphics *gfx, int points, short *vertices) {
   const int MAX_CROSSES = 64;
 
   // for each scanline
-  for (y=miny;y<=maxy;y++) {
+  for (y=miny<<4;y<=maxy<<4;y+=16) {
     short cross[MAX_CROSSES];
     bool slopes[MAX_CROSSES];
     int crosscnt = 0;
     // work out all the times lines cross the scanline
     j = points-1;
     for (i=0;i<points;i++) {
-      if ((y==miny && (v[i].y==y || v[j].y==y)) || // special-case top line
-          (v[i].y<y && v[j].y>=y) ||
-          (v[j].y<y && v[i].y>=y)) {
+      if ((v[i].y<=y && v[j].y>=y) ||
+          (v[j].y<=y && v[i].y>=y)) {
         if (crosscnt < MAX_CROSSES) {
           int l = v[j].y - v[i].y;
           if (l) { // don't do horiz lines - rely on the ends of the lines that join onto them
@@ -482,7 +492,8 @@ void graphicsFillPoly(JsGraphics *gfx, int points, short *vertices) {
     for (i=0;i<crosscnt;i++) {
       if (s==0) x=cross[i];
       if (slopes[i]) s++; else s--;
-      if (!s || i==crosscnt-1) graphicsFillRectDevice(gfx,x,y,cross[i],y,gfx->data.fgColor);
+      if (!s || i==crosscnt-1)
+        graphicsFillRectDevice(gfx,x>>4,y>>4,cross[i]>>4,y>>4,gfx->data.fgColor);
       if (jspIsInterrupted()) break;
     }
   }

libs/graphics/graphics.h

@@ -132,7 +132,7 @@ void graphicsDrawRect(JsGraphics *gfx, int x1, int y1, int x2, int y2);
 void graphicsDrawEllipse(JsGraphics *gfx, int x, int y, int x2, int y2);
 void graphicsFillEllipse(JsGraphics *gfx, int x, int y, int x2, int y2);
 void graphicsDrawLine(JsGraphics *gfx, int x1, int y1, int x2, int y2);
-void graphicsFillPoly(JsGraphics *gfx, int points, short *vertices); // may overwrite vertices...
+void graphicsFillPoly(JsGraphics *gfx, int points, short *vertices); // each pixel is 1/16th a pixel may overwrite vertices...
 #ifndef NO_VECTOR_FONT
 unsigned int graphicsFillVectorChar(JsGraphics *gfx, int x1, int y1, int size, char ch); ///< prints character, returns width
 unsigned int graphicsVectorCharWidth(JsGraphics *gfx, unsigned int size, char ch); ///< returns the width of a character

libs/graphics/jswrap_graphics.c

@@ -1653,7 +1653,7 @@ JsVar *jswrap_graphics_fillPoly(JsVar *parent, JsVar *poly) {
   JsvIterator it;
   jsvIteratorNew(&it, poly, JSIF_EVERY_ARRAY_ELEMENT);
   while (jsvIteratorHasElement(&it) && idx<maxVerts) {
-    verts[idx++] = (short)jsvIteratorGetIntegerValue(&it);
+    verts[idx++] = (short)(0.5 + jsvIteratorGetFloatValue(&it)*16);
     jsvIteratorNext(&it);
   }
   jsvIteratorFree(&it);