From 61c22b24f1c1761ac8e12a3a063d014882e4dea5 Mon Sep 17 00:00:00 2001 From: Hans-Gert Dahmen Date: Sun, 27 Dec 2009 00:51:07 +0000 Subject: [PATCH] improved flying dots anim --- animations/Makefile | 8 ++++++++ config.in | 4 +++- display_loop.c | 20 +++++++++++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/animations/Makefile b/animations/Makefile index d9b2ba8..35bd854 100644 --- a/animations/Makefile +++ b/animations/Makefile @@ -13,6 +13,14 @@ ifeq ($(ANIMATION_MATRIX),y) SRC += matrix.c endif +ifeq ($(ANIMATION_STONEFLY),y) + SRC += stonefly.c +endif + +ifeq ($(ANIMATION_FLYINGDOTS),y) + SRC += flyingdots.c +endif + ifeq ($(ANIMATION_GAMEOFLIFE),y) SRC += gameoflife.c endif diff --git a/config.in b/config.in index d9a5c16..aafd556 100644 --- a/config.in +++ b/config.in @@ -64,7 +64,9 @@ comment "Animations" bool "Schachbrett" ANIMATION_SCHACHBRETT dep_bool "Feuer" ANIMATION_FEUER $RANDOM_SUPPORT dep_bool "Matrix" ANIMATION_MATRIX $RANDOM_SUPPORT - dep_bool "Random bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT + dep_bool "Random Bright" ANIMATION_RANDOM_BRIGHT $RANDOM_SUPPORT + dep_bool "Stonefly" ANIMATION_STONEFLY $RANDOM_SUPPORT + dep_bool "Flying Dots" ANIMATION_FLYINGDOTS $RANDOM_SUPPORT dep_bool "Game of Life" ANIMATION_GAMEOFLIFE $RANDOM_SUPPORT bool "M Herweg" ANIMATION_MHERWEG diff --git a/display_loop.c b/display_loop.c index e8b2a95..b8dcc51 100644 --- a/display_loop.c +++ b/display_loop.c @@ -7,6 +7,8 @@ #include "animations/programm.h" #include "animations/matrix.h" #include "animations/gameoflife.h" +#include "animations/stonefly.h" +#include "animations/flyingdots.h" #include "borg_hw/borg_hw.h" #include "can/borg_can.h" #include "random/prng.h" @@ -90,15 +92,27 @@ void display_loop(){ break; #endif -#ifdef ANIMATION_GAMEOFLIFE +#ifdef ANIMATION_STONEFLY case 9: + stonefly(); + break; +#endif + +#ifdef ANIMATION_GAMEOFLIFE + case 10: gameoflife(); break; #endif +#ifdef ANIMATION_FLYINGDOTS + case 12: + flyingdots(); + break; +#endif + + #ifdef ANIMATION_MHERWEG - case 10: - flydots(); + case 11: lines1(); dots1(); movinglines();