move to displayio_area_union and away from _expand

kmatch98 · kmatch98 · commit 9485805b6aa6 · 2021-03-25T11:21:39.000-05:00
diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c
@@ -123,15 +123,15 @@ bool displayio_group_get_previous_area(displayio_group_t *self, displayio_area_t
             displayio_area_copy(&layer_area, area);
             first = false;
         } else {
-            displayio_area_expand(area, &layer_area);
+            displayio_area_union(area, &layer_area, area);
         }
     }
     if (self->item_removed) {
         if (first) {
             displayio_area_copy(&self->dirty_area, area);
             first = false;
         } else {
-            displayio_area_expand(area, &self->dirty_area);
+            displayio_area_union(area, &self->dirty_area, area);
         }
     }
     return !first;
@@ -307,7 +307,7 @@ static void _remove_layer(displayio_group_t *self, size_t index) {
     if (!self->item_removed) {
         displayio_area_copy(&layer_area, &self->dirty_area);
     } else {
-        displayio_area_expand(&self->dirty_area, &layer_area);
+        displayio_area_union(&self->dirty_area, &layer_area, &self->dirty_area);
     }
     self->item_removed = true;
 }
diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
@@ -273,7 +273,7 @@ void common_hal_displayio_tilegrid_set_tile(displayio_tilegrid_t *self, uint16_t
     tile_area->y2 = tile_area->y1 + self->tile_height;
 
     if (self->partial_change) {
-        displayio_area_expand(&self->dirty_area, &temp_area);
+        displayio_area_union(&self->dirty_area, &temp_area, &self->dirty_area);
     }
 
     self->partial_change = true;
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
@@ -245,21 +245,6 @@ void displayio_gc_collect(void) {
     }
 }
 
-void displayio_area_expand(displayio_area_t *original, const displayio_area_t *addition) {
-    if (addition->x1 < original->x1) {
-        original->x1 = addition->x1;
-    }
-    if (addition->y1 < original->y1) {
-        original->y1 = addition->y1;
-    }
-    if (addition->x2 > original->x2) {
-        original->x2 = addition->x2;
-    }
-    if (addition->y2 > original->y2) {
-        original->y2 = addition->y2;
-    }
-}
-
 void displayio_area_copy(const displayio_area_t *src, displayio_area_t *dst) {
     dst->x1 = src->x1;
     dst->y1 = src->y1;
diff --git a/shared-module/displayio/area.h b/shared-module/displayio/area.h
@@ -59,7 +59,6 @@ void displayio_area_canon(displayio_area_t *a);
 void displayio_area_union(const displayio_area_t *a,
     const displayio_area_t *b,
     displayio_area_t *u);
-void displayio_area_expand(displayio_area_t *original, const displayio_area_t *addition);
 void displayio_area_copy(const displayio_area_t *src, displayio_area_t *dst);
 void displayio_area_scale(displayio_area_t *area, uint16_t scale);
 void displayio_area_shift(displayio_area_t *area, int16_t dx, int16_t dy);
diff --git a/shared-module/vectorio/VectorShape.c b/shared-module/vectorio/VectorShape.c
@@ -88,7 +88,7 @@ void common_hal_vectorio_vector_shape_set_dirty(void *vector_shape) {
         self->ephemeral_dirty_area.x1, self->ephemeral_dirty_area.y1, self->ephemeral_dirty_area.x2, self->ephemeral_dirty_area.y2);
     self->dirty = true;
     // Dirty area tracks the shape's footprint between draws.  It's reset on refresh finish,
-    displayio_area_expand(&self->ephemeral_dirty_area, &current_area);
+    displayio_area_union(&self->ephemeral_dirty_area, &current_area, &self->ephemeral_dirty_area);
     VECTORIO_SHAPE_DEBUG(" -> expanded:{(%3d,%3d), (%3d,%3d)}\n", self->ephemeral_dirty_area.x1, self->ephemeral_dirty_area.y1, self->ephemeral_dirty_area.x2, self->ephemeral_dirty_area.y2);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -123,15 +123,15 @@ bool displayio_group_get_previous_area(displayio_group_t *self, displayio_area_t`
`123`	`123`	`displayio_area_copy(&layer_area, area);`
`124`	`124`	`first = false;`
`125`	`125`	`} else {`
`126`		`- displayio_area_expand(area, &layer_area);`
	`126`	`+ displayio_area_union(area, &layer_area, area);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`if (self->item_removed) {`
`130`	`130`	`if (first) {`
`131`	`131`	`displayio_area_copy(&self->dirty_area, area);`
`132`	`132`	`first = false;`
`133`	`133`	`} else {`
`134`		`- displayio_area_expand(area, &self->dirty_area);`
	`134`	`+ displayio_area_union(area, &self->dirty_area, area);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`return !first;`
`@@ -307,7 +307,7 @@ static void _remove_layer(displayio_group_t *self, size_t index) {`
`307`	`307`	`if (!self->item_removed) {`
`308`	`308`	`displayio_area_copy(&layer_area, &self->dirty_area);`
`309`	`309`	`} else {`
`310`		`- displayio_area_expand(&self->dirty_area, &layer_area);`
	`310`	`+ displayio_area_union(&self->dirty_area, &layer_area, &self->dirty_area);`
`311`	`311`	`}`
`312`	`312`	`self->item_removed = true;`
`313`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ void common_hal_displayio_tilegrid_set_tile(displayio_tilegrid_t *self, uint16_t`
`273`	`273`	`tile_area->y2 = tile_area->y1 + self->tile_height;`
`274`	`274`
`275`	`275`	`if (self->partial_change) {`
`276`		`- displayio_area_expand(&self->dirty_area, &temp_area);`
	`276`	`+ displayio_area_union(&self->dirty_area, &temp_area, &self->dirty_area);`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`self->partial_change = true;`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void common_hal_vectorio_vector_shape_set_dirty(void *vector_shape) {`
`88`	`88`	`self->ephemeral_dirty_area.x1, self->ephemeral_dirty_area.y1, self->ephemeral_dirty_area.x2, self->ephemeral_dirty_area.y2);`
`89`	`89`	`self->dirty = true;`
`90`	`90`	`// Dirty area tracks the shape's footprint between draws. It's reset on refresh finish,`
`91`		`- displayio_area_expand(&self->ephemeral_dirty_area, &current_area);`
	`91`	`+ displayio_area_union(&self->ephemeral_dirty_area, &current_area, &self->ephemeral_dirty_area);`
`92`	`92`	`VECTORIO_SHAPE_DEBUG(" -> expanded:{(%3d,%3d), (%3d,%3d)}\n", self->ephemeral_dirty_area.x1, self->ephemeral_dirty_area.y1, self->ephemeral_dirty_area.x2, self->ephemeral_dirty_area.y2);`
`93`	`93`	`}`
`94`	`94`