From 8b13d87ec3055559ea33ea2b40225ed0cfa00788 Mon Sep 17 00:00:00 2001 From: Marianne Arnold Date: Tue, 7 Apr 2009 17:56:16 +0000 Subject: Invadrox - some bitmap related changes in preparation of porting it to more screen resolutions, should not be visible to the user: (1) Use single bitmaps (or strips where possible) instead of one big bitmap each, so instructions and defines how to take the bitmap apart aren't needed. It's more flexible and makes it possible to (2) get some width/height variables directly from the bitmaps. (3) Use background images for static items. Both reduces the number of hardcoded values noticeably. (4) Make the 'fire_sprite' an external bitmap too - with help of Jens -. (5) Rename 'TINY_GRAPHICS' to 'SMALL_GRAPHICS' to have this name available for even smaller images (which is planned). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20646 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/bitmaps/mono/SOURCES | 9 +++ apps/plugins/bitmaps/mono/invadrox_fire.6x6x1.bmp | Bin 0 -> 86 bytes apps/plugins/bitmaps/mono/invadrox_fire.8x8x1.bmp | Bin 0 -> 94 bytes apps/plugins/bitmaps/native/SOURCES | 67 ++++++++++++++------- apps/plugins/bitmaps/native/invadrox.160x128x2.bmp | Bin 934 -> 0 bytes .../plugins/bitmaps/native/invadrox.176x132x16.bmp | Bin 938 -> 0 bytes .../plugins/bitmaps/native/invadrox.320x240x16.bmp | Bin 1726 -> 0 bytes .../native/invadrox_alien_explode.10x5x16.bmp | Bin 0 -> 130 bytes .../native/invadrox_alien_explode.13x7x16.bmp | Bin 0 -> 182 bytes .../bitmaps/native/invadrox_aliens.16x15x16.bmp | Bin 0 -> 310 bytes .../bitmaps/native/invadrox_aliens.24x24x16.bmp | Bin 0 -> 646 bytes .../native/invadrox_background.160x128x16.bmp | Bin 0 -> 61494 bytes .../native/invadrox_background.176x132x16.bmp | Bin 0 -> 69750 bytes .../native/invadrox_background.176x220x16.bmp | Bin 0 -> 116214 bytes .../native/invadrox_background.220x176x16.bmp | Bin 0 -> 116214 bytes .../native/invadrox_background.240x320x16.bmp | Bin 0 -> 230454 bytes .../native/invadrox_background.320x240x16.bmp | Bin 0 -> 230454 bytes .../bitmaps/native/invadrox_bombs.9x30x16.bmp | Bin 0 -> 430 bytes .../bitmaps/native/invadrox_bombs.9x42x16.bmp | Bin 0 -> 574 bytes .../bitmaps/native/invadrox_left.320x240x16.bmp | Bin 5830 -> 0 bytes .../bitmaps/native/invadrox_logo.176x220x16.bmp | Bin 12886 -> 0 bytes .../bitmaps/native/invadrox_logo.240x320x16.bmp | Bin 19766 -> 0 bytes .../bitmaps/native/invadrox_numbers.40x5x16.bmp | Bin 0 -> 270 bytes .../bitmaps/native/invadrox_numbers.50x7x16.bmp | Bin 0 -> 434 bytes .../bitmaps/native/invadrox_right.320x240x16.bmp | Bin 5830 -> 0 bytes .../bitmaps/native/invadrox_shield.15x10x16.bmp | Bin 0 -> 230 bytes .../bitmaps/native/invadrox_shield.15x10x2.bmp | Bin 0 -> 1238 bytes .../bitmaps/native/invadrox_shield.22x16x16.bmp | Bin 0 -> 454 bytes .../bitmaps/native/invadrox_ships.10x15x16.bmp | Bin 0 -> 250 bytes .../bitmaps/native/invadrox_ships.10x15x2.bmp | Bin 0 -> 1258 bytes .../bitmaps/native/invadrox_ships.16x24x16.bmp | Bin 0 -> 454 bytes .../bitmaps/native/invadrox_ufo.11x5x16.bmp | Bin 0 -> 130 bytes .../plugins/bitmaps/native/invadrox_ufo.11x5x2.bmp | Bin 0 -> 1138 bytes .../bitmaps/native/invadrox_ufo.16x7x16.bmp | Bin 0 -> 182 bytes .../native/invadrox_ufo_explode.14x5x16.bmp | Bin 0 -> 150 bytes .../bitmaps/native/invadrox_ufo_explode.14x5x2.bmp | Bin 0 -> 1158 bytes .../native/invadrox_ufo_explode.21x8x16.bmp | Bin 0 -> 262 bytes 37 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 apps/plugins/bitmaps/mono/invadrox_fire.6x6x1.bmp create mode 100644 apps/plugins/bitmaps/mono/invadrox_fire.8x8x1.bmp delete mode 100644 apps/plugins/bitmaps/native/invadrox.160x128x2.bmp delete mode 100644 apps/plugins/bitmaps/native/invadrox.176x132x16.bmp delete mode 100644 apps/plugins/bitmaps/native/invadrox.320x240x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_alien_explode.10x5x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_alien_explode.13x7x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_aliens.16x15x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_aliens.24x24x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_background.160x128x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_background.176x132x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_background.176x220x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_background.220x176x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_background.240x320x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_background.320x240x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_bombs.9x30x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_bombs.9x42x16.bmp delete mode 100644 apps/plugins/bitmaps/native/invadrox_left.320x240x16.bmp delete mode 100644 apps/plugins/bitmaps/native/invadrox_logo.176x220x16.bmp delete mode 100644 apps/plugins/bitmaps/native/invadrox_logo.240x320x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_numbers.40x5x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_numbers.50x7x16.bmp delete mode 100644 apps/plugins/bitmaps/native/invadrox_right.320x240x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_shield.15x10x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_shield.15x10x2.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_shield.22x16x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ships.10x15x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ships.10x15x2.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ships.16x24x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ufo.11x5x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ufo.11x5x2.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ufo.16x7x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x16.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x2.bmp create mode 100644 apps/plugins/bitmaps/native/invadrox_ufo_explode.21x8x16.bmp (limited to 'apps/plugins/bitmaps') diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index a109405bc9..63ac5adf74 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES @@ -37,6 +37,15 @@ flipit_cursor.16x13x1.bmp #endif #endif +/* Invadrox, not on monochrome targets yet */ +#if LCD_DEPTH > 1 +#if LCD_WIDTH >= 220 +invadrox_fire.8x8x1.bmp +#elif LCD_WIDTH >= 160 +invadrox_fire.6x6x1.bmp +#endif +#endif + #if CONFIG_CODEC == SWCODEC /* MPEGplayer */ mpegplayer_status_icons_8x8x1.bmp diff --git a/apps/plugins/bitmaps/mono/invadrox_fire.6x6x1.bmp b/apps/plugins/bitmaps/mono/invadrox_fire.6x6x1.bmp new file mode 100644 index 0000000000..8fac78d84e Binary files /dev/null and b/apps/plugins/bitmaps/mono/invadrox_fire.6x6x1.bmp differ diff --git a/apps/plugins/bitmaps/mono/invadrox_fire.8x8x1.bmp b/apps/plugins/bitmaps/mono/invadrox_fire.8x8x1.bmp new file mode 100644 index 0000000000..76216bac9d Binary files /dev/null and b/apps/plugins/bitmaps/mono/invadrox_fire.8x8x1.bmp differ diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 357480afc6..92521d7e04 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -256,30 +256,51 @@ flipit_tokens.16x26x1.bmp #endif /* Invadrox */ -#if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) -invadrox.320x240x16.bmp -invadrox_left.320x240x16.bmp -invadrox_right.320x240x16.bmp -#elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) -/* Use iPod Video character bitmap */ -invadrox.320x240x16.bmp -#elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) -/* Use iPod Video character bitmap */ -invadrox.320x240x16.bmp -invadrox_logo.240x320x16.bmp -#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) -invadrox.176x132x16.bmp -#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 8) -/* Use iPod Nano character bitmap */ -invadrox.176x132x16.bmp -#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) -/* Grayscale */ -invadrox.160x128x2.bmp -#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) -/* Use iPod Nano character bitmap */ -invadrox.176x132x16.bmp -invadrox_logo.176x220x16.bmp +#if defined HAVE_LCD_COLOR +#if LCD_WIDTH >= 220 +invadrox_aliens.24x24x16.bmp +invadrox_alien_explode.13x7x16.bmp +invadrox_ships.16x24x16.bmp +invadrox_bombs.9x42x16.bmp +invadrox_shield.22x16x16.bmp +invadrox_ufo.16x7x16.bmp +invadrox_ufo_explode.21x8x16.bmp +invadrox_numbers.50x7x16.bmp +#if LCD_WIDTH == 320 +invadrox_background.320x240x16.bmp +#elif LCD_WIDTH == 240 +invadrox_background.240x320x16.bmp +#elif LCD_WIDTH == 220 +invadrox_background.220x176x16.bmp #endif +#elif LCD_WIDTH >= 160 +invadrox_aliens.16x15x16.bmp +invadrox_alien_explode.10x5x16.bmp +invadrox_ships.10x15x16.bmp +invadrox_bombs.9x30x16.bmp +invadrox_shield.15x10x16.bmp +invadrox_ufo.11x5x16.bmp +invadrox_ufo_explode.14x5x16.bmp +invadrox_numbers.40x5x16.bmp +#if LCD_WIDTH == 176 && LCD_HEIGHT == 220 +invadrox_background.176x220x16.bmp +#elif LCD_WIDTH == 176 && LCD_HEIGHT == 132 +invadrox_background.176x132x16.bmp +#elif LCD_WIDTH == 160 && LCD_HEIGHT == 128 +invadrox_background.160x128x16.bmp +#endif +#endif /* LCD_WIDTH */ +#elif LCD_DEPTH == 2 /* Greyscale */ +invadrox_aliens.16x15x16.bmp +invadrox_alien_explode.10x5x16.bmp +invadrox_ships.10x15x2.bmp +invadrox_bombs.9x30x16.bmp +invadrox_shield.15x10x2.bmp +invadrox_ufo.11x5x2.bmp +invadrox_ufo_explode.14x5x2.bmp +invadrox_numbers.40x5x16.bmp +invadrox_background.160x128x16.bmp +#endif /* colour depth */ /* Jewels */ #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) diff --git a/apps/plugins/bitmaps/native/invadrox.160x128x2.bmp b/apps/plugins/bitmaps/native/invadrox.160x128x2.bmp deleted file mode 100644 index 4834c39c16..0000000000 Binary files a/apps/plugins/bitmaps/native/invadrox.160x128x2.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/invadrox.176x132x16.bmp b/apps/plugins/bitmaps/native/invadrox.176x132x16.bmp deleted file mode 100644 index 1c9631baa4..0000000000 Binary files a/apps/plugins/bitmaps/native/invadrox.176x132x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/invadrox.320x240x16.bmp b/apps/plugins/bitmaps/native/invadrox.320x240x16.bmp deleted file mode 100644 index 73fd916878..0000000000 Binary files a/apps/plugins/bitmaps/native/invadrox.320x240x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/invadrox_alien_explode.10x5x16.bmp b/apps/plugins/bitmaps/native/invadrox_alien_explode.10x5x16.bmp new file mode 100644 index 0000000000..74d984ff55 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_alien_explode.10x5x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_alien_explode.13x7x16.bmp b/apps/plugins/bitmaps/native/invadrox_alien_explode.13x7x16.bmp new file mode 100644 index 0000000000..36beffb682 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_alien_explode.13x7x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_aliens.16x15x16.bmp b/apps/plugins/bitmaps/native/invadrox_aliens.16x15x16.bmp new file mode 100644 index 0000000000..3d335be642 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_aliens.16x15x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_aliens.24x24x16.bmp b/apps/plugins/bitmaps/native/invadrox_aliens.24x24x16.bmp new file mode 100644 index 0000000000..d4232c033f Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_aliens.24x24x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_background.160x128x16.bmp b/apps/plugins/bitmaps/native/invadrox_background.160x128x16.bmp new file mode 100644 index 0000000000..24833bdce1 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_background.160x128x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_background.176x132x16.bmp b/apps/plugins/bitmaps/native/invadrox_background.176x132x16.bmp new file mode 100644 index 0000000000..4a61deb37d Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_background.176x132x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_background.176x220x16.bmp b/apps/plugins/bitmaps/native/invadrox_background.176x220x16.bmp new file mode 100644 index 0000000000..3edeeef463 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_background.176x220x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_background.220x176x16.bmp b/apps/plugins/bitmaps/native/invadrox_background.220x176x16.bmp new file mode 100644 index 0000000000..d9a9b6965d Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_background.220x176x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_background.240x320x16.bmp b/apps/plugins/bitmaps/native/invadrox_background.240x320x16.bmp new file mode 100644 index 0000000000..6a6c2418e7 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_background.240x320x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_background.320x240x16.bmp b/apps/plugins/bitmaps/native/invadrox_background.320x240x16.bmp new file mode 100644 index 0000000000..0bc47ea035 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_background.320x240x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_bombs.9x30x16.bmp b/apps/plugins/bitmaps/native/invadrox_bombs.9x30x16.bmp new file mode 100644 index 0000000000..4cb561e561 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_bombs.9x30x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_bombs.9x42x16.bmp b/apps/plugins/bitmaps/native/invadrox_bombs.9x42x16.bmp new file mode 100644 index 0000000000..8eeb565ee2 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_bombs.9x42x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_left.320x240x16.bmp b/apps/plugins/bitmaps/native/invadrox_left.320x240x16.bmp deleted file mode 100644 index 8111e4762c..0000000000 Binary files a/apps/plugins/bitmaps/native/invadrox_left.320x240x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/invadrox_logo.176x220x16.bmp b/apps/plugins/bitmaps/native/invadrox_logo.176x220x16.bmp deleted file mode 100644 index 687102ad7a..0000000000 Binary files a/apps/plugins/bitmaps/native/invadrox_logo.176x220x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/invadrox_logo.240x320x16.bmp b/apps/plugins/bitmaps/native/invadrox_logo.240x320x16.bmp deleted file mode 100644 index 72b0534056..0000000000 Binary files a/apps/plugins/bitmaps/native/invadrox_logo.240x320x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/invadrox_numbers.40x5x16.bmp b/apps/plugins/bitmaps/native/invadrox_numbers.40x5x16.bmp new file mode 100644 index 0000000000..47ec462136 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_numbers.40x5x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_numbers.50x7x16.bmp b/apps/plugins/bitmaps/native/invadrox_numbers.50x7x16.bmp new file mode 100644 index 0000000000..5245f60e37 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_numbers.50x7x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_right.320x240x16.bmp b/apps/plugins/bitmaps/native/invadrox_right.320x240x16.bmp deleted file mode 100644 index ceb21053ed..0000000000 Binary files a/apps/plugins/bitmaps/native/invadrox_right.320x240x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/invadrox_shield.15x10x16.bmp b/apps/plugins/bitmaps/native/invadrox_shield.15x10x16.bmp new file mode 100644 index 0000000000..03d93db849 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_shield.15x10x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_shield.15x10x2.bmp b/apps/plugins/bitmaps/native/invadrox_shield.15x10x2.bmp new file mode 100644 index 0000000000..9ca3ed70c9 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_shield.15x10x2.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_shield.22x16x16.bmp b/apps/plugins/bitmaps/native/invadrox_shield.22x16x16.bmp new file mode 100644 index 0000000000..6ea8d4083e Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_shield.22x16x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ships.10x15x16.bmp b/apps/plugins/bitmaps/native/invadrox_ships.10x15x16.bmp new file mode 100644 index 0000000000..5e8cb62ba7 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ships.10x15x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ships.10x15x2.bmp b/apps/plugins/bitmaps/native/invadrox_ships.10x15x2.bmp new file mode 100644 index 0000000000..c17313d472 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ships.10x15x2.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ships.16x24x16.bmp b/apps/plugins/bitmaps/native/invadrox_ships.16x24x16.bmp new file mode 100644 index 0000000000..54cd36a98b Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ships.16x24x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ufo.11x5x16.bmp b/apps/plugins/bitmaps/native/invadrox_ufo.11x5x16.bmp new file mode 100644 index 0000000000..aa94c5842e Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ufo.11x5x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ufo.11x5x2.bmp b/apps/plugins/bitmaps/native/invadrox_ufo.11x5x2.bmp new file mode 100644 index 0000000000..a1561db66d Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ufo.11x5x2.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ufo.16x7x16.bmp b/apps/plugins/bitmaps/native/invadrox_ufo.16x7x16.bmp new file mode 100644 index 0000000000..2ec749a6b5 Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ufo.16x7x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x16.bmp b/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x16.bmp new file mode 100644 index 0000000000..ef048fb85b Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x16.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x2.bmp b/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x2.bmp new file mode 100644 index 0000000000..4a81a79f3d Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x2.bmp differ diff --git a/apps/plugins/bitmaps/native/invadrox_ufo_explode.21x8x16.bmp b/apps/plugins/bitmaps/native/invadrox_ufo_explode.21x8x16.bmp new file mode 100644 index 0000000000..1f68fb329f Binary files /dev/null and b/apps/plugins/bitmaps/native/invadrox_ufo_explode.21x8x16.bmp differ -- cgit v1.2.3