diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-06-13 20:52:38 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-06-13 20:52:38 +0000 |
commit | 414f6c558b27ab6deb03d4dd49e040c75f298d46 (patch) | |
tree | 3fbba54eeffcdcac7f35f4fb9135781aae707213 | |
parent | 85d8e95e55f3c353ae0355f973b90792e521be9f (diff) | |
download | rockbox-414f6c558b27ab6deb03d4dd49e040c75f298d46.tar.gz rockbox-414f6c558b27ab6deb03d4dd49e040c75f298d46.zip |
Add appropriate sized cards for 640x480 screens based on svg-cards-2.0. SOURCES is setup for 640x480 on a number of plugins as well, but graphics are not committed yet: will add as plugins are tested
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21279 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 3 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 39 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/card_back.74x98x16.bmp | bin | 0 -> 22006 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/card_deck.962x392x16.bmp | bin | 0 -> 1132150 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/solitaire_suitsi.74x392x16.bmp | bin | 0 -> 87862 bytes |
5 files changed, 39 insertions, 3 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index daba9bb4ca..0152e92e0d 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES | |||
@@ -22,6 +22,9 @@ bubbles_bubble.220x176x1.bmp | |||
22 | #elif ((LCD_WIDTH == 320) && (LCD_HEIGHT == 240)) || \ | 22 | #elif ((LCD_WIDTH == 320) && (LCD_HEIGHT == 240)) || \ |
23 | ((LCD_WIDTH == 240) && (LCD_HEIGHT >= 320)) | 23 | ((LCD_WIDTH == 240) && (LCD_HEIGHT >= 320)) |
24 | bubbles_bubble.320x240x1.bmp | 24 | bubbles_bubble.320x240x1.bmp |
25 | #elif ((LCD_WIDTH == 640) && (LCD_HEIGHT == 480)) || \ | ||
26 | ((LCD_WIDTH == 480) && (LCD_HEIGHT == 640)) | ||
27 | bubbles_bubble.640x480x1.bmp | ||
25 | #endif | 28 | #endif |
26 | 29 | ||
27 | /* Flip it */ | 30 | /* Flip it */ |
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 8270161ac4..c21d0ea20a 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -86,7 +86,11 @@ jackpot_slots.30x420x1.bmp | |||
86 | 86 | ||
87 | /* Bubbles */ | 87 | /* Bubbles */ |
88 | #ifdef HAVE_LCD_COLOR | 88 | #ifdef HAVE_LCD_COLOR |
89 | #if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) | 89 | #if ((LCD_WIDTH >= 640) && (LCD_HEIGHT >= 480)) || \ |
90 | ((LCD_WIDTH >= 480) && (LCD_HEIGHT >= 640)) | ||
91 | bubbles_emblem.640x480x16.bmp | ||
92 | bubbles_background.640x480x16.bmp | ||
93 | #elif (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) | ||
90 | bubbles_emblem.320x240x16.bmp | 94 | bubbles_emblem.320x240x16.bmp |
91 | bubbles_background.320x240x16.bmp | 95 | bubbles_background.320x240x16.bmp |
92 | #elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) | 96 | #elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) |
@@ -257,7 +261,22 @@ flipit_tokens.16x26x1.bmp | |||
257 | 261 | ||
258 | /* Invadrox */ | 262 | /* Invadrox */ |
259 | #if defined HAVE_LCD_COLOR | 263 | #if defined HAVE_LCD_COLOR |
260 | #if LCD_WIDTH >= 220 | 264 | #if LCD_WIDTH >= 480 |
265 | invadrox_aliens.24x24x16.bmp | ||
266 | invadrox_alien_explode.13x7x16.bmp | ||
267 | invadrox_ships.16x24x16.bmp | ||
268 | invadrox_bombs.9x42x16.bmp | ||
269 | invadrox_shield.22x16x16.bmp | ||
270 | invadrox_ufo.16x7x16.bmp | ||
271 | invadrox_ufo_explode.21x8x16.bmp | ||
272 | invadrox_numbers.50x7x16.bmp | ||
273 | #if LCD_WIDTH == 480 | ||
274 | invadrox_background.480x640x16.bmp | ||
275 | #elif LCD_WIDTH == 640 | ||
276 | invadrox_background.640x480x16.bmp | ||
277 | #endif | ||
278 | |||
279 | #elif LCD_WIDTH >= 220 | ||
261 | invadrox_aliens.24x24x16.bmp | 280 | invadrox_aliens.24x24x16.bmp |
262 | invadrox_alien_explode.13x7x16.bmp | 281 | invadrox_alien_explode.13x7x16.bmp |
263 | invadrox_ships.16x24x16.bmp | 282 | invadrox_ships.16x24x16.bmp |
@@ -273,6 +292,7 @@ invadrox_background.240x320x16.bmp | |||
273 | #elif LCD_WIDTH == 220 | 292 | #elif LCD_WIDTH == 220 |
274 | invadrox_background.220x176x16.bmp | 293 | invadrox_background.220x176x16.bmp |
275 | #endif | 294 | #endif |
295 | |||
276 | #elif LCD_WIDTH >= 160 | 296 | #elif LCD_WIDTH >= 160 |
277 | invadrox_aliens.16x15x16.bmp | 297 | invadrox_aliens.16x15x16.bmp |
278 | invadrox_alien_explode.10x5x16.bmp | 298 | invadrox_alien_explode.10x5x16.bmp |
@@ -329,6 +349,9 @@ jewels.220x176x16.bmp | |||
329 | jewels.320x240x16.bmp | 349 | jewels.320x240x16.bmp |
330 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 350 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) |
331 | jewels.320x240x16.bmp | 351 | jewels.320x240x16.bmp |
352 | #elif ((LCD_WIDTH == 640) && (LCD_HEIGHT == 480)) || \ | ||
353 | ((LCD_WIDTH == 480) && (LCD_HEIGHT == 640)) | ||
354 | jewels.640x480x16.bmp | ||
332 | #endif | 355 | #endif |
333 | 356 | ||
334 | /* Minesweeper */ | 357 | /* Minesweeper */ |
@@ -544,7 +567,11 @@ sokoban_tiles.4x4x1.bmp | |||
544 | 567 | ||
545 | /* Solitaire and Blackjack */ | 568 | /* Solitaire and Blackjack */ |
546 | #ifdef HAVE_LCD_COLOR | 569 | #ifdef HAVE_LCD_COLOR |
547 | #if LCD_WIDTH >= 320 | 570 | #if LCD_WIDTH >= 640 |
571 | card_back.74x98x16.bmp | ||
572 | card_deck.962x392x16.bmp | ||
573 | solitaire_suitsi.74x392x16.bmp | ||
574 | #elif LCD_WIDTH >= 320 | ||
548 | card_back.37x49x16.bmp | 575 | card_back.37x49x16.bmp |
549 | card_deck.481x196x16.bmp | 576 | card_deck.481x196x16.bmp |
550 | solitaire_suitsi.37x196x16.bmp | 577 | solitaire_suitsi.37x196x16.bmp |
@@ -683,6 +710,10 @@ superdom_boarditems.176x132x16.bmp | |||
683 | superdom_boarditems.320x240x16.bmp | 710 | superdom_boarditems.320x240x16.bmp |
684 | #elif (LCD_WIDTH == 240 && LCD_HEIGHT >= 320) | 711 | #elif (LCD_WIDTH == 240 && LCD_HEIGHT >= 320) |
685 | superdom_boarditems.240x320x16.bmp | 712 | superdom_boarditems.240x320x16.bmp |
713 | #elif (LCD_WIDTH == 480 && LCD_HEIGHT == 640) | ||
714 | superdom_boarditems.480x640x16.bmp | ||
715 | #elif (LCD_WIDTH == 640 && LCD_HEIGHT == 480) | ||
716 | superdom_boarditems.640x480x16.bmp | ||
686 | #endif | 717 | #endif |
687 | #endif | 718 | #endif |
688 | 719 | ||
@@ -712,6 +743,8 @@ sliding_puzzle.132x132x16.bmp | |||
712 | sliding_puzzle.176x176x16.bmp | 743 | sliding_puzzle.176x176x16.bmp |
713 | #elif SMALLER_DIMENSION <= 240 | 744 | #elif SMALLER_DIMENSION <= 240 |
714 | sliding_puzzle.240x240x16.bmp | 745 | sliding_puzzle.240x240x16.bmp |
746 | #elif SMALLER_DIMENSION <= 480 | ||
747 | sliding_puzzle.480x480x16.bmp | ||
715 | #endif | 748 | #endif |
716 | #elif (LCD_DEPTH > 1) | 749 | #elif (LCD_DEPTH > 1) |
717 | #if SMALLER_DIMENSION <= 96 | 750 | #if SMALLER_DIMENSION <= 96 |
diff --git a/apps/plugins/bitmaps/native/card_back.74x98x16.bmp b/apps/plugins/bitmaps/native/card_back.74x98x16.bmp new file mode 100644 index 0000000000..5b7024cb76 --- /dev/null +++ b/apps/plugins/bitmaps/native/card_back.74x98x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/card_deck.962x392x16.bmp b/apps/plugins/bitmaps/native/card_deck.962x392x16.bmp new file mode 100644 index 0000000000..51fe365c2b --- /dev/null +++ b/apps/plugins/bitmaps/native/card_deck.962x392x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.74x392x16.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.74x392x16.bmp new file mode 100644 index 0000000000..7741edabc9 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.74x392x16.bmp | |||
Binary files differ | |||