Merge pull request adafruit#3221 from WarriorOfWire/vectorio_topleft

jepler · web-flow · commit 5cb7e64cc886 · 2020-07-29T11:19:02.000-05:00
use top-left heuristic for vectorio.Polygon
diff --git a/shared-module/vectorio/Polygon.c b/shared-module/vectorio/Polygon.c
@@ -143,13 +143,13 @@ uint32_t common_hal_vectorio_polygon_get_pixel(void *obj, int16_t x, int16_t y)
         int y2 = self->points_list[i % self->len];
         VECTORIO_POLYGON_DEBUG(" (%3d, %3d)}\n", x2, y2);
         if ( y1 <= y ) {
-            if ( y2 > y && line_side(x1, y1, x2, y2, x, y) > 0 ) {
-                // Wind up, point is to the right of the edge vector
+            if ( y2 > y && line_side(x1, y1, x2, y2, x, y) < 0 ) {
+                // Wind up, point is to the left of the edge vector
                 ++winding_number;
                 VECTORIO_POLYGON_DEBUG("    wind:%2d winding_number:%2d\n", 1, winding_number);
             }
-        } else if ( y2 <= y && line_side(x1, y1, x2, y2, x, y) < 0 ) {
-            // Wind down, point is to the left of the edge vector
+        } else if ( y2 <= y && line_side(x1, y1, x2, y2, x, y) > 0 ) {
+            // Wind down, point is to the right of the edge vector
             --winding_number;
             VECTORIO_POLYGON_DEBUG("    wind:%2d winding_number:%2d\n", -1, winding_number);
         }
