ctdo
/
borgware-2d
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved spiral(...) and random_bright(...) for non-square displays

This commit is contained in:
Christian Kroll 2014-05-17 22:20:52 +02:00
parent 8a3ecd882e
commit 020efc3fd1
1 changed files with 32 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/animations/program.c
View File

@ -47,45 +47,32 @@ void test_palette2(){
#ifdef ANIMATION_SPIRAL #ifdef ANIMATION_SPIRAL
static void walk(cursor_t* cur, unsigned char steps, int delay){ void spiral(int delay) {
unsigned char x; clear_screen(0);
for(x=steps;x--;){ static signed char const PROGMEM delta[5] = { 0, -1, 0, 1, 0 };
set_cursor(cur, next_pixel(cur->pos, cur->dir)); unsigned char length[2] = { NUM_ROWS, NUM_COLS - 1 };
unsigned char x = NUM_COLS - 1, y = NUM_ROWS, i = 0;
while (length[i & 0x01]) {
for (unsigned char j = 0; j < length[i & 0x01]; ++j) {
x += pgm_read_byte(&delta[i]);
y += pgm_read_byte(&delta[i + 1]);
setpixel((pixel){x, y}, NUMPLANE);
wait(delay); wait(delay);
} }
} length[i++ & 0x01]--;
i %= 4;
void spiral(int delay){
clear_screen(0);
cursor_t cur;
cur.dir = right;
cur.mode = set;
set_cursor (&cur, (pixel){NUM_COLS-1,0});
unsigned char clearbit=0;
while(clearbit == 0){
clearbit = 1;
while (!get_next_pixel(cur.pos, cur.dir)){
clearbit = 0;
walk(&cur, 1, delay);
} }
cur.dir = direction_r(cur.dir); i = (i + 2u) % 4u;
} while (length[0] <= NUM_ROWS && length[1] < NUM_COLS) {
for (unsigned char j = 0; j < length[i & 0x01]; ++j) {
cur.mode = clear; setpixel((pixel){x, y}, 0);
set_cursor(&cur, (pixel){(NUM_COLS/2)-1,(NUM_ROWS/2)-1}); x += pgm_read_byte(&delta[i]);
y += pgm_read_byte(&delta[i + 1]);
for(clearbit=0;clearbit==0;){ wait(delay);
if( get_next_pixel(cur.pos, direction_r(cur.dir)) ){
cur.dir = direction_r(cur.dir);
}
if( get_next_pixel(cur.pos, cur.dir) == 1 ){
walk(&cur , 1, delay);
}else{
clearbit = 1;
} }
length[(i += 3) & 0x01]++;
i %= 4;
} }
} }
#endif #endif
@ -179,16 +166,17 @@ void fire()
* void random_bright(void) * void random_bright(void)
* by Daniel Otte * by Daniel Otte
*/ */
void random_bright(unsigned cycles){ void random_bright(unsigned int cycles) {
uint8_t t,x,y; while (cycles--) {
while(cycles--){ for (unsigned char p = NUMPLANE; p--;) {
for(y=0; y<NUM_ROWS; ++y) for (unsigned char y = NUM_ROWS; y--;) {
for(x=0; x<NUM_COLS/4; ++x){ for (unsigned char x = LINEBYTES; x--;) {
t=random8(); if (p < (NUMPLANE - 1)) {
setpixel((pixel){x*4+0, y}, 0x3&(t>>0)); pixmap[p][y][x] |= pixmap[p - 1][y][x];
setpixel((pixel){x*4+1, y}, 0x3&(t>>2)); }
setpixel((pixel){x*4+2, y}, 0x3&(t>>4)); pixmap[p][y][x] = random8();
setpixel((pixel){x*4+3, y}, 0x3&(t>>6)); }
}
} }
wait(200); wait(200);
} }