streamlined M. Herweg's animations: now using Bresenham's line algorithm, removed obvious bugs, added some comments, saving 232 bytes
This commit is contained in:
Christian Kroll
parent
b39da5ff5e
commit
1a3239be1d
|
|
@ -5,186 +5,186 @@
|
||||||
#include "../util.h"
|
#include "../util.h"
|
||||||
|
|
||||||
|
|
||||||
#define RANDOM8(x) random8(x)
|
/*
|
||||||
|
* The following animations were developed by Martin Herweg (hence the name)
|
||||||
|
* as a personal aid for getting familiar with programming the Borg.
|
||||||
|
*
|
||||||
|
* Although these animations are rarely used among Borg owner's, we left them in
|
||||||
|
* because of their simplicity in hopes that a novice Borg developer may find
|
||||||
|
* them useful.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
// macro for simplifying flash memory access
|
||||||
#define PGM(x) pgm_read_byte(&(x))
|
#define PGM(x) pgm_read_byte(&(x))
|
||||||
|
|
||||||
|
|
||||||
// straight or non straight line from one point to the other
|
// use 8 bit operands where feasible
|
||||||
// value=brightness
|
#if NUM_ROWS < 127 && NUM_COLS < 127
|
||||||
static void line(pixel p1, pixel p2, unsigned char value)
|
typedef signed char operand_t;
|
||||||
{
|
#else
|
||||||
char dx, dy, stepx, stepy, fraction;
|
typedef int operand_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
dy = p2.y - p1.y;
|
|
||||||
dx = p2.x - p1.x;
|
|
||||||
|
|
||||||
if (dy < 0)
|
/**
|
||||||
|
* An implementation of Bresenham's line drawing algorithm.
|
||||||
|
* @param p1 first coordinate of the line
|
||||||
|
* @param p2 second coordinate of the line
|
||||||
|
* @param color brightness level of the line
|
||||||
|
*/
|
||||||
|
static void line(pixel p1,
|
||||||
|
pixel const p2,
|
||||||
|
unsigned char const color)
|
||||||
{
|
{
|
||||||
dy = -dy;
|
operand_t const dx = p1.x < p2.x ? p2.x - p1.x : p1.x - p2.x;
|
||||||
stepy = -1;
|
operand_t const sx = p1.x < p2.x ? 1 : -1;
|
||||||
}
|
operand_t const dy = p1.y < p2.y ? p2.y - p1.y : p1.y - p2.y;
|
||||||
else
|
operand_t const sy = p1.y < p2.y ? 1 : -1;
|
||||||
{
|
operand_t error = dx - dy;
|
||||||
stepy = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dx < 0)
|
while(1)
|
||||||
{
|
{
|
||||||
dx = -dx;
|
setpixel(p1, color);
|
||||||
stepx = -1;
|
if ((p1.x == p2.x) && (p1.y == p2.y))
|
||||||
|
break;
|
||||||
|
operand_t const error2 = 2 * error;
|
||||||
|
if (error2 > -dy)
|
||||||
|
{
|
||||||
|
error -= dy;
|
||||||
|
p1.x += sx;
|
||||||
}
|
}
|
||||||
else
|
if (error2 < dx)
|
||||||
{
|
{
|
||||||
stepx = 1;
|
error += dx;
|
||||||
}
|
p1.y += sy;
|
||||||
|
|
||||||
dx <<= 1;
|
|
||||||
dy <<= 1;
|
|
||||||
|
|
||||||
setpixel(p1, value);
|
|
||||||
if (dx > dy)
|
|
||||||
{
|
|
||||||
fraction = dy - (dx >> 1);
|
|
||||||
while (p1.x != p2.x)
|
|
||||||
{
|
|
||||||
if (fraction >= 0)
|
|
||||||
{
|
|
||||||
p1.y += stepy;
|
|
||||||
fraction -= dx;
|
|
||||||
}
|
|
||||||
p1.x += stepx;
|
|
||||||
fraction += dy;
|
|
||||||
setpixel(p1, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fraction = dx - (dy >> 1);
|
|
||||||
while (p1.y != p2.y)
|
|
||||||
{
|
|
||||||
if (fraction >= 0)
|
|
||||||
{
|
|
||||||
p1.x += stepx;
|
|
||||||
fraction -= dy;
|
|
||||||
}
|
|
||||||
p1.y += stepy;
|
|
||||||
fraction += dx;
|
|
||||||
setpixel(p1, value);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// filled_rectangle p1=upper right corner, w=width, h=height ,
|
/**
|
||||||
// value=brightness
|
* Draws a rectangle at the given coordinates.
|
||||||
static void filled_rectangle(pixel p1,
|
* @param p coordinate of the rectangle's upper right corner
|
||||||
unsigned char w,
|
* @param w width of the rectangle
|
||||||
unsigned char h,
|
* @param h height of the rectangle
|
||||||
unsigned char value)
|
* @param color brightness level of the rectangle
|
||||||
|
*/
|
||||||
|
static void filled_rectangle(pixel p,
|
||||||
|
unsigned char const w,
|
||||||
|
unsigned char const h,
|
||||||
|
unsigned char const color)
|
||||||
{
|
{
|
||||||
unsigned char y;
|
// emulate the rectangle via consecutive drawn lines
|
||||||
for (y = p1.y; y < (p1.y + h); y++)
|
for (unsigned char y = p.y; y < (p.y + h); ++y)
|
||||||
{
|
{
|
||||||
line((pixel){p1.x,y}, (pixel){(p1.x+w-1),y}, value);
|
line((pixel){p.x, y}, (pixel){p.x + w - 1, y}, color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void checkbox()
|
/**
|
||||||
|
* Draws a checkbox like figure.
|
||||||
|
*/
|
||||||
|
static void checkbox()
|
||||||
{
|
{
|
||||||
unsigned char x, delay = 250;
|
// some parameters regarding appearance and timing
|
||||||
|
unsigned char const color = NUMPLANE; // brightest color
|
||||||
|
int const delay = 250, shiftdelay = 30;
|
||||||
|
|
||||||
// quadrat aus linien
|
// draw a surrounding square
|
||||||
line((pixel){0, 0}, (pixel){7, 0}, 3);
|
static pixel const square[] = {{0, 0}, {7, 0}, {7, 7}, {0, 7}, {0, 0}};
|
||||||
wait (delay);
|
for (unsigned char i = 0; i < 4; ++i)
|
||||||
line ((pixel){7, 0}, (pixel){7, 7}, 3);
|
{
|
||||||
wait (delay);
|
line(square[i], square[i + 1], color);
|
||||||
line ((pixel){7, 7}, (pixel){0, 7}, 3);
|
|
||||||
wait (delay);
|
|
||||||
line ((pixel){0, 7}, (pixel){0, 0}, 3);
|
|
||||||
wait(delay);
|
wait(delay);
|
||||||
|
}
|
||||||
|
|
||||||
// 2 diagonale lininen
|
// draw two diagonal lines
|
||||||
line ((pixel){7, 7}, (pixel){0, 0}, 3);
|
line ((pixel){7, 7}, (pixel){0, 0}, color);
|
||||||
wait (delay);
|
wait (delay);
|
||||||
line ((pixel){0, 7}, (pixel){7, 0}, 3);
|
line ((pixel){0, 7}, (pixel){7, 0}, color);
|
||||||
wait (delay * 3);
|
wait (delay * 3);
|
||||||
|
|
||||||
for (x = NUM_COLS; x--;)
|
// shift image to the right (shift_pximap_l() really shifts to right)
|
||||||
{
|
for (unsigned char x = NUM_COLS; x--;)
|
||||||
// shift image right
|
|
||||||
shift_pixmap_l ();
|
|
||||||
wait (30);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void movinglines()
|
|
||||||
{
|
|
||||||
unsigned char x, y, n;
|
|
||||||
|
|
||||||
line((pixel){NUM_COLS - 1, NUM_ROWS - 1}, (pixel){NUM_COLS - 1, 0}, 3);
|
|
||||||
|
|
||||||
// linie wandert nach rechts
|
|
||||||
for (x = 0; x < NUM_COLS; x++)
|
|
||||||
{
|
{
|
||||||
shift_pixmap_l();
|
shift_pixmap_l();
|
||||||
wait (100);
|
wait (shiftdelay);
|
||||||
}
|
|
||||||
|
|
||||||
// von unten nach oben
|
|
||||||
for (y = NUM_ROWS; y--;)
|
|
||||||
{
|
|
||||||
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, 3);
|
|
||||||
wait (100);
|
|
||||||
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, 0);
|
|
||||||
//wait(10);
|
|
||||||
}
|
|
||||||
|
|
||||||
// eine linie von rechts nach links und 1-8 mal von oben nach unten
|
|
||||||
// je nach display format das ganze 4 mal
|
|
||||||
for (n = 0; n < 4; n++)
|
|
||||||
{
|
|
||||||
for (x = 0; x < NUM_COLS - 1; x++)
|
|
||||||
{
|
|
||||||
y = x % NUM_ROWS;
|
|
||||||
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, 3);
|
|
||||||
line ((pixel){x, 0}, (pixel){x, NUM_ROWS - 1}, 3);
|
|
||||||
wait (50);
|
|
||||||
|
|
||||||
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, 0);
|
|
||||||
line ((pixel){x, 0}, (pixel){x, NUM_ROWS - 1}, 0);
|
|
||||||
//wait(10);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//rechteckmuster mit helligkeitsstufen
|
/**
|
||||||
void rectangle1()
|
* Animated lines walking over the screen.
|
||||||
|
*/
|
||||||
|
static void movinglines()
|
||||||
{
|
{
|
||||||
unsigned char x, value, xcenter, ycenter, size;
|
// some parameters regarding appearance and timing
|
||||||
unsigned int delay = 500;
|
unsigned char const color = NUMPLANE; // brightest color
|
||||||
|
unsigned char const blank = 0;
|
||||||
|
int const delay = 100;
|
||||||
|
|
||||||
xcenter = NUM_COLS / 2;
|
// a line walking to the right
|
||||||
ycenter = NUM_ROWS / 2;
|
line((pixel){NUM_COLS - 1, NUM_ROWS - 1}, (pixel){NUM_COLS - 1, 0}, color);
|
||||||
|
for (unsigned char x = 0; x < NUM_COLS; x++)
|
||||||
clear_screen(0);
|
|
||||||
|
|
||||||
size = NUM_ROWS;
|
|
||||||
value = 3;
|
|
||||||
|
|
||||||
for (x = 8; x > 0; x--)
|
|
||||||
{
|
{
|
||||||
|
shift_pixmap_l();
|
||||||
if (value < NUMPLANE)
|
|
||||||
value++;
|
|
||||||
else
|
|
||||||
value = 0;
|
|
||||||
|
|
||||||
filled_rectangle((pixel){(xcenter - x), (ycenter - x)},
|
|
||||||
size, size, value);
|
|
||||||
wait (delay);
|
wait (delay);
|
||||||
|
}
|
||||||
|
|
||||||
|
// a line walking from the lower to the upper border
|
||||||
|
for (unsigned char y = NUM_ROWS; y--;)
|
||||||
|
{
|
||||||
|
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, color);
|
||||||
|
wait (delay);
|
||||||
|
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, blank);
|
||||||
|
}
|
||||||
|
|
||||||
|
// quickly moving cross hairs
|
||||||
|
for (unsigned char n = 0; n < 4; n++)
|
||||||
|
{
|
||||||
|
for (unsigned char x = 0; x < NUM_COLS - 1; x++)
|
||||||
|
{
|
||||||
|
unsigned char y = x % NUM_ROWS;
|
||||||
|
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, color);
|
||||||
|
line ((pixel){x, 0}, (pixel){x, NUM_ROWS - 1}, color);
|
||||||
|
wait (delay / 2);
|
||||||
|
line ((pixel){0, y}, (pixel){NUM_COLS - 1, y}, blank);
|
||||||
|
line ((pixel){x, 0}, (pixel){x, NUM_ROWS - 1}, blank);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draws a gradient colored square.
|
||||||
|
*/
|
||||||
|
static void rectangle1()
|
||||||
|
{
|
||||||
|
// we want a centered square
|
||||||
|
unsigned char const xcenter = NUM_COLS / 2, ycenter = NUM_ROWS / 2;
|
||||||
|
// it should be as big as the borg's height
|
||||||
|
unsigned char size = NUM_ROWS;
|
||||||
|
// darkest color as a starting point for the gradient
|
||||||
|
unsigned char color = 0;
|
||||||
|
// wait about 500 ms between each frame
|
||||||
|
int const delay = 500;
|
||||||
|
|
||||||
|
// create a gradient by drawing shrinking rectangles on top of each other
|
||||||
|
clear_screen(0);
|
||||||
|
for (unsigned char x = 8; x > 0; x--)
|
||||||
|
{
|
||||||
|
// draw the rectangle and wait for a moment
|
||||||
|
filled_rectangle((pixel){(xcenter - x), (ycenter - x)},
|
||||||
|
size, size, color);
|
||||||
|
wait (delay);
|
||||||
|
|
||||||
|
// iterate through all colors periodically
|
||||||
|
++color;
|
||||||
|
color %= (NUMPLANE + 1);
|
||||||
|
|
||||||
|
// shrink the dimensions of the succeeding rectangle
|
||||||
size -= 2;
|
size -= 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -192,65 +192,93 @@ void rectangle1()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// zufallsrechtecke
|
/**
|
||||||
void rectangles()
|
* Draws randomly placed rectangles.
|
||||||
|
*/
|
||||||
|
static void rectangles()
|
||||||
{
|
{
|
||||||
unsigned char value, n, x, y, h, w;
|
unsigned char const blank = 0;
|
||||||
clear_screen(0);
|
clear_screen(blank);
|
||||||
|
for (unsigned char n = 0; n < 60; n++)
|
||||||
for (n = 0; n < 60; n++)
|
|
||||||
{
|
{
|
||||||
x = RANDOM8() % NUM_COLS;
|
// randomly chosen position, dimension and color
|
||||||
y = RANDOM8() % NUM_ROWS;
|
unsigned char const x = random8() % NUM_COLS;
|
||||||
h = RANDOM8() % NUM_COLS / 2;
|
unsigned char const y = random8() % NUM_ROWS;
|
||||||
w = RANDOM8() % NUM_ROWS / 2;
|
unsigned char const h = random8() % NUM_COLS / 2;
|
||||||
value = RANDOM8() % (NUMPLANE + 1);
|
unsigned char const w = random8() % NUM_ROWS / 2;
|
||||||
|
unsigned char const color = random8() % (NUMPLANE + 1);
|
||||||
|
|
||||||
filled_rectangle((pixel){x, y}, w, h, value);
|
filled_rectangle((pixel){x, y}, w, h, color);
|
||||||
wait (500 + RANDOM8 () % 3000);
|
|
||||||
|
// wait between 500 and 750 ms
|
||||||
|
wait (500 + random8());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// schräge linien die aufblitzen
|
/**
|
||||||
void lines1()
|
* Draws flashing slanted lines.
|
||||||
|
*/
|
||||||
|
static void lines1()
|
||||||
{
|
{
|
||||||
unsigned char value, n, x, y, h, w;
|
unsigned char const blank = 0;
|
||||||
unsigned int delay = 500;
|
clear_screen(blank);
|
||||||
clear_screen(0);
|
for (unsigned char n = 0; n < 200; n++)
|
||||||
|
|
||||||
for (n = 0; n < 200; n++)
|
|
||||||
{
|
{
|
||||||
x = RANDOM8() % NUM_COLS;
|
// randomly chosen position, dimension and color
|
||||||
y = RANDOM8() % NUM_ROWS;
|
unsigned char const x = random8() % NUM_COLS;
|
||||||
h = RANDOM8() % NUM_COLS;
|
unsigned char const y = random8() % NUM_ROWS;
|
||||||
w = RANDOM8() % NUM_ROWS;
|
unsigned char const h = random8() % NUM_COLS;
|
||||||
value = RANDOM8() % (NUMPLANE + 1);
|
unsigned char const w = random8() % NUM_ROWS;
|
||||||
|
unsigned char const color = random8() % (NUMPLANE + 1);
|
||||||
|
|
||||||
line((pixel){x, y}, (pixel){w, h}, value);
|
line((pixel){x, y}, (pixel){w, h}, color);
|
||||||
wait (RANDOM8 () % delay);
|
wait(random8()); // wait up to 250 ms
|
||||||
line ((pixel){x, y}, (pixel){w, h}, 0);
|
line((pixel){x, y}, (pixel){w, h}, blank);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// random dots
|
/**
|
||||||
void dots1()
|
* Draws randomly placed dots.
|
||||||
|
*/
|
||||||
|
static void dots1()
|
||||||
{
|
{
|
||||||
unsigned char n, x, y;
|
// some parameters regarding appearance and timing
|
||||||
clear_screen(0);
|
int const glimmer_delay = 100;
|
||||||
|
unsigned char const blank = 0;
|
||||||
|
clear_screen(blank);
|
||||||
|
|
||||||
for (n = 50; n--;)
|
// draw up to 50 dots
|
||||||
|
for (unsigned char n = 50; n--;)
|
||||||
{
|
{
|
||||||
x = RANDOM8() % NUM_COLS;
|
// random coordinates
|
||||||
y = RANDOM8() % NUM_ROWS;
|
unsigned char x = random8() % NUM_COLS;
|
||||||
|
unsigned char y = random8() % NUM_ROWS;
|
||||||
|
|
||||||
|
// those dots are glimmering
|
||||||
static unsigned char const color[5] PROGMEM = {1, 2, 3, 2, 1};
|
static unsigned char const color[5] PROGMEM = {1, 2, 3, 2, 1};
|
||||||
for (unsigned char i = 0; i < 5; ++i)
|
for (unsigned char i = 0; i < 5; ++i)
|
||||||
{
|
{
|
||||||
setpixel ((pixel){x, y}, PGM(color[i]));
|
setpixel ((pixel){x, y}, PGM(color[i]));
|
||||||
wait(100);
|
wait(glimmer_delay);
|
||||||
}
|
}
|
||||||
wait ((RANDOM8 () % 255) * 10);
|
|
||||||
|
// wait up to 2500 ms until the next dot is drawn
|
||||||
|
wait (random8() * 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Go through all of Martin's animations.
|
||||||
|
*/
|
||||||
|
void mherweg()
|
||||||
|
{
|
||||||
|
lines1();
|
||||||
|
dots1();
|
||||||
|
movinglines();
|
||||||
|
checkbox();
|
||||||
|
rectangle1();
|
||||||
|
rectangles();
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,6 @@
|
||||||
#ifndef MHERWEG_H_
|
#ifndef MHERWEG_H_
|
||||||
#define MHERWEG_H_
|
#define MHERWEG_H_
|
||||||
|
|
||||||
void checkbox();
|
void mherweg();
|
||||||
|
|
||||||
|
|
||||||
void movinglines();
|
|
||||||
|
|
||||||
|
|
||||||
//rechteckmuster mit helligkeitsstufen
|
|
||||||
void rectangle1();
|
|
||||||
|
|
||||||
|
|
||||||
// zufallsrechtecke
|
|
||||||
void rectangles();
|
|
||||||
|
|
||||||
|
|
||||||
// schräge linien die aufblitzen
|
|
||||||
void lines1();
|
|
||||||
|
|
||||||
|
|
||||||
// random dots
|
|
||||||
void dots1();
|
|
||||||
|
|
||||||
#endif /* MHERWEG_H_ */
|
#endif /* MHERWEG_H_ */
|
||||||
|
|
|
||||||
|
|
@ -150,12 +150,7 @@ void display_loop(){
|
||||||
|
|
||||||
#ifdef ANIMATION_MHERWEG
|
#ifdef ANIMATION_MHERWEG
|
||||||
case 13:
|
case 13:
|
||||||
lines1();
|
mherweg();
|
||||||
dots1();
|
|
||||||
movinglines();
|
|
||||||
checkbox();
|
|
||||||
rectangle1();
|
|
||||||
rectangles();
|
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue