From 206d0e598adb66e2b23a39a7d11e2f5087513205 Mon Sep 17 00:00:00 2001
From: warriorofwire <3454741+WarriorOfWire@users.noreply.github.com>
Date: Sat, 2 May 2020 02:21:35 -0700
Subject: Add vectorio: for drawing shapes

vectorio builds on m4 express feather

Concrete shapes are composed into a VectorShape which is put into a displayio Group for display.

VectorShape provides transpose and x/y positioning for shape implementations.

Included Shapes:

* Circle
  - A radius; Circle is positioned at its axis in the VectorShape.
  - You can freely modify the radius to grow and shrink the circle in-place.

* Polygon
  - An ordered list of points.
  - Beteween each successive point an edge is inferred.  A final edge closing the shape is inferred between the last
    point and the first point.
  - You can modify the points in a Polygon.  The points' coordinate system is relative to (0, 0) so if you'd like a
      top-center justified 10x20 rectangle you can do points [(-5, 0), (5, 0), (5, 20), (0, 20)] and your VectorShape
      x and y properties will position the rectangle relative to its top center point

* Rectangle
  A width and a height.
---
 shared-module/vectorio/Rectangle.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 shared-module/vectorio/Rectangle.c

(limited to 'shared-module/vectorio/Rectangle.c')

diff --git a/shared-module/vectorio/Rectangle.c b/shared-module/vectorio/Rectangle.c
new file mode 100644
index 000000000..dfad58a4d
--- /dev/null
+++ b/shared-module/vectorio/Rectangle.c
@@ -0,0 +1,35 @@
+#include "shared-bindings/vectorio/Rectangle.h"
+#include "shared-module/displayio/area.h"
+
+#include "py/runtime.h"
+
+
+void common_hal_vectorio_rectangle_construct(vectorio_rectangle_t *self, uint32_t width, uint32_t height) {
+    self->width = width;
+    self->height = height;
+}
+
+
+uint32_t common_hal_vectorio_rectangle_get_pixel(void *obj, int16_t x, int16_t y) {
+    vectorio_rectangle_t *self = obj;
+    if (x < 0 || x >= self->width || y >= self->height || y < 0) {
+        return 0;
+    }
+    return 1;
+}
+
+
+void common_hal_vectorio_rectangle_get_area(void *rectangle, displayio_area_t *out_area) {
+    vectorio_rectangle_t *self = rectangle;
+    out_area->x1 = 0;
+    out_area->y1 = 0;
+    out_area->x2 = self->width;
+    out_area->y2 = self->height;
+}
+
+
+uint32_t common_hal_vectorio_rectangle_get_height(void *rectangle) {
+    vectorio_rectangle_t *self = rectangle;
+    return self->height;
+}
+
-- 
cgit v1.2.3


From 32f85f7a44b6ce753070168b4f008a9499d70883 Mon Sep 17 00:00:00 2001
From: warriorofwire <3454741+WarriorOfWire@users.noreply.github.com>
Date: Sun, 10 May 2020 16:21:07 -0700
Subject: vectorio: fix up Rectangle

* Fix drawing 1 pixel too large
* Need to pad dirty area to ensure removed shapes are fully removed
---
 shared-module/vectorio/Rectangle.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'shared-module/vectorio/Rectangle.c')

diff --git a/shared-module/vectorio/Rectangle.c b/shared-module/vectorio/Rectangle.c
index dfad58a4d..7fabe6ff9 100644
--- a/shared-module/vectorio/Rectangle.c
+++ b/shared-module/vectorio/Rectangle.c
@@ -12,7 +12,7 @@ void common_hal_vectorio_rectangle_construct(vectorio_rectangle_t *self, uint32_
 
 uint32_t common_hal_vectorio_rectangle_get_pixel(void *obj, int16_t x, int16_t y) {
     vectorio_rectangle_t *self = obj;
-    if (x < 0 || x >= self->width || y >= self->height || y < 0) {
+    if (x < 0 || x > self->width || y > self->height || y < 0) {
         return 0;
     }
     return 1;
@@ -21,8 +21,8 @@ uint32_t common_hal_vectorio_rectangle_get_pixel(void *obj, int16_t x, int16_t y
 
 void common_hal_vectorio_rectangle_get_area(void *rectangle, displayio_area_t *out_area) {
     vectorio_rectangle_t *self = rectangle;
-    out_area->x1 = 0;
-    out_area->y1 = 0;
+    out_area->x1 = -1;
+    out_area->y1 = -1;
     out_area->x2 = self->width;
     out_area->y2 = self->height;
 }
-- 
cgit v1.2.3