Adding "indent.sh" to re-indent code; ran it!!!
This commit is contained in:
Bill Kendrick
parent
16336cc854
commit
18f9cad6fe
98 changed files with 5798 additions and 9001 deletions
|
|
@ -63,18 +63,14 @@ typedef struct
|
|||
float x, y;
|
||||
} Point2D;
|
||||
|
||||
static void tornado_predrag(magic_api * api, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y);
|
||||
static void tornado_predrag(magic_api * api, SDL_Surface * canvas, SDL_Surface * last, int ox, int oy, int x, int y);
|
||||
static void tornado_drawbase(magic_api * api, SDL_Surface * canvas);
|
||||
static void tornado_drawstalk(magic_api * api, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int top_x, int top_y,
|
||||
int minx, int maxx, int bottom_x, int bottom_y,
|
||||
int final);
|
||||
static void tornado_drawtornado(magic_api * api, SDL_Surface * canvas, int x,
|
||||
int y);
|
||||
int minx, int maxx, int bottom_x, int bottom_y, int final);
|
||||
static void tornado_drawtornado(magic_api * api, SDL_Surface * canvas, int x, int y);
|
||||
static Point2D tornado_PointOnCubicBezier(Point2D * cp, float t);
|
||||
static void tornado_ComputeBezier(Point2D * cp, int numberOfPoints,
|
||||
Point2D * curve);
|
||||
static void tornado_ComputeBezier(Point2D * cp, int numberOfPoints, Point2D * curve);
|
||||
static void tornado_colorize_cloud(magic_api * api);
|
||||
static Uint32 tornado_mess(Uint32 pixel, SDL_Surface * canvas);
|
||||
Uint32 tornado_api_version(void);
|
||||
|
|
@ -85,26 +81,23 @@ char *tornado_get_name(magic_api * api, int which);
|
|||
int tornado_get_group(magic_api * api, int which);
|
||||
char *tornado_get_description(magic_api * api, int which, int mode);
|
||||
void tornado_drag(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect);
|
||||
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
void tornado_click(magic_api * api, int which, int mode, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void tornado_release(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y,
|
||||
SDL_Rect * update_rect);
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
|
||||
void tornado_shutdown(magic_api * api);
|
||||
void tornado_set_color(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, Uint8 r, Uint8 g, Uint8 b, SDL_Rect * update_rect);
|
||||
int tornado_requires_colors(magic_api * api, int which);
|
||||
void tornado_switchin(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
void tornado_switchout(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
void tornado_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
void tornado_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
int tornado_modes(magic_api * api, int which);
|
||||
Uint8 tornado_accepted_sizes(magic_api * api, int which, int mode);
|
||||
Uint8 tornado_default_size(magic_api * api, int which, int mode);
|
||||
void tornado_set_size(magic_api * api, int which, int mode, SDL_Surface * canvas, SDL_Surface * last, Uint8 size, SDL_Rect * update_rect);
|
||||
void tornado_set_size(magic_api * api, int which, int mode, SDL_Surface * canvas, SDL_Surface * last, Uint8 size,
|
||||
SDL_Rect * update_rect);
|
||||
|
||||
|
||||
|
||||
|
|
@ -125,16 +118,13 @@ int tornado_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
|
|||
tornado_click_snd = Mix_LoadWAV(fname);
|
||||
*/
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/tornado_release.ogg",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/tornado_release.ogg", api->data_directory);
|
||||
tornado_release_snd = Mix_LoadWAV(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/tornado_base.png",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/tornado_base.png", api->data_directory);
|
||||
tornado_base = IMG_Load(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/tornado_cloud.png",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/tornado_cloud.png", api->data_directory);
|
||||
tornado_cloud = IMG_Load(fname);
|
||||
|
||||
return (1);
|
||||
|
|
@ -151,41 +141,33 @@ SDL_Surface *tornado_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
|
|||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/tornado.png",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/tornado.png", api->data_directory);
|
||||
|
||||
return (IMG_Load(fname));
|
||||
}
|
||||
|
||||
// Return our names, localized:
|
||||
char *tornado_get_name(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
char *tornado_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (strdup(gettext_noop("Tornado")));
|
||||
}
|
||||
|
||||
// Return our groups:
|
||||
int tornado_get_group(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
int tornado_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return MAGIC_TYPE_ARTISTIC;
|
||||
}
|
||||
|
||||
// Return our descriptions, localized:
|
||||
char *tornado_get_description(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED,
|
||||
int mode ATTRIBUTE_UNUSED)
|
||||
char *tornado_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (strdup
|
||||
(gettext_noop
|
||||
("Click and drag to draw a tornado funnel on your picture.")));
|
||||
return (strdup(gettext_noop("Click and drag to draw a tornado funnel on your picture.")));
|
||||
}
|
||||
|
||||
// Affect the canvas on drag:
|
||||
static void tornado_predrag(magic_api * api ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, int ox,
|
||||
int oy, int x, int y)
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, int ox, int oy, int x, int y)
|
||||
{
|
||||
if (x < tornado_min_x)
|
||||
tornado_min_x = x;
|
||||
|
|
@ -219,8 +201,7 @@ static void tornado_predrag(magic_api * api ATTRIBUTE_UNUSED,
|
|||
}
|
||||
|
||||
void tornado_drag(magic_api * api, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int ox, int oy,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
SDL_Surface * canvas, SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
tornado_predrag(api, canvas, last, ox, oy, x, y);
|
||||
|
||||
|
|
@ -233,8 +214,7 @@ void tornado_drag(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
/* Draw the base and the stalk (low-quality) for now: */
|
||||
|
||||
tornado_drawstalk(api, canvas, last,
|
||||
x, y, tornado_min_x, tornado_max_x, tornado_bottom_x,
|
||||
tornado_bottom_y, !(api->button_down()));
|
||||
x, y, tornado_min_x, tornado_max_x, tornado_bottom_x, tornado_bottom_y, !(api->button_down()));
|
||||
|
||||
tornado_drawbase(api, canvas);
|
||||
|
||||
|
|
@ -246,8 +226,7 @@ void tornado_drag(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
|
||||
// Affect the canvas on click:
|
||||
void tornado_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y,
|
||||
SDL_Rect * update_rect)
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
tornado_min_x = x;
|
||||
tornado_max_x = x;
|
||||
|
|
@ -266,8 +245,7 @@ void tornado_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
|
|||
|
||||
// Affect the canvas on release:
|
||||
void tornado_release(magic_api * api, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y,
|
||||
SDL_Rect * update_rect)
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
/* Don't let tornado be too low compared to base: */
|
||||
|
||||
|
|
@ -287,8 +265,7 @@ void tornado_release(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
|
||||
/* Draw high-quality stalk, and tornado: */
|
||||
|
||||
tornado_drawstalk(api, canvas, last, x, y, tornado_min_x, tornado_max_x,
|
||||
tornado_bottom_x, tornado_bottom_y, 1);
|
||||
tornado_drawstalk(api, canvas, last, x, y, tornado_min_x, tornado_max_x, tornado_bottom_x, tornado_bottom_y, 1);
|
||||
|
||||
tornado_drawtornado(api, canvas, x, y);
|
||||
|
||||
|
|
@ -304,8 +281,7 @@ void tornado_release(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
}
|
||||
|
||||
|
||||
static void tornado_drawtornado(magic_api * api, SDL_Surface * canvas, int x,
|
||||
int y)
|
||||
static void tornado_drawtornado(magic_api * api, SDL_Surface * canvas, int x, int y)
|
||||
{
|
||||
SDL_Surface *aux_surf;
|
||||
SDL_Rect dest;
|
||||
|
|
@ -318,8 +294,7 @@ static void tornado_drawtornado(magic_api * api, SDL_Surface * canvas, int x,
|
|||
SDL_FreeSurface(aux_surf);
|
||||
}
|
||||
|
||||
static void tornado_drawbase(magic_api * api ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas)
|
||||
static void tornado_drawbase(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canvas)
|
||||
{
|
||||
SDL_Rect dest;
|
||||
|
||||
|
|
@ -332,19 +307,17 @@ static void tornado_drawbase(magic_api * api ATTRIBUTE_UNUSED,
|
|||
static Uint32 tornado_mess(Uint32 pixel, SDL_Surface * canvas)
|
||||
{
|
||||
Uint8 r, g, b, a;
|
||||
float f = (float) rand() * 255 / RAND_MAX;
|
||||
float f = (float)rand() * 255 / RAND_MAX;
|
||||
|
||||
SDL_GetRGBA(pixel, canvas->format, &r, &g, &b, &a);
|
||||
return (SDL_MapRGBA(canvas->format,
|
||||
(tornado_r + r + (Uint8) f * 2) / 4,
|
||||
(tornado_g + g + (Uint8) f * 2) / 4,
|
||||
(tornado_b + b + (Uint8) f * 2) / 4, a));
|
||||
(tornado_g + g + (Uint8) f * 2) / 4, (tornado_b + b + (Uint8) f * 2) / 4, a));
|
||||
}
|
||||
|
||||
static void tornado_drawstalk(magic_api * api, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int top_x, int top_y,
|
||||
int minx, int maxx, int bottom_x, int bottom_y,
|
||||
int final)
|
||||
int minx, int maxx, int bottom_x, int bottom_y, int final)
|
||||
{
|
||||
Point2D control_points[4];
|
||||
Point2D *curve;
|
||||
|
|
@ -426,34 +399,23 @@ static void tornado_drawstalk(magic_api * api, SDL_Surface * canvas,
|
|||
/* The body of the tornado: 3x 1y rotation + some random particles */
|
||||
for (p = dest.x; p < dest.x + dest.w; p++)
|
||||
{
|
||||
if ((float) rand() * 100 / RAND_MAX > 10)
|
||||
if ((float)rand() * 100 / RAND_MAX > 10)
|
||||
{
|
||||
api->putpixel(canvas, p, dest.y,
|
||||
api->getpixel(last,
|
||||
dest.x + (p - dest.x + rotation) % dest.w,
|
||||
dest.y));
|
||||
api->putpixel(canvas, p, dest.y, api->getpixel(last, dest.x + (p - dest.x + rotation) % dest.w, dest.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
api->putpixel(canvas, p, dest.y,
|
||||
tornado_mess(api->getpixel(last,
|
||||
dest.x + (p - dest.x +
|
||||
rotation) % dest.w,
|
||||
dest.y), canvas));
|
||||
tornado_mess(api->getpixel(last, dest.x + (p - dest.x + rotation) % dest.w, dest.y), canvas));
|
||||
}
|
||||
}
|
||||
|
||||
/* Some random particles flying around the tornado */
|
||||
for (p = dest.x - dest.w * 20 / 100;
|
||||
p < dest.x + dest.w + dest.w * 20 / 100; p++)
|
||||
for (p = dest.x - dest.w * 20 / 100; p < dest.x + dest.w + dest.w * 20 / 100; p++)
|
||||
{
|
||||
if ((float) rand() * 100 / RAND_MAX < 5
|
||||
&& ((p < dest.x) || (p > dest.w)))
|
||||
if ((float)rand() * 100 / RAND_MAX < 5 && ((p < dest.x) || (p > dest.w)))
|
||||
api->putpixel(canvas, p, dest.y,
|
||||
tornado_mess(api->getpixel(last,
|
||||
dest.x + (p - dest.x +
|
||||
rotation) % dest.w,
|
||||
dest.y), canvas));
|
||||
tornado_mess(api->getpixel(last, dest.x + (p - dest.x + rotation) % dest.w, dest.y), canvas));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -480,7 +442,8 @@ void tornado_shutdown(magic_api * api ATTRIBUTE_UNUSED)
|
|||
|
||||
// Record the color from Tux Paint:
|
||||
void tornado_set_color(magic_api * api, int which ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, Uint8 r, Uint8 g, Uint8 b, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, Uint8 r, Uint8 g, Uint8 b,
|
||||
SDL_Rect * update_rect ATTRIBUTE_UNUSED)
|
||||
{
|
||||
tornado_r = r;
|
||||
tornado_g = g;
|
||||
|
|
@ -490,8 +453,7 @@ void tornado_set_color(magic_api * api, int which ATTRIBUTE_UNUSED, SDL_Surface
|
|||
}
|
||||
|
||||
// Use colors:
|
||||
int tornado_requires_colors(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
int tornado_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -546,8 +508,7 @@ static Point2D tornado_PointOnCubicBezier(Point2D * cp, float t)
|
|||
<sizeof(Point2D) numberOfPoints>
|
||||
*/
|
||||
|
||||
static void tornado_ComputeBezier(Point2D * cp, int numberOfPoints,
|
||||
Point2D * curve)
|
||||
static void tornado_ComputeBezier(Point2D * cp, int numberOfPoints, Point2D * curve)
|
||||
{
|
||||
float dt;
|
||||
int i;
|
||||
|
|
@ -570,9 +531,7 @@ static void tornado_colorize_cloud(magic_api * api)
|
|||
|
||||
/* Create a surface to render into: */
|
||||
|
||||
amask =
|
||||
~(tornado_cloud->format->Rmask | tornado_cloud->format->
|
||||
Gmask | tornado_cloud->format->Bmask);
|
||||
amask = ~(tornado_cloud->format->Rmask | tornado_cloud->format->Gmask | tornado_cloud->format->Bmask);
|
||||
|
||||
tornado_cloud_colorized =
|
||||
SDL_CreateRGBSurface(SDL_SWSURFACE,
|
||||
|
|
@ -580,8 +539,7 @@ static void tornado_colorize_cloud(magic_api * api)
|
|||
tornado_cloud->h,
|
||||
tornado_cloud->format->BitsPerPixel,
|
||||
tornado_cloud->format->Rmask,
|
||||
tornado_cloud->format->Gmask,
|
||||
tornado_cloud->format->Bmask, amask);
|
||||
tornado_cloud->format->Gmask, tornado_cloud->format->Bmask, amask);
|
||||
|
||||
/* Render the new cloud: */
|
||||
|
||||
|
|
@ -592,14 +550,11 @@ static void tornado_colorize_cloud(magic_api * api)
|
|||
{
|
||||
for (x = 0; x < tornado_cloud->w; x++)
|
||||
{
|
||||
SDL_GetRGBA(api->getpixel(tornado_cloud, x, y), tornado_cloud->format,
|
||||
&r, &g, &b, &a);
|
||||
SDL_GetRGBA(api->getpixel(tornado_cloud, x, y), tornado_cloud->format, &r, &g, &b, &a);
|
||||
|
||||
api->putpixel(tornado_cloud_colorized, x, y,
|
||||
SDL_MapRGBA(tornado_cloud_colorized->format,
|
||||
(tornado_r + r * 2) / 3,
|
||||
(tornado_g + g * 2) / 3,
|
||||
(tornado_b + b * 2) / 3, a));
|
||||
(tornado_r + r * 2) / 3, (tornado_g + g * 2) / 3, (tornado_b + b * 2) / 3, a));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -608,20 +563,17 @@ static void tornado_colorize_cloud(magic_api * api)
|
|||
}
|
||||
|
||||
void tornado_switchin(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
void tornado_switchout(magic_api * api, int which ATTRIBUTE_UNUSED,
|
||||
int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
{
|
||||
api->stopsound();
|
||||
}
|
||||
|
||||
int tornado_modes(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
int tornado_modes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (MODE_PAINT_WITH_PREVIEW);
|
||||
}
|
||||
|
|
@ -637,6 +589,8 @@ Uint8 tornado_default_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE
|
|||
return 0;
|
||||
}
|
||||
|
||||
void tornado_set_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED, Uint8 size ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
|
||||
void tornado_set_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * last ATTRIBUTE_UNUSED,
|
||||
Uint8 size ATTRIBUTE_UNUSED, SDL_Rect * update_rect ATTRIBUTE_UNUSED)
|
||||
{
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue