mirror
/
pimoroni-pico
kopia lustrzana https://github.com/pimoroni/pimoroni-pico
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

PicoGraphics: Add layer support to PicoVector tile renderer.

pull/1064/head
Phil Howard 2024-10-08 12:35:55 +01:00
rodzic daa6603d1b
commit 086b9d0135
2 zmienionych plików z 33 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
libraries/pico_graphics/pico_graphics_pen_rgb332.cpp
Wyświetl plik

@ -99,7 +99,7 @@ namespace pimoroni {
// Treat our void* frame_buffer as uint8_t
uint8_t *src = (uint8_t *)frame_buffer;
if(this->layers > 1) {
if(this->layers > 1) {
// The size of a single layer
uint offset = this->bounds.w * this->bounds.h;
@ -148,14 +148,23 @@ namespace pimoroni {
bool PicoGraphics_PenRGB332::render_tile(const Tile *tile) {
for(int y = 0; y < tile->h; y++) {
uint8_t *palpha = &tile->data[(y * tile->stride)];
uint8_t *pdest = &((uint8_t *)frame_buffer)[tile->x + ((tile->y + y) * bounds.w)];
uint8_t *p_dest = &((uint8_t *)frame_buffer)[tile->x + ((tile->y + y) * bounds.w)];
p_dest += this->layer_offset;
uint8_t *p_layer0 = &((uint8_t *)frame_buffer)[tile->x + ((tile->y + y) * bounds.w)];
for(int x = 0; x < tile->w; x++) {
uint8_t alpha = *palpha;
uint8_t dest = *pdest;
uint8_t dest = *p_dest;
if(dest == 0) {
dest = *p_layer0;
}
// TODO: Try to alpha blend RGB332... somewhat?
if(alpha == 255) {
*pdest = color;
*p_dest = color;
}else if(alpha == 0) {
}else{
// blend tha pixel
@ -172,10 +181,10 @@ namespace pimoroni {
uint8_t b = ((sb * alpha) + (db * (255 - alpha))) >> 8;
// recombine the channels
*pdest = (r << 5) | (g << 2) | (b);
*p_dest = (r << 5) | (g << 2) | (b);
}
pdest++;
p_dest++;
palpha++;
}
}

26
libraries/pico_graphics/pico_graphics_pen_rgb565.cpp
Wyświetl plik

@ -66,6 +66,7 @@ namespace pimoroni {
if(!bounds.contains(p)) return;
uint16_t *buf = (uint16_t *)frame_buffer;
buf += this->layer_offset;
RGB565 blended = RGB(buf[p.y * bounds.w + p.x]).blend(RGB(color), a).to_rgb565();
@ -96,14 +97,22 @@ namespace pimoroni {
bool PicoGraphics_PenRGB565::render_tile(const Tile *tile) {
for(int y = 0; y < tile->h; y++) {
uint8_t *palpha = &tile->data[(y * tile->stride)];
uint16_t *pdest = &((uint16_t *)frame_buffer)[tile->x + ((tile->y + y) * bounds.w)];
uint8_t *p_alpha = &tile->data[(y * tile->stride)];
uint16_t *p_dest = &((uint16_t *)frame_buffer)[tile->x + ((tile->y + y) * bounds.w)];
p_dest += this->layer_offset;
uint16_t *p_layer0 = &((uint16_t *)frame_buffer)[tile->x + ((tile->y + y) * bounds.w)];
for(int x = 0; x < tile->w; x++) {
uint16_t dest = *pdest;
uint8_t alpha = *palpha;
uint16_t dest = *p_dest;
if(dest == 0) {
dest = *p_layer0;
}
uint8_t alpha = *p_alpha;
if(alpha == 255) {
*pdest = color;
*p_dest = color;
}else if(alpha == 0) {
}else{
// blend tha pixel
@ -120,11 +129,12 @@ namespace pimoroni {
uint8_t b = ((sb * alpha) + (db * (255 - alpha))) >> 8;
// recombine the channels
*pdest = __builtin_bswap16((r << 11) | (g << 5) | (b));
*p_dest = __builtin_bswap16((r << 11) | (g << 5) | (b));
}
pdest++;
palpha++;
p_layer0++;
p_dest++;
p_alpha++;
}
}