Browse Source

moved bitmap scroller stuff to dedicated directory

feature/2015
Christian Kroll 12 years ago
parent
commit
5a7834bf8f
  1. 1
      Makefile
  2. 24
      animations/Makefile
  3. 29
      animations/bitmapscroller/Makefile
  4. 2
      animations/bitmapscroller/amphibian.c
  5. 0
      animations/bitmapscroller/amphibian.h
  6. 8
      animations/bitmapscroller/bitmapscroller.c
  7. 0
      animations/bitmapscroller/bitmapscroller.h
  8. 7
      animations/bitmapscroller/config.in
  9. 2
      animations/bitmapscroller/fairydust.c
  10. 6
      animations/bitmapscroller/fairydust.h
  11. 2
      animations/bitmapscroller/ideenpark.c
  12. 0
      animations/bitmapscroller/ideenpark.h
  13. 2
      animations/bitmapscroller/laborlogo.c
  14. 0
      animations/bitmapscroller/laborlogo.h
  15. 2
      animations/bitmapscroller/outofspec.c
  16. 0
      animations/bitmapscroller/outofspec.h
  17. 8
      animations/config.in
  18. 6
      animations/fairydust.h
  19. 10
      display_loop.c

1
Makefile

@ -40,6 +40,7 @@ include defaults.mk
@ echo "checking in which subdirs to build" @ echo "checking in which subdirs to build"
@ $(RM) -f $@ @ $(RM) -f $@
@ echo "SUBDIRS += animations" >> $@ @ echo "SUBDIRS += animations" >> $@
@ echo "SUBDIRS += animations/bitmapscroller" >> $@
@ echo "SUBDIRS += smallani" >> $@ @ echo "SUBDIRS += smallani" >> $@
@ (for subdir in `grep -e "^#define .*_SUPPORT" autoconf.h \ @ (for subdir in `grep -e "^#define .*_SUPPORT" autoconf.h \
| sed -e "s/^#define //" -e "s/_SUPPORT.*//" \ | sed -e "s/^#define //" -e "s/_SUPPORT.*//" \

24
animations/Makefile

@ -37,30 +37,6 @@ ifeq ($(ANIMATION_LTN_ANT),y)
SRC += ltn_ant.c SRC += ltn_ant.c
endif endif
ifeq ($(ANIMATION_BMSCROLLER),y)
SRC += bitmapscroller.c
endif
ifeq ($(ANIMATION_LABORLOGO),y)
SRC += laborlogo.c
endif
ifeq ($(ANIMATION_AMPHIBIAN),y)
SRC += amphibian.c
endif
ifeq ($(ANIMATION_LOGO_OOS),y)
SRC += outofspec.c
endif
ifeq ($(ANIMATION_FAIRYDUST),y)
SRC += fairydust.c
endif
ifeq ($(ANIMATION_IDEENPARK),y)
SRC += ideenpark.c
endif
ifneq (,$(filter y,$(ANIMATION_PLASMA) $(ANIMATION_PSYCHEDELIC))) ifneq (,$(filter y,$(ANIMATION_PLASMA) $(ANIMATION_PSYCHEDELIC)))
SRC += fpmath_patterns.c SRC += fpmath_patterns.c
endif endif

29
animations/bitmapscroller/Makefile

@ -0,0 +1,29 @@
TOPDIR = ../..
include $(TOPDIR)/defaults.mk
ifeq ($(ANIMATION_BMSCROLLER),y)
SRC = bitmapscroller.c
endif
ifeq ($(ANIMATION_LABORLOGO),y)
SRC += laborlogo.c
endif
ifeq ($(ANIMATION_AMPHIBIAN),y)
SRC += amphibian.c
endif
ifeq ($(ANIMATION_LOGO_OOS),y)
SRC += outofspec.c
endif
ifeq ($(ANIMATION_FAIRYDUST),y)
SRC += fairydust.c
endif
ifeq ($(ANIMATION_IDEENPARK),y)
SRC += ideenpark.c
endif
include $(TOPDIR)/rules.mk

2
animations/amphibian.c → animations/bitmapscroller/amphibian.c

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "amphibian.h" #include "amphibian.h"

0
animations/amphibian.h → animations/bitmapscroller/amphibian.h

8
animations/bitmapscroller.c → animations/bitmapscroller/bitmapscroller.c

@ -13,10 +13,10 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../random/prng.h" #include "../../random/prng.h"
#include "../util.h" #include "../../util.h"
#include "../autoconf.h" #include "../../autoconf.h"
#include "../pixel.h" #include "../../pixel.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"

0
animations/bitmapscroller.h → animations/bitmapscroller/bitmapscroller.h

7
animations/bitmapscroller/config.in

@ -0,0 +1,7 @@
dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT
dep_bool "LABOR Logo" ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER
dep_bool "Amphibian" ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER
dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS $ANIMATION_BMSCROLLER
dep_bool "Fairydust" ANIMATION_FAIRYDUST $ANIMATION_BMSCROLLER
dep_bool "Ideenpark" ANIMATION_IDEENPARK $ANIMATION_BMSCROLLER
endmenu

2
animations/fairydust.c → animations/bitmapscroller/fairydust.c

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "fairydust.h" #include "fairydust.h"

6
animations/bitmapscroller/fairydust.h

@ -0,0 +1,6 @@
#ifndef LOGO_FAIRYDUST_H_
#define LOGO_FAIRYDUST_H_
void fairydust();
#endif /* LOGO_28C3_H_ */

2
animations/ideenpark.c → animations/bitmapscroller/ideenpark.c

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "ideenpark.h" #include "ideenpark.h"

0
animations/ideenpark.h → animations/bitmapscroller/ideenpark.h

2
animations/laborlogo.c → animations/bitmapscroller/laborlogo.c

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "laborlogo.h" #include "laborlogo.h"

0
animations/laborlogo.h → animations/bitmapscroller/laborlogo.h

2
animations/outofspec.c → animations/bitmapscroller/outofspec.c

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "outofspec.h" #include "outofspec.h"

0
animations/outofspec.h → animations/bitmapscroller/outofspec.h

8
animations/config.in

@ -49,13 +49,7 @@ comment "Animations"
int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT 50 int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT 50
endmenu endmenu
dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT source animations/bitmapscroller/config.in
dep_bool "LABOR Logo" ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER
dep_bool "Amphibian" ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER
dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS $ANIMATION_BMSCROLLER
dep_bool "Fairydust" ANIMATION_FAIRYDUST $ANIMATION_BMSCROLLER
dep_bool "Ideenpark" ANIMATION_IDEENPARK $ANIMATION_BMSCROLLER
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment "Fixed-point math patterns" comment "Fixed-point math patterns"

6
animations/fairydust.h

@ -1,6 +0,0 @@
#ifndef LOGO_28C3_H_
#define LOGO_28C3_H_
void fairydust();
#endif /* LOGO_28C3_H_ */

10
display_loop.c

@ -12,11 +12,11 @@
#include "animations/flyingdots.h" #include "animations/flyingdots.h"
#include "animations/breakout_demo.h" #include "animations/breakout_demo.h"
#include "animations/ltn_ant.h" #include "animations/ltn_ant.h"
#include "animations/amphibian.h" #include "animations/bitmapscroller/laborlogo.h"
#include "animations/laborlogo.h" #include "animations/bitmapscroller/amphibian.h"
#include "animations/outofspec.h" #include "animations/bitmapscroller/outofspec.h"
#include "animations/fairydust.h" #include "animations/bitmapscroller/fairydust.h"
#include "animations/ideenpark.h" #include "animations/bitmapscroller/ideenpark.h"
#include "animations/fpmath_patterns.h" #include "animations/fpmath_patterns.h"
#include "animations/mherweg.h" #include "animations/mherweg.h"
#include "animations/blackhole.h" #include "animations/blackhole.h"

Loading…
Cancel
Save