Standardize TileGrid to x and y properties over position
This brings it inline with Group. Also fixes #1613 This also includes a number of fixes for where a method is called through a subclass. We now correctly get the native object. Fixes #1567 Lastly, this adds subscript support to TileGrid for changing tile indices. Similar to Bitmap, it accepts ints or 2-tuples.
This commit is contained in:
Scott Shawcroft
parent
96a924f5f0
commit
224e9b1009
@ -172,7 +172,7 @@ const mp_obj_property_t displayio_group_y_obj = {
|
||||
//| Append a layer to the group. It will be drawn above other layers.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_group_obj_append(mp_obj_t self_in, mp_obj_t layer) {
|
||||
displayio_group_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
displayio_group_t *self = native_group(self_in);
|
||||
common_hal_displayio_group_insert(self, common_hal_displayio_group_get_len(self), layer);
|
||||
return mp_const_none;
|
||||
}
|
||||
@ -183,7 +183,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_append_obj, displayio_group_obj_append
|
||||
//| Insert a layer into the group.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_group_obj_insert(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t layer) {
|
||||
displayio_group_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
displayio_group_t *self = native_group(self_in);
|
||||
size_t index = mp_get_index(&displayio_group_type, common_hal_displayio_group_get_len(self), index_obj, false);
|
||||
common_hal_displayio_group_insert(self, index, layer);
|
||||
return mp_const_none;
|
||||
@ -202,7 +202,7 @@ STATIC mp_obj_t displayio_group_obj_pop(size_t n_args, const mp_obj_t *pos_args,
|
||||
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
||||
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
||||
|
||||
displayio_group_t *self = MP_OBJ_TO_PTR(pos_args[0]);
|
||||
displayio_group_t *self = native_group(pos_args[0]);
|
||||
|
||||
size_t index = mp_get_index(&displayio_group_type,
|
||||
common_hal_displayio_group_get_len(self),
|
||||
@ -217,7 +217,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_group_pop_obj, 1, displayio_group_obj_pop);
|
||||
//| Returns the number of layers in a Group
|
||||
//|
|
||||
STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
|
||||
displayio_group_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
displayio_group_t *self = native_group(self_in);
|
||||
uint16_t len = common_hal_displayio_group_get_len(self);
|
||||
switch (op) {
|
||||
case MP_UNARY_OP_BOOL: return mp_obj_new_bool(len != 0);
|
||||
@ -251,7 +251,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
|
||||
//| del group[0]
|
||||
//|
|
||||
STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
|
||||
displayio_group_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
displayio_group_t *self = native_group(self_in);
|
||||
|
||||
if (MP_OBJ_IS_TYPE(index_obj, &mp_type_slice)) {
|
||||
mp_raise_NotImplementedError(translate("Slices not supported"));
|
||||
|
||||
@ -39,17 +39,6 @@
|
||||
#include "shared-bindings/displayio/Shape.h"
|
||||
#include "supervisor/shared/translate.h"
|
||||
|
||||
static void unpack_position(mp_obj_t position_obj, int16_t* x, int16_t* y) {
|
||||
// TODO(tannewt): Support any value sequence such as bytearray or bytes.
|
||||
mp_obj_tuple_t *position = MP_OBJ_TO_PTR(position_obj);
|
||||
if (MP_OBJ_IS_TYPE(position_obj, &mp_type_tuple) && position->len == 2) {
|
||||
*x = mp_obj_get_int(position->items[0]);
|
||||
*y = mp_obj_get_int(position->items[1]);
|
||||
} else if (position != mp_const_none) {
|
||||
mp_raise_TypeError(translate("position must be 2-tuple"));
|
||||
}
|
||||
}
|
||||
|
||||
//| .. currentmodule:: displayio
|
||||
//|
|
||||
//| :class:`TileGrid` -- A grid of tiles sourced out of one bitmap
|
||||
@ -60,7 +49,7 @@ static void unpack_position(mp_obj_t position_obj, int16_t* x, int16_t* y) {
|
||||
//|
|
||||
//| A single tile grid is also known as a Sprite.
|
||||
//|
|
||||
//| .. class:: TileGrid(bitmap, *, pixel_shader, position, width=1, height=1, tile_width=None, tile_height=None, default_tile=0)
|
||||
//| .. class:: TileGrid(bitmap, *, pixel_shader, width=1, height=1, tile_width=None, tile_height=None, default_tile=0, x=0, y=0)
|
||||
//|
|
||||
//| Create a TileGrid object. The bitmap is source for 2d pixels. The pixel_shader is used to
|
||||
//| convert the value and its location to a display native pixel color. This may be a simple color
|
||||
@ -70,24 +59,26 @@ static void unpack_position(mp_obj_t position_obj, int16_t* x, int16_t* y) {
|
||||
//|
|
||||
//| :param displayio.Bitmap bitmap: The bitmap storing one or more tiles.
|
||||
//| :param displayio.Palette pixel_shader: The pixel shader that produces colors from values
|
||||
//| :param tuple position: Upper left corner of the grid
|
||||
//| :param int width: Width of the grid in tiles.
|
||||
//| :param int height: Height of the grid in tiles.
|
||||
//| :param int tile_width: Width of a single tile in pixels. Defaults to the full Bitmap and must evenly divide into the Bitmap's dimensions.
|
||||
//| :param int tile_height: Height of a single tile in pixels. Defaults to the full Bitmap and must evenly divide into the Bitmap's dimensions.
|
||||
//| :param in default_tile: Default tile index to show.
|
||||
//| :param int x: Initial x position of the left edge within the parent.
|
||||
//| :param int y: Initial y position of the top edge within the parent.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
|
||||
enum { ARG_bitmap, ARG_pixel_shader, ARG_position, ARG_width, ARG_height, ARG_tile_width, ARG_tile_height, ARG_default_tile };
|
||||
enum { ARG_bitmap, ARG_pixel_shader, ARG_width, ARG_height, ARG_tile_width, ARG_tile_height, ARG_default_tile, ARG_x, ARG_y };
|
||||
static const mp_arg_t allowed_args[] = {
|
||||
{ MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ },
|
||||
{ MP_QSTR_pixel_shader, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
||||
{ MP_QSTR_position, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
||||
{ MP_QSTR_width, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
|
||||
{ MP_QSTR_height, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
|
||||
{ MP_QSTR_tile_width, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
|
||||
{ MP_QSTR_tile_height, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
|
||||
{ MP_QSTR_default_tile, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
|
||||
{ MP_QSTR_x, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
|
||||
{ MP_QSTR_y, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
|
||||
};
|
||||
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
||||
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
||||
@ -129,10 +120,8 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
|
||||
mp_raise_ValueError(translate("Tile height must exactly divide bitmap height"));
|
||||
}
|
||||
|
||||
int16_t x = 0;
|
||||
int16_t y = 0;
|
||||
mp_obj_t position_obj = args[ARG_position].u_obj;
|
||||
unpack_position(position_obj, &x, &y);
|
||||
int16_t x = args[ARG_x].u_int;
|
||||
int16_t y = args[ARG_y].u_int;
|
||||
|
||||
displayio_tilegrid_t *self = m_new_obj(displayio_tilegrid_t);
|
||||
self->base.type = &displayio_tilegrid_type;
|
||||
@ -142,41 +131,61 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
|
||||
return MP_OBJ_FROM_PTR(self);
|
||||
}
|
||||
|
||||
//| .. attribute:: position
|
||||
//|
|
||||
//| The position of the top-left corner of the tilegrid.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_get_position(mp_obj_t self_in) {
|
||||
displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
int16_t x;
|
||||
int16_t y;
|
||||
common_hal_displayio_tilegrid_get_position(self, &x, &y);
|
||||
|
||||
mp_obj_t coords[2];
|
||||
coords[0] = mp_obj_new_int(x);
|
||||
coords[1] = mp_obj_new_int(y);
|
||||
|
||||
return mp_obj_new_tuple(2, coords);
|
||||
// Helper to ensure we have the native super class instead of a subclass.
|
||||
static displayio_tilegrid_t* native_tilegrid(mp_obj_t tilegrid_obj) {
|
||||
mp_obj_t native_tilegrid = mp_instance_cast_to_native_base(tilegrid_obj, &displayio_tilegrid_type);
|
||||
return MP_OBJ_TO_PTR(native_tilegrid);
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_position_obj, displayio_tilegrid_obj_get_position);
|
||||
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_set_position(mp_obj_t self_in, mp_obj_t value) {
|
||||
displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
//| .. attribute:: x
|
||||
//|
|
||||
//| X position of the left edge in the parent.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_get_x(mp_obj_t self_in) {
|
||||
displayio_tilegrid_t *self = native_tilegrid(self_in);
|
||||
return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_x(self));
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_x_obj, displayio_tilegrid_obj_get_x);
|
||||
|
||||
int16_t x = 0;
|
||||
int16_t y = 0;
|
||||
unpack_position(value, &x, &y);
|
||||
|
||||
common_hal_displayio_tilegrid_set_position(self, x, y);
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) {
|
||||
displayio_tilegrid_t *self = native_tilegrid(self_in);
|
||||
|
||||
mp_int_t x = mp_obj_get_int(x_obj);
|
||||
common_hal_displayio_tilegrid_set_x(self, x);
|
||||
return mp_const_none;
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_position_obj, displayio_tilegrid_obj_set_position);
|
||||
MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_x_obj, displayio_tilegrid_obj_set_x);
|
||||
|
||||
const mp_obj_property_t displayio_tilegrid_position_obj = {
|
||||
const mp_obj_property_t displayio_tilegrid_x_obj = {
|
||||
.base.type = &mp_type_property,
|
||||
.proxy = {(mp_obj_t)&displayio_tilegrid_get_position_obj,
|
||||
(mp_obj_t)&displayio_tilegrid_set_position_obj,
|
||||
.proxy = {(mp_obj_t)&displayio_tilegrid_get_x_obj,
|
||||
(mp_obj_t)&displayio_tilegrid_set_x_obj,
|
||||
(mp_obj_t)&mp_const_none_obj},
|
||||
};
|
||||
|
||||
//| .. attribute:: y
|
||||
//|
|
||||
//| Y position of the top edge in the parent.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_get_y(mp_obj_t self_in) {
|
||||
displayio_tilegrid_t *self = native_tilegrid(self_in);
|
||||
return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_y(self));
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_y_obj, displayio_tilegrid_obj_get_y);
|
||||
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) {
|
||||
displayio_tilegrid_t *self = native_tilegrid(self_in);
|
||||
|
||||
mp_int_t y = mp_obj_get_int(y_obj);
|
||||
common_hal_displayio_tilegrid_set_y(self, y);
|
||||
return mp_const_none;
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_set_y_obj, displayio_tilegrid_obj_set_y);
|
||||
|
||||
const mp_obj_property_t displayio_tilegrid_y_obj = {
|
||||
.base.type = &mp_type_property,
|
||||
.proxy = {(mp_obj_t)&displayio_tilegrid_get_y_obj,
|
||||
(mp_obj_t)&displayio_tilegrid_set_y_obj,
|
||||
(mp_obj_t)&mp_const_none_obj},
|
||||
};
|
||||
|
||||
@ -185,13 +194,13 @@ const mp_obj_property_t displayio_tilegrid_position_obj = {
|
||||
//| The pixel shader of the tilegrid.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_get_pixel_shader(mp_obj_t self_in) {
|
||||
displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
displayio_tilegrid_t *self = native_tilegrid(self_in);
|
||||
return common_hal_displayio_tilegrid_get_pixel_shader(self);
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_pixel_shader_obj, displayio_tilegrid_obj_get_pixel_shader);
|
||||
|
||||
STATIC mp_obj_t displayio_tilegrid_obj_set_pixel_shader(mp_obj_t self_in, mp_obj_t pixel_shader) {
|
||||
displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
displayio_tilegrid_t *self = native_tilegrid(self_in);
|
||||
if (!MP_OBJ_IS_TYPE(pixel_shader, &displayio_palette_type) && !MP_OBJ_IS_TYPE(pixel_shader, &displayio_colorconverter_type)) {
|
||||
mp_raise_TypeError(translate("pixel_shader must be displayio.Palette or displayio.ColorConverter"));
|
||||
}
|
||||
@ -209,9 +218,72 @@ const mp_obj_property_t displayio_tilegrid_pixel_shader_obj = {
|
||||
(mp_obj_t)&mp_const_none_obj},
|
||||
};
|
||||
|
||||
//| .. method:: __getitem__(index)
|
||||
//|
|
||||
//| Returns the tile index at the given index. The index can either be an x,y tuple or an int equal
|
||||
//| to ``y * width + x``.
|
||||
//|
|
||||
//| This allows you to::
|
||||
//|
|
||||
//| print(grid[0])
|
||||
//|
|
||||
//| .. method:: __setitem__(index, tile_index)
|
||||
//|
|
||||
//| Sets the tile index at the given index. The index can either be an x,y tuple or an int equal
|
||||
//| to ``y * width + x``.
|
||||
//|
|
||||
//| This allows you to::
|
||||
//|
|
||||
//| grid[0] = 10
|
||||
//|
|
||||
//| or::
|
||||
//|
|
||||
//| grid[0,0] = 10
|
||||
//|
|
||||
STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) {
|
||||
displayio_tilegrid_t *self = native_tilegrid(self_in);
|
||||
|
||||
|
||||
if (MP_OBJ_IS_TYPE(index_obj, &mp_type_slice)) {
|
||||
mp_raise_NotImplementedError(translate("Slices not supported"));
|
||||
} else {
|
||||
uint16_t x = 0;
|
||||
uint16_t y = 0;
|
||||
if (MP_OBJ_IS_SMALL_INT(index_obj)) {
|
||||
mp_int_t i = MP_OBJ_SMALL_INT_VALUE(index_obj);
|
||||
uint16_t width = common_hal_displayio_tilegrid_get_width(self);
|
||||
x = i % width;
|
||||
y = i / width;
|
||||
} else {
|
||||
mp_obj_t* items;
|
||||
mp_obj_get_array_fixed_n(index_obj, 2, &items);
|
||||
x = mp_obj_get_int(items[0]);
|
||||
y = mp_obj_get_int(items[1]);
|
||||
if (x >= common_hal_displayio_tilegrid_get_width(self) || y >= common_hal_displayio_tilegrid_get_height(self)) {
|
||||
mp_raise_IndexError(translate("tile index out of bounds"));
|
||||
}
|
||||
}
|
||||
|
||||
if (value_obj == MP_OBJ_SENTINEL) {
|
||||
// load
|
||||
return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_tile(self, x, y));
|
||||
} else if (value_obj == mp_const_none) {
|
||||
return MP_OBJ_NULL; // op not supported
|
||||
} else {
|
||||
mp_int_t value = mp_obj_get_int(value_obj);
|
||||
if (value < 0 || value > 255) {
|
||||
mp_raise_ValueError(translate("Tile indices must be 0 - 255"));
|
||||
}
|
||||
common_hal_displayio_tilegrid_set_tile(self, x, y, value);
|
||||
}
|
||||
}
|
||||
return mp_const_none;
|
||||
}
|
||||
|
||||
STATIC const mp_rom_map_elem_t displayio_tilegrid_locals_dict_table[] = {
|
||||
// Properties
|
||||
{ MP_ROM_QSTR(MP_QSTR_position), MP_ROM_PTR(&displayio_tilegrid_position_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_x), MP_ROM_PTR(&displayio_tilegrid_x_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_y), MP_ROM_PTR(&displayio_tilegrid_y_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_tilegrid_pixel_shader_obj) },
|
||||
};
|
||||
STATIC MP_DEFINE_CONST_DICT(displayio_tilegrid_locals_dict, displayio_tilegrid_locals_dict_table);
|
||||
@ -220,5 +292,6 @@ const mp_obj_type_t displayio_tilegrid_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_TileGrid,
|
||||
.make_new = displayio_tilegrid_make_new,
|
||||
.subscr = tilegrid_subscr,
|
||||
.locals_dict = (mp_obj_dict_t*)&displayio_tilegrid_locals_dict,
|
||||
};
|
||||
|
||||
@ -35,13 +35,20 @@ void common_hal_displayio_tilegrid_construct(displayio_tilegrid_t *self, mp_obj_
|
||||
uint16_t bitmap_width_in_tiles, mp_obj_t pixel_shader, uint16_t width, uint16_t height,
|
||||
uint16_t tile_width, uint16_t tile_height, uint16_t x, uint16_t y, uint8_t default_tile);
|
||||
|
||||
void common_hal_displayio_tilegrid_get_position(displayio_tilegrid_t *self, int16_t* x, int16_t* y);
|
||||
void common_hal_displayio_tilegrid_set_position(displayio_tilegrid_t *self, int16_t x, int16_t y);
|
||||
|
||||
mp_int_t common_hal_displayio_tilegrid_get_x(displayio_tilegrid_t *self);
|
||||
void common_hal_displayio_tilegrid_set_x(displayio_tilegrid_t *self, mp_int_t x);
|
||||
mp_int_t common_hal_displayio_tilegrid_get_y(displayio_tilegrid_t *self);
|
||||
void common_hal_displayio_tilegrid_set_y(displayio_tilegrid_t *self, mp_int_t y);
|
||||
mp_obj_t common_hal_displayio_tilegrid_get_pixel_shader(displayio_tilegrid_t *self);
|
||||
void common_hal_displayio_tilegrid_set_pixel_shader(displayio_tilegrid_t *self, mp_obj_t pixel_shader);
|
||||
|
||||
void common_hal_displayio_textgrid_set_tile(displayio_tilegrid_t *self, uint16_t x, uint16_t y, uint8_t tile_index);
|
||||
void common_hal_displayio_textgrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y);
|
||||
uint16_t common_hal_displayio_tilegrid_get_width(displayio_tilegrid_t *self);
|
||||
uint16_t common_hal_displayio_tilegrid_get_height(displayio_tilegrid_t *self);
|
||||
|
||||
uint8_t common_hal_displayio_tilegrid_get_tile(displayio_tilegrid_t *self, uint16_t x, uint16_t y);
|
||||
void common_hal_displayio_tilegrid_set_tile(displayio_tilegrid_t *self, uint16_t x, uint16_t y, uint8_t tile_index);
|
||||
|
||||
// Private API for scrolling the TileGrid.
|
||||
void common_hal_displayio_tilegrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y);
|
||||
|
||||
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_TILEGRID_H
|
||||
|
||||
@ -66,14 +66,20 @@ void common_hal_displayio_tilegrid_construct(displayio_tilegrid_t *self, mp_obj_
|
||||
self->y = y;
|
||||
}
|
||||
|
||||
void common_hal_displayio_tilegrid_get_position(displayio_tilegrid_t *self, int16_t* x, int16_t* y) {
|
||||
*x = self->x;
|
||||
*y = self->y;
|
||||
|
||||
mp_int_t common_hal_displayio_tilegrid_get_x(displayio_tilegrid_t *self) {
|
||||
return self->x;
|
||||
}
|
||||
void common_hal_displayio_tilegrid_set_x(displayio_tilegrid_t *self, mp_int_t x) {
|
||||
self->needs_refresh = self->x != x;
|
||||
self->x = x;
|
||||
}
|
||||
mp_int_t common_hal_displayio_tilegrid_get_y(displayio_tilegrid_t *self) {
|
||||
return self->y;
|
||||
}
|
||||
|
||||
void common_hal_displayio_tilegrid_set_position(displayio_tilegrid_t *self, int16_t x, int16_t y) {
|
||||
self->needs_refresh = self->x != x || self->y != y;
|
||||
self->x = x;
|
||||
void common_hal_displayio_tilegrid_set_y(displayio_tilegrid_t *self, mp_int_t y) {
|
||||
self->needs_refresh = self->y != y;
|
||||
self->y = y;
|
||||
}
|
||||
|
||||
@ -86,6 +92,43 @@ void common_hal_displayio_tilegrid_set_pixel_shader(displayio_tilegrid_t *self,
|
||||
self->needs_refresh = true;
|
||||
}
|
||||
|
||||
|
||||
uint16_t common_hal_displayio_tilegrid_get_width(displayio_tilegrid_t *self) {
|
||||
return self->width_in_tiles;
|
||||
}
|
||||
|
||||
uint16_t common_hal_displayio_tilegrid_get_height(displayio_tilegrid_t *self) {
|
||||
return self->height_in_tiles;
|
||||
}
|
||||
|
||||
uint8_t common_hal_displayio_tilegrid_get_tile(displayio_tilegrid_t *self, uint16_t x, uint16_t y) {
|
||||
uint8_t* tiles = self->tiles;
|
||||
if (self->inline_tiles) {
|
||||
tiles = (uint8_t*) &self->tiles;
|
||||
}
|
||||
if (tiles == NULL) {
|
||||
return 0;
|
||||
}
|
||||
return tiles[y * self->width_in_tiles + x];
|
||||
}
|
||||
|
||||
void common_hal_displayio_tilegrid_set_tile(displayio_tilegrid_t *self, uint16_t x, uint16_t y, uint8_t tile_index) {
|
||||
uint8_t* tiles = self->tiles;
|
||||
if (self->inline_tiles) {
|
||||
tiles = (uint8_t*) &self->tiles;
|
||||
}
|
||||
if (tiles == NULL) {
|
||||
return;
|
||||
}
|
||||
tiles[y * self->width_in_tiles + x] = tile_index;
|
||||
self->needs_refresh = true;
|
||||
}
|
||||
|
||||
|
||||
void common_hal_displayio_tilegrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y) {
|
||||
self->top_left_x = x;
|
||||
self->top_left_y = y;
|
||||
}
|
||||
bool displayio_tilegrid_get_pixel(displayio_tilegrid_t *self, int16_t x, int16_t y, uint16_t* pixel) {
|
||||
x -= self->x;
|
||||
y -= self->y;
|
||||
@ -126,24 +169,6 @@ bool displayio_tilegrid_get_pixel(displayio_tilegrid_t *self, int16_t x, int16_t
|
||||
return false;
|
||||
}
|
||||
|
||||
void common_hal_displayio_textgrid_set_tile(displayio_tilegrid_t *self, uint16_t x, uint16_t y, uint8_t tile_index) {
|
||||
uint8_t* tiles = self->tiles;
|
||||
if (self->inline_tiles) {
|
||||
tiles = (uint8_t*) &self->tiles;
|
||||
}
|
||||
if (tiles == NULL) {
|
||||
return;
|
||||
}
|
||||
tiles[y * self->width_in_tiles + x] = tile_index;
|
||||
self->needs_refresh = true;
|
||||
}
|
||||
|
||||
|
||||
void common_hal_displayio_textgrid_set_top_left(displayio_tilegrid_t *self, uint16_t x, uint16_t y) {
|
||||
self->top_left_x = x;
|
||||
self->top_left_y = y;
|
||||
}
|
||||
|
||||
bool displayio_tilegrid_needs_refresh(displayio_tilegrid_t *self) {
|
||||
return self->needs_refresh || displayio_palette_needs_refresh(self->pixel_shader);
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
|
||||
if (c < 128) {
|
||||
if (c >= 0x20 && c <= 0x7e) {
|
||||
uint8_t tile_index = displayio_builtinfont_get_glyph_index(self->font, c);
|
||||
common_hal_displayio_textgrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index);
|
||||
common_hal_displayio_tilegrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index);
|
||||
self->cursor_x++;
|
||||
} else if (c == '\r') {
|
||||
self->cursor_x = 0;
|
||||
@ -64,7 +64,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
|
||||
if (i[1] == 'K') {
|
||||
// Clear the rest of the line.
|
||||
for (uint16_t j = self->cursor_x; j < self->tilegrid->width_in_tiles; j++) {
|
||||
common_hal_displayio_textgrid_set_tile(self->tilegrid, j, self->cursor_y, 0);
|
||||
common_hal_displayio_tilegrid_set_tile(self->tilegrid, j, self->cursor_y, 0);
|
||||
}
|
||||
i += 2;
|
||||
} else {
|
||||
@ -94,7 +94,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
|
||||
} else {
|
||||
uint8_t tile_index = displayio_builtinfont_get_glyph_index(self->font, c);
|
||||
if (tile_index != 0xff) {
|
||||
common_hal_displayio_textgrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index);
|
||||
common_hal_displayio_tilegrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index);
|
||||
self->cursor_x++;
|
||||
|
||||
}
|
||||
@ -109,10 +109,10 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
|
||||
if (self->cursor_y != start_y) {
|
||||
// clear the new row
|
||||
for (uint16_t j = 0; j < self->tilegrid->width_in_tiles; j++) {
|
||||
common_hal_displayio_textgrid_set_tile(self->tilegrid, j, self->cursor_y, 0);
|
||||
common_hal_displayio_tilegrid_set_tile(self->tilegrid, j, self->cursor_y, 0);
|
||||
start_y = self->cursor_y;
|
||||
}
|
||||
common_hal_displayio_textgrid_set_top_left(self->tilegrid, 0, (start_y + self->tilegrid->height_in_tiles + 1) % self->tilegrid->height_in_tiles);
|
||||
common_hal_displayio_tilegrid_set_top_left(self->tilegrid, 0, (start_y + self->tilegrid->height_in_tiles + 1) % self->tilegrid->height_in_tiles);
|
||||
}
|
||||
}
|
||||
return i - data;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user