summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-09-08 01:26:09 +0000
committerJens Arnold <amiconn@rockbox.org>2006-09-08 01:26:09 +0000
commitbd3c18e271a45b6811229b7260d243bc5e280c1c (patch)
tree48b8c9c5f7041018e1a57f9c810830c0a217559f /apps
parent7d7b704ee2017f28aa6e5276c787edfdc5076142 (diff)
downloadrockbox-bd3c18e271a45b6811229b7260d243bc5e280c1c.tar.gz
rockbox-bd3c18e271a45b6811229b7260d243bc5e280c1c.tar.bz2
rockbox-bd3c18e271a45b6811229b7260d243bc5e280c1c.zip
Fire: * Improved greyscale palette. * Fixed colour mode (palette was inverted, an d the multiplication factor was chosen in a way that the 'flames' heated up infinitely (avalanche effect). * Better adjustment to the various LCD sizes. * Tweaks and cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10902 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/fire.c200
1 files changed, 97 insertions, 103 deletions
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c
index 82770f3132..d161f577f5 100644
--- a/apps/plugins/fire.c
+++ b/apps/plugins/fire.c
@@ -31,12 +31,13 @@ PLUGIN_HEADER
/******************************* Globals ***********************************/
static struct plugin_api* rb; /* global api struct pointer */
-static unsigned char *gbuf;
-static unsigned int gbuf_size = 0;
static unsigned char fire[LCD_HEIGHT+3][LCD_WIDTH];
static unsigned char cooling_map[LCD_HEIGHT][LCD_WIDTH];
+
#ifndef HAVE_LCD_COLOR
+static unsigned char *gbuf;
+static unsigned int gbuf_size = 0;
static unsigned char draw_buffer[8*LCD_WIDTH];
#endif
@@ -96,94 +97,93 @@ static unsigned char draw_buffer[8*LCD_WIDTH];
#endif
#define MIN_FLAME_VALUE 0
-#if LCD_HEIGHT > 64
-#define COOL_MAX 5
-#else
-#define COOL_MAX 8
+#define COOL_MAX (440/LCD_HEIGHT+2)
+
+/* fast unsigned multiplication (16x16bit->32bit or 32x32bit->32bit,
+ * whichever is faster for the architecture) */
+#ifdef CPU_ARM
+#define FMULU(a, b) ((uint32_t) (((uint32_t) (a)) * ((uint32_t) (b))))
+#else /* SH1, coldfire */
+#define FMULU(a, b) ((uint32_t) (((uint16_t) (a)) * ((uint16_t) (b))))
#endif
-/* unsigned 16 bit multiplication (a single instruction on the SH) */
-#define MULU16(a, b) ((unsigned long) \
- (((unsigned short) (a)) * ((unsigned short) (b))))
-
#ifndef HAVE_LCD_COLOR
-static const unsigned char palette[255]=
-{/* logarithmic histogram equalisation */
-
- 0, 15, 31, 50, 63, 74, 82, 89, 95, 101, 105, 110, 114, 118, 121,
- 124, 127, 130, 133, 135, 137, 140, 142, 144, 146, 148, 149, 151, 153, 154,
- 156, 158, 159, 160, 162, 163, 164, 166, 167, 168, 169, 170, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 180, 181, 182, 183, 184, 185, 186, 186, 187,
- 188, 189, 189, 190, 191, 192, 192, 193, 194, 194, 195, 196, 196, 197, 198,
- 198, 199, 199, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 206, 206,
- 207, 207, 208, 208, 209, 209, 210, 210, 210, 211, 211, 212, 212, 213, 213,
- 214, 214, 215, 215, 215, 216, 216, 217, 217, 217, 218, 218, 219, 219, 219,
- 220, 220, 221, 221, 221, 222, 222, 222, 223, 223, 223, 224, 224, 225, 225,
- 225, 226, 226, 226, 227, 227, 227, 228, 228, 228, 229, 229, 229, 229, 230,
- 230, 230, 231, 231, 231, 232, 232, 232, 232, 233, 233, 233, 234, 234, 234,
- 234, 235, 235, 235, 236, 236, 236, 236, 237, 237, 237, 237, 238, 238, 238,
- 238, 239, 239, 239, 239, 240, 240, 240, 240, 241, 241, 241, 241, 242, 242,
- 242, 242, 243, 243, 243, 243, 244, 244, 244, 244, 244, 245, 245, 245, 245,
- 246, 246, 246, 246, 246, 247, 247, 247, 247, 247, 248, 248, 248, 248, 249,
- 249, 249, 249, 249, 250, 250, 250, 250, 250, 251, 251, 251, 251, 251, 252,
- 252, 252, 252, 252, 252, 253, 253, 253, 253, 253, 254, 254, 254, 254, 254
+static const unsigned char palette[256] = {
+ 0, 1, 3, 4, 6, 7, 9, 10, 12, 13, 15, 16, 18, 19, 21, 22,
+ 24, 25, 27, 28, 30, 31, 33, 34, 36, 37, 39, 40, 42, 43, 45, 46,
+ 48, 49, 51, 52, 54, 55, 57, 59, 60, 61, 63, 64, 66, 67, 69, 70,
+ 72, 73, 75, 76, 78, 79, 81, 82, 84, 85, 87, 88, 90, 91, 93, 94,
+ 96, 97, 99, 100, 102, 103, 105, 106, 108, 109, 111, 112, 114, 115, 117, 118,
+ 120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 142,
+ 144, 145, 147, 148, 150, 151, 153, 154, 156, 157, 159, 160, 162, 163, 165, 166,
+ 168, 169, 171, 172, 174, 175, 177, 178, 180, 181, 183, 184, 186, 187, 189, 190,
+ 192, 193, 195, 196, 198, 199, 201, 202, 204, 205, 207, 208, 210, 211, 213, 214,
+ 216, 217, 219, 220, 222, 223, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238,
+ /* 'regular' fire doesn't exceed this value */
+ 240, 240, 240, 240, 240, 240, 241, 241, 241, 241, 241, 241, 242, 242, 242, 242,
+ 242, 242, 243, 243, 243, 243, 243, 243, 244, 244, 244, 244, 244, 244, 245, 245,
+ 245, 245, 245, 245, 246, 246, 246, 246, 246, 246, 247, 247, 247, 247, 247, 247,
+ 248, 248, 248, 248, 248, 248, 249, 249, 249, 249, 249, 249, 250, 250, 250, 250,
+ 250, 250, 251, 251, 251, 251, 251, 251, 252, 252, 252, 252, 252, 252, 253, 253,
+ 253, 253, 253, 253, 254, 254, 254, 254, 254, 254, 255, 255, 255, 255, 255, 255
};
#else
#define L(r,g,b) LCD_RGBPACK(r,g,b)
static const fb_data colorpalette[256] = {
-L(248,246,211), L(248,246,203), L(248,245,196), L(248,245,189), L(247,245,182),
-L(248,245,174), L(248,244,167), L(248,244,160), L(248,243,153), L(247,243,145),
-L(248,243,138), L(247,243,131), L(247,243,125), L(248,242,117), L(248,242,110),
-L(247,242,102), L(248,241, 94), L(247,240, 85), L(247,241, 78), L(248,240, 70),
-L(247,239, 63), L(247,240, 55), L(247,239, 47), L(247,239, 39), L(247,238, 31),
-L(247,238, 23), L(247,236, 19), L(248,232, 21), L(248,228, 22), L(248,224, 23),
-L(248,219, 25), L(249,215, 26), L(249,211, 27), L(249,206, 29), L(249,203, 30),
-L(249,199, 31), L(250,194, 33), L(250,190, 34), L(251,186, 35), L(251,181, 37),
-L(252,177, 38), L(251,172, 40), L(252,168, 41), L(252,163, 42), L(253,158, 44),
-L(253,154, 45), L(253,149, 46), L(254,145, 48), L(253,141, 50), L(253,137, 49),
-L(253,135, 49), L(252,133, 48), L(251,130, 47), L(249,129, 47), L(248,128, 46),
-L(247,125, 46), L(247,124, 44), L(246,122, 44), L(244,119, 43), L(243,118, 43),
-L(242,115, 42), L(242,113, 41), L(241,112, 40), L(240,109, 39), L(238,107, 39),
-L(237,105, 38), L(236,103, 37), L(235,101, 37), L(234, 99, 36), L(233, 97, 35),
-L(232, 95, 34), L(231, 93, 33), L(230, 91, 32), L(229, 89, 32), L(228, 86, 31),
-L(227, 85, 30), L(226, 82, 29), L(225, 80, 29), L(224, 78, 28), L(223, 76, 28),
-L(222, 74, 26), L(221, 72, 26), L(220, 69, 25), L(218, 67, 24), L(217, 64, 23),
-L(215, 60, 22), L(213, 57, 21), L(212, 54, 19), L(210, 50, 18), L(208, 47, 17),
-L(207, 44, 16), L(205, 41, 14), L(203, 37, 13), L(202, 34, 12), L(201, 30, 11),
-L(199, 27, 10), L(197, 24, 9), L(196, 21, 8), L(194, 18, 7), L(192, 14, 5),
-L(191, 11, 4), L(189, 8, 3), L(187, 5, 1), L(186, 2, 0), L(184, 0, 0),
-L(181, 0, 0), L(178, 0, 0), L(175, 0, 0), L(172, 0, 0), L(170, 0, 0),
-L(167, 0, 0), L(165, 0, 0), L(162, 0, 0), L(159, 0, 0), L(156, 0, 0),
-L(153, 0, 0), L(152, 0, 0), L(149, 0, 0), L(146, 0, 0), L(143, 0, 0),
-L(141, 0, 0), L(138, 0, 0), L(135, 0, 0), L(132, 0, 0), L(129, 0, 0),
-L(127, 0, 0), L(126, 0, 0), L(123, 0, 0), L(120, 0, 0), L(117, 0, 0),
-L(115, 0, 0), L(112, 0, 0), L(109, 0, 0), L(106, 0, 0), L(104, 0, 0),
-L(101, 0, 0), L( 98, 0, 0), L( 95, 0, 0), L( 93, 0, 0), L( 92, 0, 0),
-L( 91, 0, 0), L( 91, 0, 0), L( 90, 0, 0), L( 89, 0, 0), L( 88, 0, 0),
-L( 88, 0, 0), L( 87, 0, 0), L( 86, 0, 0), L( 85, 0, 0), L( 84, 0, 0),
-L( 84, 0, 0), L( 82, 0, 0), L( 82, 0, 0), L( 81, 0, 0), L( 80, 0, 0),
-L( 80, 0, 0), L( 79, 0, 0), L( 78, 0, 0), L( 77, 0, 0), L( 76, 0, 0),
-L( 76, 0, 0), L( 75, 0, 0), L( 74, 0, 0), L( 73, 0, 0), L( 72, 0, 0),
-L( 72, 0, 0), L( 71, 0, 0), L( 70, 0, 0), L( 69, 0, 0), L( 68, 0, 0),
-L( 68, 0, 0), L( 67, 0, 0), L( 66, 0, 0), L( 65, 0, 0), L( 65, 0, 0),
-L( 63, 0, 0), L( 62, 0, 0), L( 62, 0, 0), L( 61, 0, 0), L( 60, 0, 0),
-L( 59, 0, 0), L( 58, 0, 0), L( 58, 0, 0), L( 58, 0, 0), L( 57, 0, 0),
-L( 56, 0, 0), L( 54, 0, 0), L( 54, 0, 0), L( 53, 0, 0), L( 52, 0, 0),
-L( 52, 0, 0), L( 51, 0, 0), L( 50, 0, 0), L( 49, 0, 0), L( 48, 0, 0),
-L( 47, 0, 0), L( 47, 0, 0), L( 46, 0, 0), L( 45, 0, 0), L( 44, 0, 0),
-L( 44, 0, 0), L( 43, 0, 0), L( 42, 0, 0), L( 42, 0, 0), L( 40, 0, 0),
-L( 40, 0, 0), L( 39, 0, 0), L( 38, 0, 0), L( 38, 0, 0), L( 37, 0, 0),
-L( 36, 0, 0), L( 35, 0, 0), L( 34, 0, 0), L( 33, 0, 0), L( 32, 0, 0),
-L( 32, 0, 0), L( 31, 0, 0), L( 30, 0, 0), L( 30, 0, 0), L( 28, 0, 0),
-L( 28, 0, 0), L( 27, 0, 0), L( 26, 0, 0), L( 25, 0, 0), L( 25, 0, 0),
-L( 23, 0, 0), L( 23, 0, 0), L( 22, 0, 0), L( 21, 0, 0), L( 21, 0, 0),
-L( 20, 0, 0), L( 19, 0, 0), L( 18, 0, 0), L( 18, 0, 0), L( 16, 0, 0),
-L( 16, 0, 0), L( 15, 0, 0), L( 14, 0, 0), L( 14, 0, 0), L( 13, 0, 0),
-L( 12, 0, 0), L( 11, 0, 0), L( 10, 0, 0), L( 9, 0, 0), L( 9, 0, 0),
-L( 8, 0, 0), L( 7, 0, 0), L( 6, 0, 0), L( 5, 0, 0), L( 5, 0, 0),
-L( 4, 0, 0), L( 3, 0, 0), L( 3, 0, 0), L( 2, 0, 0), L( 1, 0, 0),
-L( 0, 0, 0)
+ L( 0, 0, 0), L( 5, 0, 0), L( 10, 0, 0), L( 15, 0, 0), L( 20, 0, 0),
+ L( 25, 0, 0), L( 30, 0, 0), L( 35, 0, 0), L( 40, 0, 0), L( 45, 0, 0),
+ L( 50, 0, 0), L( 55, 0, 0), L( 60, 0, 0), L( 65, 0, 0), L( 70, 0, 0),
+ L( 75, 0, 0), L( 80, 0, 0), L( 85, 0, 0), L( 90, 0, 0), L( 95, 0, 0),
+ L(100, 0, 0), L(105, 0, 0), L(110, 0, 0), L(115, 0, 0), L(120, 0, 0),
+ L(125, 0, 0), L(130, 0, 0), L(135, 0, 0), L(140, 0, 0), L(145, 0, 0),
+ L(150, 0, 0), L(155, 0, 0), L(160, 0, 0), L(165, 0, 0), L(170, 0, 0),
+ L(175, 0, 0), L(180, 0, 0), L(185, 0, 0), L(186, 2, 0), L(187, 5, 1),
+ L(188, 6, 2), L(189, 8, 3), L(190, 10, 4), L(191, 12, 4), L(192, 14, 5),
+ L(193, 15, 6), L(194, 17, 7), L(195, 19, 8), L(196, 21, 8), L(197, 22, 9),
+ L(198, 24, 10), L(198, 26, 10), L(199, 28, 10), L(200, 29, 11), L(201, 32, 11),
+ L(202, 34, 12), L(203, 36, 13), L(204, 39, 13), L(205, 40, 14), L(206, 42, 14),
+ L(207, 43, 15), L(208, 46, 16), L(208, 48, 17), L(209, 50, 18), L(210, 51, 18),
+ L(212, 53, 19), L(213, 55, 20), L(214, 57, 21), L(215, 59, 22), L(216, 61, 22),
+ L(217, 63, 23), L(217, 65, 24), L(218, 67, 24), L(219, 69, 25), L(220, 70, 25),
+ L(222, 72, 26), L(223, 74, 27), L(224, 76, 28), L(225, 78, 28), L(225, 80, 29),
+ L(226, 82, 29), L(227, 84, 30), L(228, 86, 31), L(228, 88, 32), L(229, 90, 32),
+ L(230, 92, 32), L(231, 94, 33), L(232, 96, 34), L(233, 98, 35), L(234, 99, 36),
+ L(235,101, 37), L(236,103, 37), L(237,105, 38), L(238,107, 39), L(240,109, 39),
+ L(240,111, 40), L(241,113, 40), L(242,114, 41), L(242,116, 42), L(243,119, 43),
+ L(245,120, 43), L(246,122, 44), L(247,124, 44), L(248,126, 46), L(248,128, 47),
+ L(249,130, 47), L(251,131, 47), L(252,133, 48), L(253,135, 49), L(253,138, 49),
+ L(253,140, 50), L(254,143, 49), L(254,145, 48), L(253,148, 47), L(253,151, 46),
+ L(253,154, 45), L(253,156, 44), L(253,158, 44), L(252,162, 42), L(252,165, 41),
+ L(252,167, 41), L(252,170, 40), L(251,173, 40), L(252,175, 38), L(252,178, 37),
+ L(251,181, 37), L(251,183, 36), L(251,186, 35), L(250,189, 34), L(250,192, 33),
+ L(250,194, 33), L(249,198, 31), L(249,200, 31), L(249,203, 30), L(249,206, 29),
+ L(249,209, 28), L(249,211, 27), L(249,214, 26), L(248,216, 25), L(248,219, 25),
+ L(248,222, 24), L(248,224, 23), L(248,227, 22), L(248,230, 21), L(248,232, 21),
+ L(247,236, 19), L(247,238, 23), L(247,239, 31), L(247,239, 45), L(247,240, 55),
+ L(248,240, 68), L(247,241, 78), L(248,241, 90), L(247,242,102), L(248,242,114),
+ L(247,243,125), L(248,243,138), L(248,243,153), L(248,244,162), L(248,245,174),
+ /* 'regular' fire doesn't exceed this value */
+ L(247,245,182), L(247,245,182), L(247,245,183), L(247,245,183), L(247,245,184),
+ L(247,245,184), L(247,245,185), L(247,245,185), L(247,245,186), L(247,245,186),
+ L(247,245,187), L(247,245,187), L(247,245,188), L(247,245,188), L(247,245,189),
+ L(247,245,189), L(248,245,190), L(248,245,190), L(248,245,191), L(248,245,191),
+ L(248,245,192), L(248,245,192), L(248,245,193), L(248,245,193), L(248,245,194),
+ L(248,245,194), L(248,245,195), L(248,245,195), L(248,245,196), L(248,245,196),
+ L(248,245,197), L(248,245,197), L(248,245,198), L(248,245,198), L(248,245,199),
+ L(248,245,199), L(248,245,200), L(248,245,200), L(248,245,201), L(248,245,201),
+ L(248,245,202), L(248,245,202), L(248,245,203), L(248,245,203), L(248,245,204),
+ L(248,245,204), L(248,245,205), L(248,245,205), L(248,246,206), L(248,246,206),
+ L(248,246,207), L(248,246,207), L(248,246,208), L(248,246,208), L(248,246,209),
+ L(248,246,209), L(248,246,210), L(248,246,210), L(248,246,211), L(248,246,211),
+ L(248,246,212), L(248,246,212), L(248,246,213), L(248,246,213), L(248,246,214),
+ L(248,246,214), L(248,246,215), L(248,246,215), L(248,246,216), L(248,246,216),
+ L(248,246,217), L(248,246,217), L(248,246,218), L(248,246,218), L(248,246,219),
+ L(248,246,219), L(248,246,220), L(248,246,220), L(248,246,221), L(248,246,221),
+ L(248,246,222), L(248,246,222), L(248,246,223), L(248,246,223), L(248,246,224),
+ L(248,246,224), L(248,246,225), L(248,246,225), L(248,246,226), L(248,246,226),
+ L(248,246,227), L(248,246,227), L(248,246,228), L(248,246,228), L(248,246,229),
+ L(248,246,229)
};
#endif
@@ -230,7 +230,7 @@ static inline void fire_generate(int mult, int flames_type, bool moving)
+ ptr[2*LCD_WIDTH] /* fire[y+2][x] */
+ ptr[LCD_WIDTH+1] /* fire[y+1][x+1] */
+ ptr[3*LCD_WIDTH]; /* fire[y+3][x] */
- pixel_value = MULU16(pixel_value, mult) >> 10;
+ pixel_value = FMULU(pixel_value, mult) >> 10;
cooling_value = *cool++;
if (cooling_value <= pixel_value)
@@ -246,13 +246,14 @@ static inline void fire_generate(int mult, int flames_type, bool moving)
break;
case 1:
+ mult -= 2;
do
{
pixel_value = ptr[LCD_WIDTH-1] /* fire[y+1][x-1] */
+ ptr[LCD_WIDTH] /* fire[y+1][x] */
+ ptr[LCD_WIDTH+1] /* fire[y+1][x+1] */
+ ptr[2*LCD_WIDTH]; /* fire[y+2][x] */
- pixel_value = MULU16(pixel_value, mult) >> 10;
+ pixel_value = FMULU(pixel_value, mult) >> 10;
cooling_value = *cool++;
if (cooling_value <= pixel_value)
@@ -296,10 +297,10 @@ static inline void fire_draw(void)
fb_data* end = rb->lcd_framebuffer+(LCD_WIDTH*LCD_HEIGHT);
unsigned char* src = &fire[0][0];
- while (dest < end)
- {
- *(dest++) = colorpalette[*(src++)];
- }
+ do
+ *dest++ = colorpalette[*src++];
+ while (dest < end);
+
rb->lcd_update();
#endif
}
@@ -324,36 +325,29 @@ void cleanup(void *parameter)
int main(void)
{
- int shades, button;
-#ifdef HAVE_LCD_COLOR
- int mult = 267;
-#else
+ int button;
int mult = 261;
-#endif
int flames_type=0;
bool moving=true;
+#ifndef HAVE_LCD_COLOR
+ int shades;
+
/* get the remainder of the plugin buffer */
gbuf = (unsigned char *) rb->plugin_get_buffer(&gbuf_size);
-
-#ifdef HAVE_LCD_COLOR
- shades = 256;
-#else
shades = gray_init(rb, gbuf, gbuf_size, false, LCD_WIDTH, LCD_HEIGHT,
- 32, 2<<8, NULL) + 1;
+ 32, 1<<8, NULL) + 1;
if(shades <= 1)
{
rb->splash(HZ, true, "not enough memory");
return PLUGIN_ERROR;
}
+ /* switch on grayscale overlay */
+ gray_show(true);
#endif
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
rb->cpu_boost(true);
#endif
-#ifndef HAVE_LCD_COLOR
- /* switch on grayscale overlay */
- gray_show(true);
-#endif
rb->memset(&fire[0][0], 0, sizeof(fire));
tab_init_rand(&cooling_map[0][0], LCD_HEIGHT*LCD_WIDTH, COOL_MAX);
while (true)
@@ -369,7 +363,7 @@ int main(void)
#ifdef FIRE_RC_QUIT
case FIRE_RC_QUIT :
#endif
- case(FIRE_QUIT):
+ case (FIRE_QUIT):
cleanup(NULL);
return PLUGIN_OK;
break;