Skip to content

Sprite pushImage support for 8-bit sprites and transparency from PROGMEM #3794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elatorre20 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sprite pushImage support for 8-bit sprites and transparency from PROGMEM #3794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 73 additions & 0 deletions Extensions/Sprite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,6 +1244,79 @@ void TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const u
#endif // if ESP32 check
}

/***************************************************************************************
** Function name: pushImage
** Description: push 8-bit colour FLASH (PROGMEM) image into a defined area
***************************************************************************************/
void TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8_t *data, uint16_t transparent)
{
#ifdef ESP32
pushImage(x, y, w, h, (uint16_t*) data);
#else
// Partitioned memory FLASH processor
if (data == nullptr || !_created) return;

PI_CLIP;

if (_bpp == 16) // Plot an 8 bpp image into a 16 bpp Sprite
{
uint8_t msbColor = 0;
uint8_t lsbColor = 0;
uint8_t blue[] = {0, 11, 21, 31}; // blue 2 to 5-bit colour lookup table
uint16_t color16 = 0;
for (int32_t yp = dy; yp < dy + dh; yp++)
{
int32_t ox = x;
for (int32_t xp = dx; xp < dx + dw; xp++)
{
uint8_t color = pgm_read_byte(data + xp + yp * w);
//convert to 16-bit color
// =====Green===== ===============Red==============
msbColor = (color & 0x1C)>>2 | (color & 0xC0)>>3 | (color & 0xE0);
// =====Green===== =======Blue======
lsbColor = (color & 0x1C)<<3 | blue[color & 0x03];
color16 = ((uint16_t)msbColor << 8) | lsbColor;
_img[ox + y * _iwidth] = color16;
ox++;
}
y++;
}
}

else if (_bpp == 8) // Plot an 8 bpp image into a 8 bpp Sprite
{
for (int32_t yp = dy; yp < dy + dh; yp++)
{
int32_t ox = x;
for (int32_t xp = dx; xp < dx + dw; xp++)
{
uint8_t color = pgm_read_byte(data + xp + yp * w);
if(transparent == 0xFFFF || color != transparent){
_img8[ox + y * _iwidth] = color;
}
ox++;
}
y++;
}
}

else if (_bpp == 4)
{
#ifdef TFT_eSPI_DEBUG
Serial.println("TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8_t *data) not implemented");
#endif
return;
}

else
{
#ifdef TFT_eSPI_DEBUG
Serial.println("TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const uint8_t *data) not implemented");
#endif
return;
}
#endif // if ESP32 check
}

/***************************************************************************************
** Function name: setWindow
Expand Down
1 change: 1 addition & 0 deletions Extensions/Sprite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ class TFT_eSprite : public TFT_eSPI {
// Write an image (colour bitmap) to the sprite.
void pushImage(int32_t x0, int32_t y0, int32_t w, int32_t h, uint16_t *data, uint8_t sbpp = 0);
void pushImage(int32_t x0, int32_t y0, int32_t w, int32_t h, const uint16_t *data);
void pushImage(int32_t x0, int32_t y0, int32_t w, int32_t h, const uint8_t *data, uint16_t transparent = 0xFFFF);

// Push the sprite to the TFT screen, this fn calls pushImage() in the TFT class.
// Optionally a "transparent" colour can be defined, pixels of that colour will not be rendered
Expand Down