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

More accurate description of Blinds tool.

Browse source 
Added missing docs for some Magic tools.
Created a ROYGBIV variation of the Rainbow arc tool.
This commit is contained in:
William Kendrick 2009-09-01 01:30:58 +00:00
parent ec4a278ca0
commit 0f3d5fcfe4
8 changed files with 93 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

47
magic/src/realrainbow.c
View file

@ -6,7 +6,7 @@
by Bill Kendrick <bill@newbreedsoftware.com>
Math assistence by Jeff Newmiller <jdnewmil@dcn.davis.ca.us>
2009.04.02 - 2009.06.06
2009.04.02 - 2009.08.31
FIXME:
* Color/alpha art needs improvement.
@ -23,11 +23,11 @@ FIXME:
Mix_Chunk * realrainbow_snd;
int realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2;
SDL_Rect realrainbow_rect;
SDL_Surface * realrainbow_colors;
SDL_Surface * realrainbow_colors[2];
Uint8 realrainbow_blendr, realrainbow_blendg, realrainbow_blendb, realrainbow_blenda;
void realrainbow_arc(magic_api * api, SDL_Surface * canvas, SDL_Surface * last,
void realrainbow_arc(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * last,
int x1, int y1, int x2, int y2,
int fulldraw, SDL_Rect * update_rect);
static void realrainbow_linecb(void * ptr, int which,
@ -45,8 +45,13 @@ int realrainbow_init(magic_api * api)
char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow-colors.png", api->data_directory);
realrainbow_colors = IMG_Load(fname);
if (realrainbow_colors == NULL)
realrainbow_colors[0] = IMG_Load(fname);
if (realrainbow_colors[0] == NULL)
return(0);
snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow-roygbiv-colors.png", api->data_directory);
realrainbow_colors[1] = IMG_Load(fname);
if (realrainbow_colors[1] == NULL)
return(0);
snprintf(fname, sizeof(fname), "%s/sounds/magic/realrainbow.ogg",
@ -58,22 +63,29 @@ int realrainbow_init(magic_api * api)
int realrainbow_get_tool_count(magic_api * api)
{
return(1);
return(2);
}
SDL_Surface * realrainbow_get_icon(magic_api * api, int which)
{
char fname[1024];
snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow.png",
api->data_directory);
if (which == 0)
snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow.png",
api->data_directory);
else
snprintf(fname, sizeof(fname), "%s/images/magic/realrainbow-roygbiv.png",
api->data_directory);
return(IMG_Load(fname));
}
char * realrainbow_get_name(magic_api * api, int which)
{
return(strdup(gettext_noop("Real Rainbow")));
if (which == 0)
return(strdup(gettext_noop("Real Rainbow")));
else
return(strdup(gettext_noop("ROYGBIV Rainbow")));
}
char * realrainbow_get_description(magic_api * api, int which, int mode)
@ -93,7 +105,10 @@ int realrainbow_requires_colors(magic_api * api, int which)
void realrainbow_shutdown(magic_api * api)
{
SDL_FreeSurface(realrainbow_colors);
if (realrainbow_colors[0] != NULL)
SDL_FreeSurface(realrainbow_colors[0]);
if (realrainbow_colors[1] != NULL)
SDL_FreeSurface(realrainbow_colors[1]);
if (realrainbow_snd != NULL)
Mix_FreeChunk(realrainbow_snd);
}
@ -129,7 +144,7 @@ void realrainbow_drag(magic_api * api, int which,
SDL_BlitSurface(last, &realrainbow_rect, canvas, &realrainbow_rect);
realrainbow_arc(api, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 0, update_rect);
realrainbow_arc(api, which, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 0, update_rect);
memcpy(&rect, &realrainbow_rect, sizeof(SDL_Rect));
memcpy(&realrainbow_rect, update_rect, sizeof(SDL_Rect));
@ -167,7 +182,7 @@ void realrainbow_release(magic_api * api, int which,
SDL_BlitSurface(last, &realrainbow_rect, canvas, &realrainbow_rect);
realrainbow_arc(api, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 1, update_rect);
realrainbow_arc(api, which, canvas, last, realrainbow_x1, realrainbow_y1, realrainbow_x2, realrainbow_y2, 1, update_rect);
memcpy(&rect, &realrainbow_rect, sizeof(SDL_Rect));
memcpy(&realrainbow_rect, update_rect, sizeof(SDL_Rect));
@ -203,7 +218,7 @@ void realrainbow_switchout(magic_api * api, int which, int mode, SDL_Surface * c
}
void realrainbow_arc(magic_api * api, SDL_Surface * canvas, SDL_Surface * last, int x1, int y1, int x2, int y2, int fulldraw, SDL_Rect * update_rect)
void realrainbow_arc(magic_api * api, int which, SDL_Surface * canvas, SDL_Surface * last, int x1, int y1, int x2, int y2, int fulldraw, SDL_Rect * update_rect)
{
int lowx, lowy, hix, hiy, xm, ym, xc, yc, r, a1, atan2_a, atan2_b;
int a, oa, ox, oy, nx, ny, step, thick, rr, done;
@ -294,10 +309,10 @@ void realrainbow_arc(magic_api * api, SDL_Surface * canvas, SDL_Surface * last,
nx = (rr * cos(a * M_PI / 180.0)) + xc;
ny = (rr * sin(a * M_PI / 180.0)) + yc;
colorindex = realrainbow_colors->h - 1 - (((rr - r + (thick / 2)) * realrainbow_colors->h) / thick);
colorindex = realrainbow_colors[which]->h - 1 - (((rr - r + (thick / 2)) * realrainbow_colors[which]->h) / thick);
SDL_GetRGBA(api->getpixel(realrainbow_colors, 0, colorindex),
realrainbow_colors->format, &realrainbow_blendr, &realrainbow_blendg, &realrainbow_blendb, &realrainbow_blenda);
SDL_GetRGBA(api->getpixel(realrainbow_colors[which], 0, colorindex),
realrainbow_colors[which]->format, &realrainbow_blendr, &realrainbow_blendg, &realrainbow_blendb, &realrainbow_blenda);
if (!fulldraw)
realrainbow_blenda = 255;