diff options
| author | Dan Halbert <halbert@adafruit.com> | 2019-05-31 21:27:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 21:27:06 -0400 |
| commit | bcda5e133d0f4c13265cc927a4e9de9a77b187c6 (patch) | |
| tree | 8e37743d7d63bc7a5a8967ce949e5de2071727a4 /supervisor/shared | |
| parent | 63b253c33a2e56bc6c6ccb902d89d0c0b27f7d8f (diff) | |
| parent | 5d0791cafbebf6df7692836b60e86bc1238b4d57 (diff) | |
Merge pull request #1903 from tannewt/get_area
Rework the pixel computation to use areas
Diffstat (limited to 'supervisor/shared')
| -rw-r--r-- | supervisor/shared/display.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index 0b3fbe178..5eab74e16 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -70,8 +70,8 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { grid->width_in_tiles = width_in_tiles; grid->height_in_tiles = height_in_tiles; - grid->total_width = width_in_tiles * grid->tile_width; - grid->total_height = height_in_tiles * grid->tile_height; + grid->area.x2 = grid->area.x1 + width_in_tiles * grid->tile_width; + grid->area.y2 = grid->area.y1 + height_in_tiles * grid->tile_height; grid->tiles = tiles; supervisor_terminal.cursor_x = 0; @@ -157,13 +157,15 @@ displayio_tilegrid_t blinka_sprite = { .base = {.type = &displayio_tilegrid_type }, .bitmap = &blinka_bitmap, .pixel_shader = &blinka_palette, - .x = 0, - .y = 0, + .area = { + .x1 = 0, + .y1 = 0, + .x2 = 16, + .y2 = 16 + }, .bitmap_width_in_tiles = 1, .width_in_tiles = 1, .height_in_tiles = 1, - .total_width = 16, - .total_height = 16, .tile_width = 16, .tile_height = 16, .top_left_x = 16, |