notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tintable grass

Browse source
This commit is contained in:
Albert Cahalan 2004-12-18 08:01:18 +00:00
parent 67399fdd25
commit 0831554ea0
1 changed files with 49 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/tuxpaint.c
View file

@ -1221,7 +1221,7 @@ static void mainloop(void)
stamp_tintable(cur_stamp)); stamp_tintable(cur_stamp));
} }
else if (cur_tool == TOOL_MAGIC && else if (cur_tool == TOOL_MAGIC &&
(cur_magic == MAGIC_FILL || (cur_magic == MAGIC_FILL || cur_magic == MAGIC_GRASS ||
cur_magic == MAGIC_TINT)) cur_magic == MAGIC_TINT))
{ {
draw_colors(1); draw_colors(1);
@ -1551,7 +1551,7 @@ static void mainloop(void)
stamp_tintable(cur_stamp)); stamp_tintable(cur_stamp));
} }
else if (cur_tool == TOOL_MAGIC && else if (cur_tool == TOOL_MAGIC &&
(cur_magic == MAGIC_FILL || (cur_magic == MAGIC_FILL || cur_magic == MAGIC_GRASS ||
cur_magic == MAGIC_TINT)) cur_magic == MAGIC_TINT))
{ {
draw_colors(1); draw_colors(1);
@ -1661,7 +1661,7 @@ static void mainloop(void)
rainbow_color = 0; rainbow_color = 0;
draw_magic(); draw_magic();
if (cur_magic == MAGIC_FILL || if (cur_magic == MAGIC_FILL || cur_magic == MAGIC_GRASS ||
cur_magic == MAGIC_TINT) cur_magic == MAGIC_TINT)
draw_colors(1); draw_colors(1);
else else
@ -2063,7 +2063,7 @@ static void mainloop(void)
{ {
if (cur_thing != cur_magic) if (cur_thing != cur_magic)
{ {
if (cur_thing == MAGIC_FILL || if (cur_thing == MAGIC_FILL || cur_magic == MAGIC_GRASS ||
cur_thing == MAGIC_TINT) cur_thing == MAGIC_TINT)
draw_colors(1); draw_colors(1);
else else
@ -2099,7 +2099,7 @@ static void mainloop(void)
(cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES || (cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES ||
cur_tool == TOOL_SHAPES || cur_tool == TOOL_TEXT || cur_tool == TOOL_SHAPES || cur_tool == TOOL_TEXT ||
(cur_tool == TOOL_MAGIC && (cur_tool == TOOL_MAGIC &&
(cur_magic == MAGIC_FILL || (cur_magic == MAGIC_FILL || cur_magic == MAGIC_GRASS ||
cur_magic == MAGIC_TINT)) || cur_magic == MAGIC_TINT)) ||
(cur_tool == TOOL_STAMP && (cur_tool == TOOL_STAMP &&
(stamp_colorable(cur_stamp) || (stamp_colorable(cur_stamp) ||
@ -2492,7 +2492,7 @@ static void mainloop(void)
{ {
if (cur_thing != cur_magic) if (cur_thing != cur_magic)
{ {
if (cur_thing == MAGIC_FILL || if (cur_thing == MAGIC_FILL || cur_magic == MAGIC_GRASS ||
cur_thing == MAGIC_TINT) cur_thing == MAGIC_TINT)
draw_colors(1); draw_colors(1);
else else
@ -4082,7 +4082,7 @@ static void blit_magic(int x, int y, int button_down)
{ {
int xx, yy, w, h; int xx, yy, w, h;
Uint32 colr; Uint32 colr;
Uint8 r, g, b; Uint8 r, g, b, a;
SDL_Surface * last; SDL_Surface * last;
SDL_Rect src, dest; SDL_Rect src, dest;
int undo_ctr; int undo_ctr;
@ -4485,19 +4485,57 @@ static void blit_magic(int x, int y, int button_down)
} }
else if (cur_magic == MAGIC_GRASS) else if (cur_magic == MAGIC_GRASS)
{ {
int rank = ((double)y/canvas->h) * (0.99+(rand()/(double)RAND_MAX)) * 4; // grass color: 82,180,17
int ah = 1<<rank; static int bucket;
if ((rand() % 256) > ah && ((rand() % 10) < 2)) if (!button_down)
bucket = 0;
bucket += (3.5+(rand()/(double)RAND_MAX)) * 7.0;
while (bucket >= 0)
{ {
int rank = ((double)y/canvas->h) * (0.99+(rand()/(double)RAND_MAX)) * 4;
int ah = 1<<rank;
bucket -= ah;
src.x = (rand() % 4) * 64; src.x = (rand() % 4) * 64;
src.y = ah; src.y = ah;
src.w = 64; src.w = 64;
src.h = ah; src.h = ah;
dest.x = x - 32; dest.x = x - 32;
dest.y = y; dest.y = y - 30 + (int)((rand()/(double)RAND_MAX)*30);
#if 1
// grass color: 82,180,17
double tmp_red = sRGB_to_linear_table[color_hexes[cur_color][0]]*2.0 + (rand()/(double)RAND_MAX);
double tmp_green = sRGB_to_linear_table[color_hexes[cur_color][1]]*2.0 + (rand()/(double)RAND_MAX);
double tmp_blue = sRGB_to_linear_table[color_hexes[cur_color][2]]*2.0 + sRGB_to_linear_table[17];
for (yy = 0; yy < ah; yy++)
{
for (xx = 0; xx < 64; xx++)
{
SDL_GetRGBA(getpixel(img_grass, xx+src.x, yy+src.y), img_grass->format,
&r, &g, &b, &a);
double rd = sRGB_to_linear_table[r]*8.0 + tmp_red;
rd = rd * (a/255.0) / 11.0;
double gd = sRGB_to_linear_table[g]*8.0 + tmp_green;
gd = gd * (a/255.0) / 11.0;
double bd = sRGB_to_linear_table[b]*8.0 + tmp_blue;
bd = bd * (a/255.0) / 11.0;
SDL_GetRGB(getpixel(canvas, xx+dest.x, yy+dest.y), canvas->format,
&r, &g, &b);
r = linear_to_sRGB(sRGB_to_linear_table[r]*(1.0-a/255.0) + rd);
g = linear_to_sRGB(sRGB_to_linear_table[g]*(1.0-a/255.0) + gd);
b = linear_to_sRGB(sRGB_to_linear_table[b]*(1.0-a/255.0) + bd);
putpixel(canvas, xx+dest.x, yy+dest.y, SDL_MapRGB(canvas->format, r, g, b));
}
}
#else
// untinted
SDL_BlitSurface(img_grass, &src, canvas, &dest); SDL_BlitSurface(img_grass, &src, canvas, &dest);
#endif
} }
} }
else if (cur_magic == MAGIC_FLIP) else if (cur_magic == MAGIC_FLIP)