Browse Source

put Martin Herwegs source code into separate files

feature/2015
Christian Kroll 14 years ago
parent
commit
aa29c51bd8
  1. 4
      animations/Makefile
  2. 2
      animations/config.in
  3. 259
      animations/mherweg.c
  4. 25
      animations/mherweg.h
  5. 176
      animations/programm.c
  6. 1
      display_loop.c
  7. 80
      pixel.c
  8. 12
      pixel.h

4
animations/Makefile

@ -25,6 +25,10 @@ ifeq ($(ANIMATION_GAMEOFLIFE),y)
SRC += gameoflife.c SRC += gameoflife.c
endif endif
ifeq ($(ANIMATION_MHERWEG),y)
SRC += mherweg.c
endif
ifeq ($(ANIMATION_BREAKOUT),y) ifeq ($(ANIMATION_BREAKOUT),y)
SRC += breakout_demo.c SRC += breakout_demo.c
endif endif

2
animations/config.in

@ -12,7 +12,7 @@ comment "Animations"
dep_bool "Flying Dots" ANIMATION_FLYINGDOTS $RANDOM_SUPPORT dep_bool "Flying Dots" ANIMATION_FLYINGDOTS $RANDOM_SUPPORT
dep_bool "Game of Life" ANIMATION_GAMEOFLIFE $RANDOM_SUPPORT dep_bool "Game of Life" ANIMATION_GAMEOFLIFE $RANDOM_SUPPORT
dep_bool "Breakout Demo" ANIMATION_BREAKOUT $GAME_BREAKOUT dep_bool "Breakout Demo" ANIMATION_BREAKOUT $GAME_BREAKOUT
bool "Martin Herweg" ANIMATION_MHERWEG bool "Martin Herweg" ANIMATION_MHERWEG $RANDOM_SUPPORT
dep_bool "Langton Ant" ANIMATION_LTN_ANT $RANDOM_SUPPORT dep_bool "Langton Ant" ANIMATION_LTN_ANT $RANDOM_SUPPORT
dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT

259
animations/mherweg.c

@ -0,0 +1,259 @@
#include "../compat/pgmspace.h"
#include "../random/prng.h"
#include "../config.h"
#include "../pixel.h"
#include "../util.h"
#define RANDOM8(x) random8(x)
#define PGM(x) pgm_read_byte(&(x))
// straight or non straight line from one point to the other
// value=brightness
static void line(pixel p1, pixel p2, unsigned char value)
{
char dx, dy, stepx, stepy, fraction;
dy = p2.y - p1.y;
dx = p2.x - p1.x;
if (dy < 0)
{
dy = -dy;
stepy = -1;
}
else
{
stepy = 1;
}
if (dx < 0)
{
dx = -dx;
stepx = -1;
}
else
{
stepx = 1;
}
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
static void filled_rectangle(pixel p1,
unsigned char w,
unsigned char h,
unsigned char value)
{
unsigned char y;
for (y = p1.y; y < (p1.y + h); y++)
{
line((pixel){p1.x,y}, (pixel){(p1.x+w-1),y}, value);
}
}
void checkbox()
{
unsigned char x, delay = 250;
// quadrat aus linien
line((pixel){0, 0}, (pixel){7, 0}, 3);
wait (delay);
line ((pixel){7, 0}, (pixel){7, 7}, 3);
wait (delay);
line ((pixel){7, 7}, (pixel){0, 7}, 3);
wait (delay);
line ((pixel){0, 7}, (pixel){0, 0}, 3);
wait (delay);
// 2 diagonale lininen
line ((pixel){7, 7}, (pixel){0, 0}, 3);
wait (delay);
line ((pixel){0, 7}, (pixel){7, 0}, 3);
wait (delay * 3);
for (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 ();
wait (100);
}
// 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()
{
unsigned char x, value, xcenter, ycenter, size;
unsigned int delay = 500;
xcenter = NUM_COLS / 2;
ycenter = NUM_ROWS / 2;
clear_screen(0);
size = NUM_ROWS;
value = 3;
for (x = 8; x > 0; x--)
{
if (value < NUMPLANE)
value++;
else
value = 0;
filled_rectangle((pixel){(xcenter - x), (ycenter - x)},
size, size, value);
wait (delay);
size -= 2;
}
wait (delay * 3);
}
// zufallsrechtecke
void rectangles()
{
unsigned char value, n, x, y, h, w;
clear_screen(0);
for (n = 0; n < 60; n++)
{
x = RANDOM8() % NUM_COLS;
y = RANDOM8() % NUM_ROWS;
h = RANDOM8() % NUM_COLS / 2;
w = RANDOM8() % NUM_ROWS / 2;
value = RANDOM8() % (NUMPLANE + 1);
filled_rectangle((pixel){x, y}, w, h, value);
wait (500 + RANDOM8 () % 3000);
}
}
// schräge linien die aufblitzen
void lines1()
{
line((pixel){0, 15}, (pixel){15, 15}, 3);
wait(10000);
unsigned char value, n, x, y, h, w;
unsigned int delay = 500;
clear_screen(0);
for (n = 0; n < 200; n++)
{
x = RANDOM8() % NUM_COLS;
y = RANDOM8() % NUM_ROWS;
h = RANDOM8() % NUM_COLS;
w = RANDOM8() % NUM_ROWS;
value = RANDOM8() % (NUMPLANE + 1);
line((pixel){x, y}, (pixel){w, h}, value);
wait (RANDOM8 () % delay);
line ((pixel){x, y}, (pixel){w, h}, 0);
}
}
// random dots
void dots1()
{
unsigned char n, x, y;
clear_screen(0);
for (n = 50; n--;)
{
x = RANDOM8() % NUM_COLS;
y = RANDOM8() % NUM_ROWS;
static unsigned char const color[5] PROGMEM = {1, 2, 3, 2, 1};
for (unsigned char i = 0; i < 5; ++i)
{
setpixel ((pixel){x, y}, PGM(color[i]));
wait(100);
}
wait ((RANDOM8 () % 255) * 10);
}
}

25
animations/mherweg.h

@ -0,0 +1,25 @@
#ifndef MHERWEG_H_
#define MHERWEG_H_
void checkbox();
void movinglines();
//rechteckmuster mit helligkeitsstufen
void rectangle1();
// zufallsrechtecke
void rectangles();
// schräge linien die aufblitzen
void lines1();
// random dots
void dots1();
#endif /* MHERWEG_H_ */

176
animations/programm.c

@ -96,182 +96,6 @@ void test_palette2(){
#endif #endif
#ifdef ANIMATION_MHERWEG
void checkbox(){
unsigned char x, delay=250;
// quadrat aus linien
line((pixel){0,0}, (pixel){7,0} ,3);
wait(delay);
line((pixel){7,0}, (pixel){7,7} ,3);
wait(delay);
line((pixel){7,7}, (pixel){0,7} ,3);
wait(delay);
line((pixel){0,7}, (pixel){0,0} ,3);
wait(delay);
// 2 diagonale lininen
line((pixel){7,7}, (pixel){0,0} ,3);
wait(delay);
line((pixel){0,7}, (pixel){7,0} ,3);
wait(delay);
wait(delay);
wait(delay);
for (x=0;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();
wait(100);
}
// von unten nach oben
for (y=NUM_ROWS-1;y!=255;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(){
unsigned char x,value,xcenter,ycenter,size;
unsigned int delay=500;
xcenter = NUM_COLS/2;
ycenter = NUM_ROWS/2;
clear_screen(0);
size=NUM_ROWS;
value=3;
for (x=8;x>0;x--){
if (value<NUMPLANE)
value++;
else
value=0;
filled_rectangle((pixel){(xcenter-x),(ycenter-x)},size,size,value);
wait(delay);
size-=2;
}
wait(delay);
wait(delay);
wait(delay);
}
// zufallsrechtecke
void rectangles(){
unsigned char value,n,x,y,h,w;
clear_screen(0);
for (n=0;n<60;n++){
x = RANDOM8()%NUM_COLS;
y = RANDOM8()%NUM_ROWS;
h = RANDOM8()%NUM_COLS/2;
w = RANDOM8()%NUM_ROWS/2;
value= RANDOM8()%(NUMPLANE+1);
filled_rectangle((pixel){x,y},w,h,value);
wait(500+RANDOM8()%3000);
}
}
// schräge linien die aufblitzen
void lines1(){
unsigned char value,n,x,y,h,w;
unsigned int delay=500;
clear_screen(0);
for (n=0;n<200;n++){
x = RANDOM8()%NUM_COLS;
y = RANDOM8()%NUM_ROWS;
h = RANDOM8()%NUM_COLS;
w = RANDOM8()%NUM_ROWS;
value= RANDOM8()%(NUMPLANE+1);
line((pixel){x,y},(pixel){w,h},value);
wait(RANDOM8()%delay);
line((pixel){x,y},(pixel){w,h},0);
}
}
// random dots
void dots1(){
unsigned char delay=100,n,x,y;
clear_screen(0);
for (n=0;n<50;n++){
x = RANDOM8()%NUM_COLS;
y = RANDOM8()%NUM_ROWS;
setpixel((pixel){x,y} , 1);
wait(delay);
setpixel((pixel){x,y} , 2);
wait(delay);
setpixel((pixel){x,y} , 3);
wait(delay);
setpixel((pixel){x,y} , 2);
wait(delay);
setpixel((pixel){x,y} , 1);
wait((RANDOM8()%255)*10);
}
}
#endif
#ifdef ANIMATION_OFF #ifdef ANIMATION_OFF
void off() void off()

1
display_loop.c

@ -15,6 +15,7 @@
#include "animations/amphibian.h" #include "animations/amphibian.h"
#include "animations/laborlogo.h" #include "animations/laborlogo.h"
#include "animations/27c3.h" #include "animations/27c3.h"
#include "animations/mherweg.h"
#include "borg_hw/borg_hw.h" #include "borg_hw/borg_hw.h"
#include "can/borg_can.h" #include "can/borg_can.h"
#include "random/prng.h" #include "random/prng.h"

80
pixel.c

@ -34,86 +34,6 @@ void setpixel(pixel p, unsigned char value ){
} }
#ifdef ANIMATION_MHERWEG
void line(pixel p1, pixel p2 ,unsigned char value){
char dx, dy, stepx, stepy, fraction;
dy = p2.y - p1.y;
dx = p2.x - p1.x;
if ( dy < 0 )
{
dy = -dy;
stepy = -1;
}
else
{
stepy = 1;
}
if ( dx < 0 )
{
dx = -dx;
stepx = -1;
}
else
{
stepx = 1;
}
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 );
}
}
}
void filled_rectangle(pixel p1, unsigned char w, unsigned char h ,unsigned char value){
unsigned char y;
for (y=p1.y;y<(p1.y+h);y++){
line((pixel){p1.x,y}, (pixel){(p1.x+w-1),y} ,value);
}
}
#endif /* ANIMATION_HERWEG */
//shifts pixmap left. It is really shifted right, but because col0 is left in the Display it's left. //shifts pixmap left. It is really shifted right, but because col0 is left in the Display it's left.
void shift_pixmap_l(){ void shift_pixmap_l(){
unsigned char plane, row, byte; unsigned char plane, row, byte;

12
pixel.h

@ -30,26 +30,22 @@ static inline pixel next_pixel(pixel pix, direction dir){
return (pixel){pix.x + nDelta[dir], pix.y + nDelta[dir + 1]}; return (pixel){pix.x + nDelta[dir], pix.y + nDelta[dir + 1]};
} }
static inline unsigned char get_next_pixel(pixel p, direction dir){ static inline unsigned char get_next_pixel(pixel p, direction dir){
return get_pixel(next_pixel(p, dir)); return get_pixel(next_pixel(p, dir));
} }
static inline direction direction_r(direction dir){ static inline direction direction_r(direction dir){
return (dir + 1) % 4; return (dir + 1) % 4;
} }
void clear_screen(unsigned char value); void clear_screen(unsigned char value);
void setpixel(pixel p, unsigned char value);
#define clearpixel(p) setpixel(p, 0);
// straight or non straight line from one point to the other
// value=brightness
void line(pixel p1, pixel p2 ,unsigned char value);
// filled_rectangle p1=upper right corner, w=width, h=height , void setpixel(pixel p, unsigned char value);
// value=brightness #define clearpixel(p) setpixel(p, 0);
void filled_rectangle(pixel p1, unsigned char w, unsigned char h ,unsigned char value);
void shift_pixmap_l(); void shift_pixmap_l();

Loading…
Cancel
Save