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

Added Langton\'s Ant to animations + some whitespace fun.

This commit is contained in:
alu 2010-04-11 06:29:08 +00:00
parent c6680ff94f
commit e4186bd02b
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
animations/Makefile
View File

@ -29,4 +29,8 @@ ifeq ($(ANIMATION_BREAKOUT),y)
SRC += breakout_demo.c SRC += breakout_demo.c
endif endif
ifeq ($(ANIMATION_LTN_ANT),y)
SRC += ltn_ant.c
endif
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk

39
config.in
View File

@ -9,9 +9,9 @@ comment "General Setup"
choice 'Target MCU' \ choice 'Target MCU' \
"ATmega8 atmega8 \ "ATmega8 atmega8 \
ATmega32 atmega32 \ ATmega32 atmega32 \
ATmega644 atmega644 \ ATmega644 atmega644 \
ATmega644p atmega644p" \ ATmega644p atmega644p" \
'ATmega32' MCU 'ATmega32' MCU
int "MCU frequency" FREQ 16000000 int "MCU frequency" FREQ 16000000
@ -61,24 +61,25 @@ source games/config.in
######################### Animations Menu ##################################### ######################### Animations Menu #####################################
mainmenu_option next_comment mainmenu_option next_comment
comment "Animations" comment "Animations"
comment "selects which animations are displayed in main loop" comment "selects which animations are displayed in main loop"
dep_bool "Scrolltext" ANIMATION_SCROLLTEXT $SCROLLTEXT_SUPPORT dep_bool "Scrolltext" ANIMATION_SCROLLTEXT $SCROLLTEXT_SUPPORT
bool "Spirale" ANIMATION_SPIRALE bool "Spirale" ANIMATION_SPIRALE
bool "Joern1" ANIMATION_JOERN1 bool "Joern1" ANIMATION_JOERN1
dep_bool "Snake" ANIMATION_SNAKE $RANDOM_SUPPORT dep_bool "Snake" ANIMATION_SNAKE $RANDOM_SUPPORT
bool "Schachbrett" ANIMATION_SCHACHBRETT bool "Schachbrett" ANIMATION_SCHACHBRETT
dep_bool "Feuer" ANIMATION_FEUER $RANDOM_SUPPORT dep_bool "Feuer" ANIMATION_FEUER $RANDOM_SUPPORT
dep_bool "Matrix" ANIMATION_MATRIX $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 $GAME_TETRIS_CORE dep_bool "Stonefly" ANIMATION_STONEFLY $RANDOM_SUPPORT $GAME_TETRIS_CORE
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 "M Herweg" ANIMATION_MHERWEG bool "M Herweg" ANIMATION_MHERWEG
bool "Langton Ant" ANIMATION_LTN_ANT $RANDOM_SUPPORT
comment "Special Animations" comment "Special Animations"
bool "Test Animations" ANIMATION_TESTS bool "Test Animations" ANIMATION_TESTS
bool "Display off mode" ANIMATION_OFF bool "Display off mode" ANIMATION_OFF
endmenu endmenu

7
display_loop.c
View File

@ -10,6 +10,7 @@
#include "animations/stonefly.h" #include "animations/stonefly.h"
#include "animations/flyingdots.h" #include "animations/flyingdots.h"
#include "animations/breakout_demo.h" #include "animations/breakout_demo.h"
#include "animations/ltn_ant.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"
@ -135,6 +136,12 @@ void display_loop(){
break; break;
#endif #endif
#ifdef ANIMATION_LTN_ANT
case 14:
ltn_ant();
break;
#endif
#ifdef ANIMATION_TESTS #ifdef ANIMATION_TESTS
case 31: case 31:
test_level1(); test_level1();