Re-ran indent on all .c & .h source code files
Like so --
find . -name "*.c" -or -name "*.h" -exec indent -nbfda -npcs -npsl -bli0 --no-tabs {} \;
The `indent` invocation differs from the last one noted in
CHANGES.txt (from 2006!?), in that I've added "--no-tabs",
to ensure indents are all space-based.
This commit is contained in:
Bill Kendrick
parent
09f332367f
commit
cc05925d9e
99 changed files with 31659 additions and 27102 deletions
|
|
@ -51,7 +51,8 @@ static Uint8 flower_r, flower_g, flower_b;
|
|||
static int flower_min_x, flower_max_x, flower_bottom_x, flower_bottom_y;
|
||||
static int flower_side_first;
|
||||
static int flower_side_decided;
|
||||
static SDL_Surface *flower_base, *flower_leaf, *flower_petals, *flower_petals_colorized;
|
||||
static SDL_Surface *flower_base, *flower_leaf, *flower_petals,
|
||||
*flower_petals_colorized;
|
||||
|
||||
/* Local function prototypes: */
|
||||
|
||||
|
|
@ -61,9 +62,11 @@ typedef struct
|
|||
} Point2D;
|
||||
|
||||
static void flower_drawbase(magic_api * api, SDL_Surface * canvas);
|
||||
static void flower_drawflower(magic_api * api, SDL_Surface * canvas, int x, int y);
|
||||
static void flower_drawflower(magic_api * api, SDL_Surface * canvas, int x,
|
||||
int y);
|
||||
static Point2D flower_PointOnCubicBezier(Point2D * cp, float t);
|
||||
static void flower_ComputeBezier(Point2D * cp, int numberOfPoints, Point2D * curve);
|
||||
static void flower_ComputeBezier(Point2D * cp, int numberOfPoints,
|
||||
Point2D * curve);
|
||||
static void flower_colorize_petals(magic_api * api);
|
||||
Uint32 flower_api_version(void);
|
||||
int flower_init(magic_api * api);
|
||||
|
|
@ -72,25 +75,32 @@ SDL_Surface *flower_get_icon(magic_api * api, int which);
|
|||
char *flower_get_name(magic_api * api, int which);
|
||||
int flower_get_group(magic_api * api, int which);
|
||||
char *flower_get_description(magic_api * api, int which, int mode);
|
||||
static void flower_predrag(magic_api * api, SDL_Surface * canvas, SDL_Surface * last, int ox, int oy, int x, int y);
|
||||
static void flower_predrag(magic_api * api, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y);
|
||||
void flower_drag(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
void flower_click(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void flower_release(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
static void flower_drawflower(magic_api * api, SDL_Surface * canvas, int x, int y);
|
||||
SDL_Surface * last, int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect);
|
||||
void flower_click(magic_api * api, int which, int mode, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
void flower_release(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int x, int y, SDL_Rect * update_rect);
|
||||
static void flower_drawflower(magic_api * api, SDL_Surface * canvas, int x,
|
||||
int y);
|
||||
static void flower_drawbase(magic_api * api, SDL_Surface * canvas);
|
||||
static void flower_drawstalk(magic_api * api, SDL_Surface * canvas,
|
||||
int top_x, int top_y, int minx, int maxx, int bottom_x, int bottom_y, int final);
|
||||
int top_x, int top_y, int minx, int maxx,
|
||||
int bottom_x, int bottom_y, int final);
|
||||
void flower_shutdown(magic_api * api);
|
||||
void flower_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b);
|
||||
int flower_requires_colors(magic_api * api, int which);
|
||||
static Point2D flower_PointOnCubicBezier(Point2D * cp, float t);
|
||||
static void flower_ComputeBezier(Point2D * cp, int numberOfPoints, Point2D * curve);
|
||||
static void flower_ComputeBezier(Point2D * cp, int numberOfPoints,
|
||||
Point2D * curve);
|
||||
static void flower_colorize_petals(magic_api * api);
|
||||
void flower_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
void flower_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas);
|
||||
void flower_switchin(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
void flower_switchout(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas);
|
||||
int flower_modes(magic_api * api, int which);
|
||||
|
||||
|
||||
|
|
@ -106,19 +116,24 @@ int flower_init(magic_api * api)
|
|||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/flower_click.ogg", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/flower_click.ogg",
|
||||
api->data_directory);
|
||||
flower_click_snd = Mix_LoadWAV(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/flower_release.ogg", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/flower_release.ogg",
|
||||
api->data_directory);
|
||||
flower_release_snd = Mix_LoadWAV(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower_base.png", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower_base.png",
|
||||
api->data_directory);
|
||||
flower_base = IMG_Load(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower_leaf.png", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower_leaf.png",
|
||||
api->data_directory);
|
||||
flower_leaf = IMG_Load(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower_petals.png", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower_petals.png",
|
||||
api->data_directory);
|
||||
flower_petals = IMG_Load(fname);
|
||||
|
||||
return (1);
|
||||
|
|
@ -135,32 +150,41 @@ SDL_Surface *flower_get_icon(magic_api * api, int which ATTRIBUTE_UNUSED)
|
|||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower.png", api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/flower.png",
|
||||
api->data_directory);
|
||||
|
||||
return (IMG_Load(fname));
|
||||
}
|
||||
|
||||
// Return our names, localized:
|
||||
char *flower_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
char *flower_get_name(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return (strdup(gettext_noop("Flower")));
|
||||
}
|
||||
|
||||
// Return our groups:
|
||||
int flower_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
int flower_get_group(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return MAGIC_TYPE_ARTISTIC;
|
||||
}
|
||||
|
||||
// Return our descriptions, localized:
|
||||
char *flower_get_description(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
|
||||
char *flower_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 flower stalk. Let go to finish the flower.")));
|
||||
return (strdup
|
||||
(gettext_noop
|
||||
("Click and drag to draw a flower stalk. Let go to finish the flower.")));
|
||||
}
|
||||
|
||||
// Affect the canvas on drag:
|
||||
static void flower_predrag(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canvas ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, int ox, int oy, int x, int y)
|
||||
static void flower_predrag(magic_api * api ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * last ATTRIBUTE_UNUSED, int ox,
|
||||
int oy, int x, int y)
|
||||
{
|
||||
if (x < flower_min_x)
|
||||
flower_min_x = x;
|
||||
|
|
@ -179,22 +203,23 @@ static void flower_predrag(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canva
|
|||
// Determine which way to bend first:
|
||||
//
|
||||
if (flower_side_decided == 0)
|
||||
{
|
||||
if (x < flower_bottom_x - 10)
|
||||
{
|
||||
if (x < flower_bottom_x - 10)
|
||||
{
|
||||
flower_side_first = SIDE_LEFT;
|
||||
flower_side_decided = 1;
|
||||
}
|
||||
else if (x > flower_bottom_x + 10)
|
||||
{
|
||||
flower_side_first = SIDE_RIGHT;
|
||||
flower_side_decided = 1;
|
||||
}
|
||||
flower_side_first = SIDE_LEFT;
|
||||
flower_side_decided = 1;
|
||||
}
|
||||
else if (x > flower_bottom_x + 10)
|
||||
{
|
||||
flower_side_first = SIDE_RIGHT;
|
||||
flower_side_decided = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void flower_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)
|
||||
void flower_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)
|
||||
{
|
||||
flower_predrag(api, canvas, last, ox, oy, x, y);
|
||||
|
||||
|
|
@ -207,7 +232,8 @@ void flower_drag(magic_api * api, int which ATTRIBUTE_UNUSED, SDL_Surface * canv
|
|||
/* Draw the base and the stalk (low-quality) for now: */
|
||||
|
||||
flower_drawstalk(api, canvas,
|
||||
x, y, flower_min_x, flower_max_x, flower_bottom_x, flower_bottom_y, !(api->button_down()));
|
||||
x, y, flower_min_x, flower_max_x, flower_bottom_x,
|
||||
flower_bottom_y, !(api->button_down()));
|
||||
|
||||
flower_drawbase(api, canvas);
|
||||
|
||||
|
|
@ -219,7 +245,8 @@ void flower_drag(magic_api * api, int which ATTRIBUTE_UNUSED, SDL_Surface * canv
|
|||
|
||||
// Affect the canvas on click:
|
||||
void flower_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)
|
||||
{
|
||||
flower_min_x = x;
|
||||
flower_max_x = x;
|
||||
|
|
@ -236,7 +263,8 @@ void flower_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
|
|||
|
||||
// Affect the canvas on release:
|
||||
void flower_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 flower be too low compared to base: */
|
||||
|
||||
|
|
@ -256,7 +284,8 @@ void flower_release(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
|
||||
/* Draw high-quality stalk, and flower: */
|
||||
|
||||
flower_drawstalk(api, canvas, x, y, flower_min_x, flower_max_x, flower_bottom_x, flower_bottom_y, 1);
|
||||
flower_drawstalk(api, canvas, x, y, flower_min_x, flower_max_x,
|
||||
flower_bottom_x, flower_bottom_y, 1);
|
||||
|
||||
flower_drawflower(api, canvas, x, y);
|
||||
|
||||
|
|
@ -272,7 +301,8 @@ void flower_release(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
}
|
||||
|
||||
|
||||
static void flower_drawflower(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canvas, int x, int y)
|
||||
static void flower_drawflower(magic_api * api ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, int x, int y)
|
||||
{
|
||||
SDL_Rect dest;
|
||||
|
||||
|
|
@ -282,7 +312,8 @@ static void flower_drawflower(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * ca
|
|||
SDL_BlitSurface(flower_petals_colorized, NULL, canvas, &dest);
|
||||
}
|
||||
|
||||
static void flower_drawbase(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canvas)
|
||||
static void flower_drawbase(magic_api * api ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas)
|
||||
{
|
||||
SDL_Rect dest;
|
||||
|
||||
|
|
@ -292,8 +323,10 @@ static void flower_drawbase(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canv
|
|||
SDL_BlitSurface(flower_base, NULL, canvas, &dest);
|
||||
}
|
||||
|
||||
static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * canvas,
|
||||
int top_x, int top_y, int minx, int maxx, int bottom_x, int bottom_y, int final)
|
||||
static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, int top_x, int top_y,
|
||||
int minx, int maxx, int bottom_x, int bottom_y,
|
||||
int final)
|
||||
{
|
||||
Point2D control_points[4];
|
||||
Point2D *curve;
|
||||
|
|
@ -310,15 +343,15 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * can
|
|||
control_points[0].y = top_y;
|
||||
|
||||
if (flower_side_first == SIDE_LEFT)
|
||||
{
|
||||
control_points[1].x = minx;
|
||||
control_points[2].x = maxx;
|
||||
}
|
||||
{
|
||||
control_points[1].x = minx;
|
||||
control_points[2].x = maxx;
|
||||
}
|
||||
else
|
||||
{
|
||||
control_points[1].x = maxx;
|
||||
control_points[2].x = minx;
|
||||
}
|
||||
{
|
||||
control_points[1].x = maxx;
|
||||
control_points[2].x = minx;
|
||||
}
|
||||
|
||||
control_points[1].y = ((bottom_y - top_y) / 3) + top_y;
|
||||
control_points[2].y = (((bottom_y - top_y) / 3) * 2) + top_y;
|
||||
|
|
@ -339,126 +372,127 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED, SDL_Surface * can
|
|||
/* Draw the curve: */
|
||||
|
||||
for (i = 0; i < n_points - 1; i++)
|
||||
{
|
||||
if (final == 0)
|
||||
{
|
||||
if (final == 0)
|
||||
{
|
||||
dest.x = curve[i].x;
|
||||
dest.y = curve[i].y;
|
||||
dest.w = 2;
|
||||
dest.h = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
left = min(curve[i].x, curve[i + 1].x);
|
||||
right = max(curve[i].x, curve[i + 1].x);
|
||||
|
||||
dest.x = left;
|
||||
dest.y = curve[i].y;
|
||||
dest.w = right - left + 1;
|
||||
dest.h = 2;
|
||||
}
|
||||
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 0, 128, 0));
|
||||
|
||||
|
||||
/* When we're done (final render), we can add some random leaves: */
|
||||
|
||||
if (final && i > 32 && i < n_points - 32 && (i % 16) == 0 && (rand() % 5) > 0)
|
||||
{
|
||||
/* Check for hard left/right angles: */
|
||||
|
||||
side = -1;
|
||||
|
||||
if (curve[i - 2].x - curve[i + 2].x > 5)
|
||||
{
|
||||
/* Hard lower-left-to-upper-right (/),
|
||||
stick either a left-upward or right-downward facing leaf */
|
||||
|
||||
if (rand() % 10 < 5)
|
||||
side = LEAFSIDE_LEFT_UP;
|
||||
else
|
||||
side = LEAFSIDE_RIGHT_DOWN;
|
||||
}
|
||||
else if (curve[i - 2].x - curve[i + 2].x < -5)
|
||||
{
|
||||
/* Hard lower-right-to-upper-left (\)
|
||||
stick either a right-upward or left-downward facing leaf */
|
||||
|
||||
if (rand() % 10 < 5)
|
||||
side = LEAFSIDE_LEFT_DOWN;
|
||||
else
|
||||
side = LEAFSIDE_RIGHT_UP;
|
||||
}
|
||||
else if (fabs(curve[i - 2].x - curve[i + 2].x) < 5)
|
||||
{
|
||||
/* Mostly up; stick left- or right-downward: */
|
||||
|
||||
if (rand() % 10 < 5)
|
||||
side = LEAFSIDE_LEFT_DOWN;
|
||||
else
|
||||
side = LEAFSIDE_RIGHT_DOWN;
|
||||
}
|
||||
|
||||
|
||||
/* Draw the appropriately-oriented leaf, if any: */
|
||||
|
||||
if (side == LEAFSIDE_RIGHT_DOWN)
|
||||
{
|
||||
dest.x = curve[i].x;
|
||||
dest.y = curve[i].y;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, NULL, canvas, &dest);
|
||||
}
|
||||
else if (side == LEAFSIDE_LEFT_DOWN)
|
||||
{
|
||||
for (xx = 0; xx < flower_leaf->w; xx++)
|
||||
{
|
||||
src.x = xx;
|
||||
src.y = 0;
|
||||
src.w = 1;
|
||||
src.h = flower_leaf->h;
|
||||
|
||||
dest.x = curve[i].x - xx;
|
||||
dest.y = curve[i].y;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
|
||||
}
|
||||
}
|
||||
else if (side == LEAFSIDE_RIGHT_UP)
|
||||
{
|
||||
for (yy = 0; yy < flower_leaf->h; yy++)
|
||||
{
|
||||
src.x = 0;
|
||||
src.y = yy;
|
||||
src.w = flower_leaf->w;
|
||||
src.h = 1;
|
||||
|
||||
dest.x = curve[i].x;
|
||||
dest.y = curve[i].y - yy;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
|
||||
}
|
||||
}
|
||||
else if (side == LEAFSIDE_LEFT_UP)
|
||||
{
|
||||
for (xx = 0; xx < flower_leaf->w; xx++)
|
||||
{
|
||||
for (yy = 0; yy < flower_leaf->h; yy++)
|
||||
{
|
||||
src.x = xx;
|
||||
src.y = yy;
|
||||
src.w = 1;
|
||||
src.h = 1;
|
||||
|
||||
dest.x = curve[i].x - xx;
|
||||
dest.y = curve[i].y - yy;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
dest.x = curve[i].x;
|
||||
dest.y = curve[i].y;
|
||||
dest.w = 2;
|
||||
dest.h = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
left = min(curve[i].x, curve[i + 1].x);
|
||||
right = max(curve[i].x, curve[i + 1].x);
|
||||
|
||||
dest.x = left;
|
||||
dest.y = curve[i].y;
|
||||
dest.w = right - left + 1;
|
||||
dest.h = 2;
|
||||
}
|
||||
|
||||
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 0, 128, 0));
|
||||
|
||||
|
||||
/* When we're done (final render), we can add some random leaves: */
|
||||
|
||||
if (final && i > 32 && i < n_points - 32 && (i % 16) == 0
|
||||
&& (rand() % 5) > 0)
|
||||
{
|
||||
/* Check for hard left/right angles: */
|
||||
|
||||
side = -1;
|
||||
|
||||
if (curve[i - 2].x - curve[i + 2].x > 5)
|
||||
{
|
||||
/* Hard lower-left-to-upper-right (/),
|
||||
stick either a left-upward or right-downward facing leaf */
|
||||
|
||||
if (rand() % 10 < 5)
|
||||
side = LEAFSIDE_LEFT_UP;
|
||||
else
|
||||
side = LEAFSIDE_RIGHT_DOWN;
|
||||
}
|
||||
else if (curve[i - 2].x - curve[i + 2].x < -5)
|
||||
{
|
||||
/* Hard lower-right-to-upper-left (\)
|
||||
stick either a right-upward or left-downward facing leaf */
|
||||
|
||||
if (rand() % 10 < 5)
|
||||
side = LEAFSIDE_LEFT_DOWN;
|
||||
else
|
||||
side = LEAFSIDE_RIGHT_UP;
|
||||
}
|
||||
else if (fabs(curve[i - 2].x - curve[i + 2].x) < 5)
|
||||
{
|
||||
/* Mostly up; stick left- or right-downward: */
|
||||
|
||||
if (rand() % 10 < 5)
|
||||
side = LEAFSIDE_LEFT_DOWN;
|
||||
else
|
||||
side = LEAFSIDE_RIGHT_DOWN;
|
||||
}
|
||||
|
||||
|
||||
/* Draw the appropriately-oriented leaf, if any: */
|
||||
|
||||
if (side == LEAFSIDE_RIGHT_DOWN)
|
||||
{
|
||||
dest.x = curve[i].x;
|
||||
dest.y = curve[i].y;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, NULL, canvas, &dest);
|
||||
}
|
||||
else if (side == LEAFSIDE_LEFT_DOWN)
|
||||
{
|
||||
for (xx = 0; xx < flower_leaf->w; xx++)
|
||||
{
|
||||
src.x = xx;
|
||||
src.y = 0;
|
||||
src.w = 1;
|
||||
src.h = flower_leaf->h;
|
||||
|
||||
dest.x = curve[i].x - xx;
|
||||
dest.y = curve[i].y;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
|
||||
}
|
||||
}
|
||||
else if (side == LEAFSIDE_RIGHT_UP)
|
||||
{
|
||||
for (yy = 0; yy < flower_leaf->h; yy++)
|
||||
{
|
||||
src.x = 0;
|
||||
src.y = yy;
|
||||
src.w = flower_leaf->w;
|
||||
src.h = 1;
|
||||
|
||||
dest.x = curve[i].x;
|
||||
dest.y = curve[i].y - yy;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
|
||||
}
|
||||
}
|
||||
else if (side == LEAFSIDE_LEFT_UP)
|
||||
{
|
||||
for (xx = 0; xx < flower_leaf->w; xx++)
|
||||
{
|
||||
for (yy = 0; yy < flower_leaf->h; yy++)
|
||||
{
|
||||
src.x = xx;
|
||||
src.y = yy;
|
||||
src.w = 1;
|
||||
src.h = 1;
|
||||
|
||||
dest.x = curve[i].x - xx;
|
||||
dest.y = curve[i].y - yy;
|
||||
|
||||
SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free(curve);
|
||||
}
|
||||
|
|
@ -492,7 +526,8 @@ void flower_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b)
|
|||
}
|
||||
|
||||
// Use colors:
|
||||
int flower_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
int flower_requires_colors(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -547,7 +582,8 @@ static Point2D flower_PointOnCubicBezier(Point2D * cp, float t)
|
|||
<sizeof(Point2D) numberOfPoints>
|
||||
*/
|
||||
|
||||
static void flower_ComputeBezier(Point2D * cp, int numberOfPoints, Point2D * curve)
|
||||
static void flower_ComputeBezier(Point2D * cp, int numberOfPoints,
|
||||
Point2D * curve)
|
||||
{
|
||||
float dt;
|
||||
int i;
|
||||
|
|
@ -570,7 +606,9 @@ static void flower_colorize_petals(magic_api * api)
|
|||
|
||||
/* Create a surface to render into: */
|
||||
|
||||
amask = ~(flower_petals->format->Rmask | flower_petals->format->Gmask | flower_petals->format->Bmask);
|
||||
amask =
|
||||
~(flower_petals->format->Rmask | flower_petals->format->
|
||||
Gmask | flower_petals->format->Bmask);
|
||||
|
||||
flower_petals_colorized =
|
||||
SDL_CreateRGBSurface(SDL_SWSURFACE,
|
||||
|
|
@ -578,7 +616,8 @@ static void flower_colorize_petals(magic_api * api)
|
|||
flower_petals->h,
|
||||
flower_petals->format->BitsPerPixel,
|
||||
flower_petals->format->Rmask,
|
||||
flower_petals->format->Gmask, flower_petals->format->Bmask, amask);
|
||||
flower_petals->format->Gmask,
|
||||
flower_petals->format->Bmask, amask);
|
||||
|
||||
/* Render the new petals: */
|
||||
|
||||
|
|
@ -586,32 +625,38 @@ static void flower_colorize_petals(magic_api * api)
|
|||
SDL_LockSurface(flower_petals_colorized);
|
||||
|
||||
for (y = 0; y < flower_petals->h; y++)
|
||||
{
|
||||
for (x = 0; x < flower_petals->w; x++)
|
||||
{
|
||||
for (x = 0; x < flower_petals->w; x++)
|
||||
{
|
||||
SDL_GetRGBA(api->getpixel(flower_petals, x, y), flower_petals->format, &r, &g, &b, &a);
|
||||
SDL_GetRGBA(api->getpixel(flower_petals, x, y), flower_petals->format,
|
||||
&r, &g, &b, &a);
|
||||
|
||||
api->putpixel(flower_petals_colorized, x, y,
|
||||
SDL_MapRGBA(flower_petals_colorized->format, flower_r, flower_g, flower_b, a));
|
||||
api->putpixel(flower_petals_colorized, x, y,
|
||||
SDL_MapRGBA(flower_petals_colorized->format, flower_r,
|
||||
flower_g, flower_b, a));
|
||||
|
||||
if (api->in_circle((x - flower_petals->w / 2), (y - flower_petals->h / 2), 8))
|
||||
{
|
||||
api->putpixel(flower_petals_colorized, x, y,
|
||||
SDL_MapRGBA(flower_petals_colorized->format, 0xFF, 0xFF, 0x00, a));
|
||||
}
|
||||
}
|
||||
if (api->in_circle
|
||||
((x - flower_petals->w / 2), (y - flower_petals->h / 2), 8))
|
||||
{
|
||||
api->putpixel(flower_petals_colorized, x, y,
|
||||
SDL_MapRGBA(flower_petals_colorized->format, 0xFF, 0xFF,
|
||||
0x00, a));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SDL_UnlockSurface(flower_petals_colorized);
|
||||
SDL_UnlockSurface(flower_petals);
|
||||
}
|
||||
|
||||
void flower_switchin(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
void flower_switchin(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
void flower_switchout(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
void flower_switchout(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED)
|
||||
{
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue