switched to a generic pixmap based renderer
This commit is contained in:
parent
f703054e93
commit
750c09734f
|
@ -6,21 +6,36 @@
|
||||||
#include "../autoconf.h"
|
#include "../autoconf.h"
|
||||||
#include "../pixel.h"
|
#include "../pixel.h"
|
||||||
|
|
||||||
#define PRB(a) pgm_read_byte(&(a))
|
#define PB(a) pgm_read_byte(&(a))
|
||||||
|
|
||||||
#define BITMAP_WIDTH 48
|
#define BITMAP_WIDTH 48
|
||||||
#define BITMAP_HEIGHT 48
|
#define BITMAP_HEIGHT 48
|
||||||
#define VIEWPORT_WIDTH 16
|
|
||||||
#define VIEWPORT_HEIGHT 16
|
#if NUM_COLS > BITMAP_WIDTH
|
||||||
|
#define VIEWPORT_WIDTH BITMAP_WIDTH
|
||||||
|
#else
|
||||||
|
#define VIEWPORT_WIDTH NUM_COLS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if NUM_ROWS > BITMAP_HEIGHT
|
||||||
|
#define VIEWPORT_HEIGHT BITMAP_HEIGHT
|
||||||
|
#else
|
||||||
|
#define VIEWPORT_HEIGHT NUM_ROWS
|
||||||
|
#endif
|
||||||
|
|
||||||
#define XDOMAIN (BITMAP_WIDTH - VIEWPORT_WIDTH)
|
#define XDOMAIN (BITMAP_WIDTH - VIEWPORT_WIDTH)
|
||||||
#define YDOMAIN (BITMAP_HEIGHT - VIEWPORT_HEIGHT)
|
#define YDOMAIN (BITMAP_HEIGHT - VIEWPORT_HEIGHT)
|
||||||
|
|
||||||
|
#define CHUNKDOMAIN (BITMAP_WIDTH - 8)
|
||||||
|
#define CHUNKCOUNT (((VIEWPORT_WIDTH - 1) / 8) + 1)
|
||||||
|
|
||||||
#define FRAME_TICK 75
|
#define FRAME_TICK 75
|
||||||
#define FRAMECOUNT 400
|
#define FRAMECOUNT 400
|
||||||
|
|
||||||
static uint16_t laborlogo_getLine(const uint8_t x,
|
|
||||||
const uint8_t y)
|
static uint8_t laborlogo_getChunk(const uint8_t x, const uint8_t y)
|
||||||
{
|
{
|
||||||
assert(x <= BITMAP_WIDTH - VIEWPORT_WIDTH);
|
assert(x <= CHUNKDOMAIN);
|
||||||
assert(y < BITMAP_HEIGHT);
|
assert(y < BITMAP_HEIGHT);
|
||||||
|
|
||||||
static const uint8_t nBitmap[48][6] PROGMEM =
|
static const uint8_t nBitmap[48][6] PROGMEM =
|
||||||
|
@ -73,22 +88,20 @@ static uint16_t laborlogo_getLine(const uint8_t x,
|
||||||
{0xFF, 0xFF, 0x00, 0xF8, 0xFF, 0xFF},
|
{0xFF, 0xFF, 0x00, 0xF8, 0xFF, 0xFF},
|
||||||
{0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF}};
|
{0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF}};
|
||||||
|
|
||||||
uint16_t nLine;
|
uint8_t nChunk;
|
||||||
uint8_t nAlignment = x % 8;
|
uint8_t nAlignment = x % 8;
|
||||||
|
|
||||||
if (nAlignment == 0)
|
if (nAlignment == 0)
|
||||||
{
|
{
|
||||||
nLine = PRB(nBitmap[y][x / 8]) << 8;
|
nChunk = PB(nBitmap[y][x / 8]);
|
||||||
nLine |= PRB((nBitmap[y][x / 8 + 1]));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
nLine = PRB(nBitmap[y][x / 8]) << (8 + nAlignment);
|
nChunk = PB(nBitmap[y][x / 8]) << nAlignment;
|
||||||
nLine |= PRB(nBitmap[y][x / 8 + 1]) << nAlignment;
|
nChunk |= PB(nBitmap[y][x / 8 + 1]) >> (8 - nAlignment);
|
||||||
nLine |= PRB(nBitmap[y][x / 8 + 2]) >> (8 - nAlignment);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nLine;
|
return nChunk;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -98,24 +111,27 @@ static void laborlogo_drawViewport(const uint8_t nBitmapX,
|
||||||
assert(nBitmapX <= XDOMAIN);
|
assert(nBitmapX <= XDOMAIN);
|
||||||
assert(nBitmapY <= YDOMAIN);
|
assert(nBitmapY <= YDOMAIN);
|
||||||
|
|
||||||
for (uint8_t nVPortY = 0; nVPortY < 16; ++nVPortY)
|
for (int8_t y = 0; y < VIEWPORT_HEIGHT; ++y)
|
||||||
{
|
{
|
||||||
uint16_t nLineBuffer = laborlogo_getLine(nBitmapX, nVPortY + nBitmapY);
|
for (int8_t x = VIEWPORT_WIDTH; x > 0; x -= 8)
|
||||||
for (int8_t nVPortX = 0; nVPortX < 16; ++nVPortX)
|
|
||||||
{
|
{
|
||||||
if ((0x0001 << nVPortX) & nLineBuffer)
|
uint8_t nChunk;
|
||||||
|
if ((nBitmapX + x - 8) >= 0)
|
||||||
{
|
{
|
||||||
setpixel((pixel){nVPortX, nVPortY}, 3);
|
nChunk = laborlogo_getChunk(nBitmapX + x - 8, nBitmapY + y);
|
||||||
|
pixmap[2][y][CHUNKCOUNT - 1 - ((x - 1) / 8)] = nChunk;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
setpixel((pixel){nVPortX, nVPortY}, 0);
|
nChunk = laborlogo_getChunk(nBitmapX, nBitmapY + y) >> (8 - x);
|
||||||
|
pixmap[2][y][CHUNKCOUNT - 1] = nChunk;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void laborlogo_recalcVectors(const int8_t x,
|
|
||||||
|
static void laborlogo_recalcVector(const int8_t x,
|
||||||
const int8_t y,
|
const int8_t y,
|
||||||
int8_t *const pdx,
|
int8_t *const pdx,
|
||||||
int8_t *const pdy)
|
int8_t *const pdy)
|
||||||
|
@ -135,20 +151,29 @@ static void laborlogo_recalcVectors(const int8_t x,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void laborlogo()
|
void laborlogo()
|
||||||
{
|
{
|
||||||
uint16_t nCycles = FRAMECOUNT;
|
|
||||||
int8_t x = random8() % (XDOMAIN + 1);
|
int8_t x = random8() % (XDOMAIN + 1);
|
||||||
int8_t y = random8() % (YDOMAIN + 1);
|
int8_t y = random8() % (YDOMAIN + 1);
|
||||||
int8_t dx = 0;
|
int8_t dx = 0;
|
||||||
int8_t dy = 0;
|
int8_t dy = 0;
|
||||||
|
|
||||||
while (nCycles-- != 0)
|
clear_screen(0);
|
||||||
|
|
||||||
|
for (uint16_t nCycles = FRAMECOUNT; nCycles > 0; --nCycles)
|
||||||
{
|
{
|
||||||
laborlogo_drawViewport(x ,y);
|
laborlogo_drawViewport(x, y);
|
||||||
laborlogo_recalcVectors(x, y, &dx, &dy);
|
laborlogo_recalcVector(x, y, &dx, &dy);
|
||||||
|
|
||||||
|
#if BITMAP_WIDTH > VIEWPORT_WIDTH
|
||||||
x += dx;
|
x += dx;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if BITMAP_HEIGHT > VIEWPORT_HEIGHT
|
||||||
y += dy;
|
y += dy;
|
||||||
|
#endif
|
||||||
|
|
||||||
wait(FRAME_TICK);
|
wait(FRAME_TICK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue