Skip to content
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

drawBitmap fixes (-8 bytes) #110

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

drawBitmap fixes (-8 bytes) #110

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f92e520
clean up data types
joshgoebel Feb 24, 2016
6b01001
fix render bug if bitmaps starts offscreen
joshgoebel Feb 24, 2016
0c5a6d9
simplify logic with a guard clause
joshgoebel Feb 24, 2016
2947d13
pull in the indent
joshgoebel Feb 24, 2016
261c0cb
remove unnecessary conditional
joshgoebel Feb 24, 2016
e7fca4b
clean up if statements to shorten lines
joshgoebel Feb 24, 2016
bee0271
simplify with another guard
joshgoebel Feb 24, 2016
dece7eb
simplify some math
joshgoebel Feb 24, 2016
956ef63
simplify code
joshgoebel Feb 24, 2016
855d995
micro optimizations
joshgoebel Feb 24, 2016
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
79 changes: 50 additions & 29 deletions src/Arduboy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ uint8_t Arduboy::getPixel(uint8_t x, uint8_t y)
{
uint8_t row = y / 8;
uint8_t bit_position = y % 8;
return (sBuffer[(row*WIDTH) + x] & _BV(bit_position)) >> bit_position;
return (sBuffer[(row*WIDTH) + x] & _BV(bit_position)) ? 1 : 0;
}

void Arduboy::drawCircle(int16_t x0, int16_t y0, uint8_t r, uint8_t color)
Expand Down Expand Up @@ -375,8 +375,10 @@ void Arduboy::drawRect
void Arduboy::drawFastVLine
(int16_t x, int16_t y, uint8_t h, uint8_t color)
{
int end = y+h;
for (int a = max(0,y); a < min(end,HEIGHT); a++)
uint8_t y2 = min(y+h,HEIGHT);

// 16 bit because that's what drawPixel needs and it compiles smaller
for (uint16_t a = max(0,y); a < y2; a++)
{
drawPixel(x,a,color);
}
Expand All @@ -385,8 +387,9 @@ void Arduboy::drawFastVLine
void Arduboy::drawFastHLine
(int16_t x, int16_t y, uint8_t w, uint8_t color)
{
int end = x+w;
for (int a = max(0,x); a < min(end,WIDTH); a++)
uint8_t x2 = min(x+w,WIDTH);
// 16 bit because that's what drawPixel needs and it compiles smaller
for (uint16_t a = max(0,x); a < x2; a++)
{
drawPixel(a,y,color);
}
Expand All @@ -396,7 +399,9 @@ void Arduboy::fillRect
(int16_t x, int16_t y, uint8_t w, uint8_t h, uint8_t color)
{
// stupidest version - update in subclasses if desired!
for (int16_t i=x; i<x+w; i++)
uint8_t x2 = min(x+w,WIDTH);
// 16 bit because that's what drawFastVLine needs and it compiles smaller
for (uint16_t i = max(0,x); i<x2; i++)
{
drawFastVLine(i, y, h, color);
}
Expand Down Expand Up @@ -581,35 +586,51 @@ void Arduboy::drawBitmap
(int16_t x, int16_t y, const uint8_t *bitmap, uint8_t w, uint8_t h,
uint8_t color)
{
// no need to dar at all of we're offscreen
// no need to draw at all of we're completely offscreen
if (x+w < 0 || x > WIDTH-1 || y+h < 0 || y > HEIGHT-1)
return;

int yOffset = abs(y) % 8;
int sRow = y / 8;
if (y < 0) {
int8_t yOffset = abs(y) % 8;
int8_t sRow = y / 8;

if (y < 0 && yOffset) {
sRow--;
yOffset = 8 - yOffset;
}
int rows = h/8;
if (h%8!=0) rows++;
for (int a = 0; a < rows; a++) {
int bRow = sRow + a;
if (bRow > (HEIGHT/8)-1) break;
if (bRow > -2) {
for (int iCol = 0; iCol<w; iCol++) {
if (iCol + x > (WIDTH-1)) break;
if (iCol + x >= 0) {
if (bRow >= 0) {
if (color == WHITE) this->sBuffer[ (bRow*WIDTH) + x + iCol ] |= pgm_read_byte(bitmap+(a*w)+iCol) << yOffset;
else if (color == BLACK) this->sBuffer[ (bRow*WIDTH) + x + iCol ] &= ~(pgm_read_byte(bitmap+(a*w)+iCol) << yOffset);
else this->sBuffer[ (bRow*WIDTH) + x + iCol ] ^= pgm_read_byte(bitmap+(a*w)+iCol) << yOffset;
}
if (yOffset && bRow<(HEIGHT/8)-1 && bRow > -2) {
if (color == WHITE) this->sBuffer[ ((bRow+1)*WIDTH) + x + iCol ] |= pgm_read_byte(bitmap+(a*w)+iCol) >> (8-yOffset);
else if (color == BLACK) this->sBuffer[ ((bRow+1)*WIDTH) + x + iCol ] &= ~(pgm_read_byte(bitmap+(a*w)+iCol) >> (8-yOffset));
else this->sBuffer[ ((bRow+1)*WIDTH) + x + iCol ] ^= pgm_read_byte(bitmap+(a*w)+iCol) >> (8-yOffset);
}

int8_t rows = (h+7)/8; // round up

for (uint8_t a = 0; a < rows; a++) {
int8_t bRow = sRow + a;
if (bRow > (HEIGHT/8)-1) { break; }
if (bRow < -1) { break; }

for (uint8_t iCol = 0; iCol<w; iCol++) {
if (iCol + x > (WIDTH-1)) { break; }
if (iCol + x < 0) { break; }

if (bRow >= 0) {
if (color == WHITE) {
this->sBuffer[ (bRow*WIDTH) + x + iCol ] |=
pgm_read_byte(bitmap+(a*w)+iCol) << yOffset;
} else if (color == BLACK) {
this->sBuffer[ (bRow*WIDTH) + x + iCol ] &=
~(pgm_read_byte(bitmap+(a*w)+iCol) << yOffset);
} else {
this->sBuffer[ (bRow*WIDTH) + x + iCol ] ^=
pgm_read_byte(bitmap+(a*w)+iCol) << yOffset;
}
}
if (yOffset && bRow<(HEIGHT/8)-1) {
if (color == WHITE) {
this->sBuffer[ ((bRow+1)*WIDTH) + x + iCol ] |=
pgm_read_byte(bitmap+(a*w)+iCol) >> (8-yOffset);
} else if (color == BLACK) {
this->sBuffer[ ((bRow+1)*WIDTH) + x + iCol ] &=
~(pgm_read_byte(bitmap+(a*w)+iCol) >> (8-yOffset));
} else {
this->sBuffer[ ((bRow+1)*WIDTH) + x + iCol ] ^=
pgm_read_byte(bitmap+(a*w)+iCol) >> (8-yOffset);
}
}
}
Expand Down