diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2009-04-07 17:56:16 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2009-04-07 17:56:16 +0000 |
commit | 8b13d87ec3055559ea33ea2b40225ed0cfa00788 (patch) | |
tree | 42d4b87e503c8807542d8fb120522d88de4a5c34 /apps/plugins/bitmaps/native | |
parent | 070ee525acdf22d445eb5f5f41371f5922b675ca (diff) | |
download | rockbox-8b13d87ec3055559ea33ea2b40225ed0cfa00788.tar.gz rockbox-8b13d87ec3055559ea33ea2b40225ed0cfa00788.zip |
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
Diffstat (limited to 'apps/plugins/bitmaps/native')
34 files changed, 44 insertions, 23 deletions
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 | |||
256 | #endif | 256 | #endif |
257 | 257 | ||
258 | /* Invadrox */ | 258 | /* Invadrox */ |
259 | #if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 259 | #if defined HAVE_LCD_COLOR |
260 | invadrox.320x240x16.bmp | 260 | #if LCD_WIDTH >= 220 |
261 | invadrox_left.320x240x16.bmp | 261 | invadrox_aliens.24x24x16.bmp |
262 | invadrox_right.320x240x16.bmp | 262 | invadrox_alien_explode.13x7x16.bmp |
263 | #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) | 263 | invadrox_ships.16x24x16.bmp |
264 | /* Use iPod Video character bitmap */ | 264 | invadrox_bombs.9x42x16.bmp |
265 | invadrox.320x240x16.bmp | 265 | invadrox_shield.22x16x16.bmp |
266 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | 266 | invadrox_ufo.16x7x16.bmp |
267 | /* Use iPod Video character bitmap */ | 267 | invadrox_ufo_explode.21x8x16.bmp |
268 | invadrox.320x240x16.bmp | 268 | invadrox_numbers.50x7x16.bmp |
269 | invadrox_logo.240x320x16.bmp | 269 | #if LCD_WIDTH == 320 |
270 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) | 270 | invadrox_background.320x240x16.bmp |
271 | invadrox.176x132x16.bmp | 271 | #elif LCD_WIDTH == 240 |
272 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 8) | 272 | invadrox_background.240x320x16.bmp |
273 | /* Use iPod Nano character bitmap */ | 273 | #elif LCD_WIDTH == 220 |
274 | invadrox.176x132x16.bmp | 274 | invadrox_background.220x176x16.bmp |
275 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) | ||
276 | /* Grayscale */ | ||
277 | invadrox.160x128x2.bmp | ||
278 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) | ||
279 | /* Use iPod Nano character bitmap */ | ||
280 | invadrox.176x132x16.bmp | ||
281 | invadrox_logo.176x220x16.bmp | ||
282 | #endif | 275 | #endif |
276 | #elif LCD_WIDTH >= 160 | ||
277 | invadrox_aliens.16x15x16.bmp | ||
278 | invadrox_alien_explode.10x5x16.bmp | ||
279 | invadrox_ships.10x15x16.bmp | ||
280 | invadrox_bombs.9x30x16.bmp | ||
281 | invadrox_shield.15x10x16.bmp | ||
282 | invadrox_ufo.11x5x16.bmp | ||
283 | invadrox_ufo_explode.14x5x16.bmp | ||
284 | invadrox_numbers.40x5x16.bmp | ||
285 | #if LCD_WIDTH == 176 && LCD_HEIGHT == 220 | ||
286 | invadrox_background.176x220x16.bmp | ||
287 | #elif LCD_WIDTH == 176 && LCD_HEIGHT == 132 | ||
288 | invadrox_background.176x132x16.bmp | ||
289 | #elif LCD_WIDTH == 160 && LCD_HEIGHT == 128 | ||
290 | invadrox_background.160x128x16.bmp | ||
291 | #endif | ||
292 | #endif /* LCD_WIDTH */ | ||
293 | #elif LCD_DEPTH == 2 /* Greyscale */ | ||
294 | invadrox_aliens.16x15x16.bmp | ||
295 | invadrox_alien_explode.10x5x16.bmp | ||
296 | invadrox_ships.10x15x2.bmp | ||
297 | invadrox_bombs.9x30x16.bmp | ||
298 | invadrox_shield.15x10x2.bmp | ||
299 | invadrox_ufo.11x5x2.bmp | ||
300 | invadrox_ufo_explode.14x5x2.bmp | ||
301 | invadrox_numbers.40x5x16.bmp | ||
302 | invadrox_background.160x128x16.bmp | ||
303 | #endif /* colour depth */ | ||
283 | 304 | ||
284 | /* Jewels */ | 305 | /* Jewels */ |
285 | #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) | 306 | #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 --- a/apps/plugins/bitmaps/native/invadrox.160x128x2.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/native/invadrox.176x132x16.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/native/invadrox.320x240x16.bmp +++ /dev/null | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_alien_explode.10x5x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_alien_explode.13x7x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_aliens.16x15x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_aliens.24x24x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_background.160x128x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_background.176x132x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_background.176x220x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_background.220x176x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_background.240x320x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_background.320x240x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_bombs.9x30x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_bombs.9x42x16.bmp | |||
Binary files 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 --- a/apps/plugins/bitmaps/native/invadrox_left.320x240x16.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/native/invadrox_logo.176x220x16.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/native/invadrox_logo.240x320x16.bmp +++ /dev/null | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_numbers.40x5x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_numbers.50x7x16.bmp | |||
Binary files 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 --- a/apps/plugins/bitmaps/native/invadrox_right.320x240x16.bmp +++ /dev/null | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_shield.15x10x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_shield.15x10x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_shield.22x16x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ships.10x15x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ships.10x15x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ships.16x24x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ufo.11x5x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ufo.11x5x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ufo.16x7x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ufo_explode.14x5x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/invadrox_ufo_explode.21x8x16.bmp | |||
Binary files differ | |||