Enlightenment CVS committal
Author : onefang
Project : e_modules
Module : flame
Dir : e_modules/flame
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Converted to premul, now gold works again.
===================================================================
RCS file: /cvs/e/e_modules/flame/e_mod_config.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_mod_config.c 27 Nov 2006 13:33:32 -0000 1.30
+++ e_mod_config.c 8 Dec 2006 14:45:22 -0000 1.31
@@ -88,8 +88,8 @@
o = e_widget_list_add (evas, 0, 0);
of = e_widget_framelist_add (evas, D_ ("Flame Color"), 0);
rg = e_widget_radio_group_new (&(cfdata->palette));
-// ob = e_widget_radio_add (evas, D_ ("Gold"), GOLD_PALETTE, rg);
-// e_widget_framelist_object_append (of, ob);
+ ob = e_widget_radio_add (evas, D_ ("Gold"), GOLD_PALETTE, rg);
+ e_widget_framelist_object_append (of, ob);
ob = e_widget_radio_add (evas, D_ ("Fire"), FIRE_PALETTE, rg);
e_widget_framelist_object_append (of, ob);
ob = e_widget_radio_add (evas, D_ ("Plasma"), PLASMA_PALETTE, rg);
@@ -116,8 +116,8 @@
switch (cfdata->palette)
{
case 1:
-// f->conf->palette_type = GOLD_PALETTE; // Gold
-// break;
+ f->conf->palette_type = GOLD_PALETTE; // Gold
+ break;
case 2:
f->conf->palette_type = FIRE_PALETTE; //Fire
f->conf->r = 0;
===================================================================
RCS file: /cvs/e/e_modules/flame/e_mod_main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_mod_main.c 27 Nov 2006 13:33:32 -0000 1.27
+++ e_mod_main.c 8 Dec 2006 14:45:22 -0000 1.28
@@ -157,8 +157,8 @@
f->conf->r = 160;
f->conf->g = 40;
f->conf->b = 0;
-// f->conf->palette_type = GOLD_PALETTE;
- f->conf->palette_type = FIRE_PALETTE;
+ f->conf->palette_type = GOLD_PALETTE;
+// f->conf->palette_type = FIRE_PALETTE;
}
E_CONFIG_LIMIT (f->conf->height, 4, 4096);
E_CONFIG_LIMIT (f->conf->hspread, 1, 100);
@@ -169,8 +169,8 @@
E_CONFIG_LIMIT (f->conf->r, 0, 300);
E_CONFIG_LIMIT (f->conf->g, 0, 300);
E_CONFIG_LIMIT (f->conf->b, 0, 300);
-// E_CONFIG_LIMIT (f->conf->palette_type, GOLD_PALETTE, CUSTOM_PALETTE);
- E_CONFIG_LIMIT (f->conf->palette_type, FIRE_PALETTE, CUSTOM_PALETTE);
+ E_CONFIG_LIMIT (f->conf->palette_type, GOLD_PALETTE, CUSTOM_PALETTE);
+// E_CONFIG_LIMIT (f->conf->palette_type, FIRE_PALETTE, CUSTOM_PALETTE);
managers = e_manager_list ();
for (l = managers; l; l = l->next)
@@ -232,8 +232,8 @@
switch (type)
{
case GOLD_PALETTE:
-// _flame_palette_gold_set (f->face);
-// break;
+ _flame_palette_gold_set (f->face);
+ break;
case FIRE_PALETTE:
_flame_palette_fire_set (f->face);
break;
@@ -412,10 +412,16 @@
for (i = 0; i < 300; i++)
{
+ int r, g, b, a;
+
+ a = gold_cmap[(i * 4) + 3];
+ r = gold_cmap[(i * 4) + 0];
+ g = gold_cmap[(i * 4) + 1];
+ b = gold_cmap[(i * 4) + 2];
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
ff->palette[i] =
- (gold_cmap[(i * 4) + 3] << 24) |
- (gold_cmap[(i * 4) + 0] << 16) | (gold_cmap[(i * 4) + 1] << 8) |
- (gold_cmap[(i * 4) + 2]);
+ ((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
+ (((unsigned char) g) << 8) | ((unsigned char) b));
}
}
@@ -443,6 +449,7 @@
if (b > 255)
b = 255;
a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
ff->palette[i] =
((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
(((unsigned char) g) << 8) | ((unsigned char) b));
@@ -453,7 +460,7 @@
static void
_flame_palette_plasma_set (Flame_Face * ff)
{
- int i, r, g, b, a;
+ int i, r, g, b, a = 0;
for (i = 0; i < 80; i++)
{
@@ -461,6 +468,7 @@
g = 0;
b = (i * 255) / 80;
a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
ff->palette[i] =
((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
(((unsigned char) g) << 8) | ((unsigned char) b));
@@ -472,15 +480,13 @@
b = 255;
if ((r * r + g * g + b * b) <= 100)
- ff->palette[i] =
- ((r * r + g * g +
- b *
- b) | (((unsigned char) r) << 16) | (((unsigned char) g) << 8) |
- ((unsigned char) b));
+ a = (r * r + g * g + b * b);
else
- ff->palette[i] =
- ((255 << 24) | (((unsigned char) r) << 16) |
- (((unsigned char) g) << 8) | ((unsigned char) b));
+ a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
+ ff->palette[i] =
+ ((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
+ (((unsigned char) g) << 8) | ((unsigned char) b));
}
for (i = 160; i < 300; i++)
{
@@ -489,15 +495,13 @@
b = 255;
if ((r * r + g * g + b * b) <= 100)
- ff->palette[i] =
- ((r * r + g * g +
- b *
- b) | (((unsigned char) r) << 16) | (((unsigned char) g) << 8) |
- ((unsigned char) b));
+ a = r * r + g * g + b * b;
else
- ff->palette[i] =
- ((255 << 24) | (((unsigned char) r) << 16) |
- (((unsigned char) g) << 8) | ((unsigned char) b));
+ a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
+ ff->palette[i] =
+ ((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
+ (((unsigned char) g) << 8) | ((unsigned char) b));
}
}
@@ -525,6 +529,7 @@
if (b > 255)
b = 255;
a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
ff->palette[i] =
((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
(((unsigned char) g) << 8) | ((unsigned char) b));
@@ -555,6 +560,7 @@
if (b > 255)
b = 255;
a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
ff->palette[i] =
((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
(((unsigned char) g) << 8) | ((unsigned char) b));
@@ -585,6 +591,7 @@
if (b > 255)
b = 255;
a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
ff->palette[i] =
((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
(((unsigned char) g) << 8) | ((unsigned char) b));
@@ -617,6 +624,7 @@
if (b > 255)
b = 255;
a = (int) ((r * 0.299) + (g * 0.587) + (b * 0.114));
+ evas_common_convert_color_argb_premul(a, &r, &g, &b);
ff->palette[i] =
((((unsigned char) a) << 24) | (((unsigned char) r) << 16) |
(((unsigned char) g) << 8) | ((unsigned char) b));
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
