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
|
|
@ -10,8 +10,7 @@
|
|||
unsigned int img_w, img_h;
|
||||
static Uint8 string_r, string_g, string_b;
|
||||
static int string_ox, string_oy;
|
||||
static int string_vertex_x, string_vertex_y, string_vertex_done,
|
||||
string_vertex_distance;
|
||||
static int string_vertex_x, string_vertex_y, string_vertex_done, string_vertex_distance;
|
||||
static SDL_Surface *canvas_backup;
|
||||
enum string_tools
|
||||
{
|
||||
|
|
@ -25,24 +24,18 @@ Mix_Chunk *string_snd[STRING_NUMTOOLS];
|
|||
|
||||
// Custom function declarations
|
||||
|
||||
void string_callback(void *ptr, int which_tool, SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int x, int y);
|
||||
void string_callback_xor(void *ptr, int which_tool, SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int x, int y);
|
||||
void string_callback(void *ptr, int which_tool, SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y);
|
||||
void string_callback_xor(void *ptr, int which_tool, SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y);
|
||||
void string_draw_triangle(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int ox, int oy, int x,
|
||||
int y, SDL_Rect * update_rect);
|
||||
SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
void string_draw_angle(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect);
|
||||
SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
void string_draw_triangle_preview(magic_api * api, int which,
|
||||
SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int ox, int oy,
|
||||
int x, int y, SDL_Rect * update_rect);
|
||||
SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
void string_draw_angle_preview(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot,
|
||||
int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect);
|
||||
int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
void scale_xcoord(int *xcoord);
|
||||
void scale_ycoord(int *ycoord);
|
||||
void scale_coords(int *ox, int *oy, int *x, int *y);
|
||||
|
|
@ -56,8 +49,7 @@ void compute_middle(int start_point, int end_point, int vertex, int *middle);
|
|||
// Prototypes for required functions
|
||||
|
||||
void string_drag(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect);
|
||||
SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect);
|
||||
|
||||
|
||||
Uint32 string_api_version(void);
|
||||
|
|
@ -71,20 +63,18 @@ int string_get_group(magic_api * api, int which);
|
|||
char *string_get_description(magic_api * api, int which, int mode);
|
||||
int string_requires_colors(magic_api * api, int which);
|
||||
void string_release(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int x,
|
||||
int y, SDL_Rect * update_rect);
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect);
|
||||
int string_init(magic_api * api, Uint32 disabled_features);
|
||||
void string_shutdown(magic_api * api);
|
||||
void string_switchin(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot);
|
||||
void string_switchout(magic_api * api, int which, int mode,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot);
|
||||
void string_switchin(magic_api * api, int which, int mode, SDL_Surface * canvas, SDL_Surface * snapshot);
|
||||
void string_switchout(magic_api * api, int which, int mode, SDL_Surface * canvas, SDL_Surface * snapshot);
|
||||
void string_click(magic_api * api, int which, int mode, SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int x, int y,
|
||||
SDL_Rect * update_rect);
|
||||
SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect);
|
||||
Uint8 string_accepted_sizes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED);
|
||||
Uint8 string_default_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED);
|
||||
void string_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 string_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);
|
||||
|
||||
// Required functions
|
||||
|
||||
|
|
@ -101,8 +91,9 @@ int string_modes(magic_api * api ATTRIBUTE_UNUSED, int which)
|
|||
return (MODE_PAINT_WITH_PREVIEW);
|
||||
}
|
||||
|
||||
void string_set_color(magic_api * api ATTRIBUTE_UNUSED, 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)
|
||||
void string_set_color(magic_api * api ATTRIBUTE_UNUSED, 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)
|
||||
{
|
||||
string_r = r;
|
||||
string_g = g;
|
||||
|
|
@ -123,17 +114,13 @@ SDL_Surface *string_get_icon(magic_api * api, int which)
|
|||
switch (which)
|
||||
{
|
||||
case STRING_TOOL_FULL_BY_OFFSET:
|
||||
snprintf(fname, sizeof(fname),
|
||||
"%simages/magic/string_art_full_by_offset.png",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/string_art_full_by_offset.png", api->data_directory);
|
||||
break;
|
||||
case STRING_TOOL_TRIANGLE:
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/string_art_triangles.png",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/string_art_triangles.png", api->data_directory);
|
||||
break;
|
||||
case STRING_TOOL_ANGLE:
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/string_art_angles.png",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%simages/magic/string_art_angles.png", api->data_directory);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -141,8 +128,7 @@ SDL_Surface *string_get_icon(magic_api * api, int which)
|
|||
}
|
||||
|
||||
|
||||
char *string_get_name(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
char *string_get_name(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
switch (which)
|
||||
{
|
||||
|
|
@ -157,14 +143,12 @@ char *string_get_name(magic_api * api ATTRIBUTE_UNUSED,
|
|||
}
|
||||
}
|
||||
|
||||
int string_get_group(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
int string_get_group(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return MAGIC_TYPE_ARTISTIC;
|
||||
}
|
||||
|
||||
char *string_get_description(magic_api * api ATTRIBUTE_UNUSED, int which,
|
||||
int mode ATTRIBUTE_UNUSED)
|
||||
char *string_get_description(magic_api * api ATTRIBUTE_UNUSED, int which, int mode ATTRIBUTE_UNUSED)
|
||||
{
|
||||
switch (which)
|
||||
{
|
||||
|
|
@ -174,30 +158,25 @@ char *string_get_description(magic_api * api ATTRIBUTE_UNUSED, int which,
|
|||
("Click and drag to draw string art. Drag top-bottom to draw less or more lines, left or right to make a bigger hole."));
|
||||
break;
|
||||
case STRING_TOOL_TRIANGLE:
|
||||
return
|
||||
strdup(gettext_noop
|
||||
("Click and drag to draw arrows made of string art."));
|
||||
return strdup(gettext_noop("Click and drag to draw arrows made of string art."));
|
||||
break;
|
||||
default:
|
||||
return strdup(gettext_noop("Draw string art arrows with free angles."));
|
||||
}
|
||||
}
|
||||
|
||||
int string_requires_colors(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED)
|
||||
int string_requires_colors(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
void string_release(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int x,
|
||||
int y, SDL_Rect * update_rect)
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
int dx, dy;
|
||||
|
||||
if (which == STRING_TOOL_TRIANGLE)
|
||||
string_draw_triangle((void *) api, which, canvas, snapshot, string_ox,
|
||||
string_oy, x, y, update_rect);
|
||||
string_draw_triangle((void *)api, which, canvas, snapshot, string_ox, string_oy, x, y, update_rect);
|
||||
if (which == STRING_TOOL_ANGLE)
|
||||
{
|
||||
if (!string_vertex_done) // maybe we face small children, draw square angles aligned to the drag
|
||||
|
|
@ -207,8 +186,7 @@ void string_release(magic_api * api, int which,
|
|||
y = y + dx;
|
||||
x = x - dy;
|
||||
}
|
||||
string_draw_angle((void *) api, which, canvas, snapshot, string_ox,
|
||||
string_oy, x, y, update_rect);
|
||||
string_draw_angle((void *)api, which, canvas, snapshot, string_ox, string_oy, x, y, update_rect);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -216,16 +194,13 @@ int string_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
|
|||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/string.ogg",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/string.ogg", api->data_directory);
|
||||
string_snd[STRING_TOOL_FULL_BY_OFFSET] = Mix_LoadWAV(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/string2.ogg",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/string2.ogg", api->data_directory);
|
||||
string_snd[STRING_TOOL_TRIANGLE] = Mix_LoadWAV(fname);
|
||||
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/string3.ogg",
|
||||
api->data_directory);
|
||||
snprintf(fname, sizeof(fname), "%ssounds/magic/string3.ogg", api->data_directory);
|
||||
string_snd[STRING_TOOL_ANGLE] = Mix_LoadWAV(fname);
|
||||
|
||||
return (1);
|
||||
|
|
@ -248,20 +223,17 @@ void string_shutdown(magic_api * api ATTRIBUTE_UNUSED)
|
|||
|
||||
void string_switchin(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot ATTRIBUTE_UNUSED)
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED)
|
||||
{
|
||||
canvas_backup =
|
||||
SDL_CreateRGBSurface(SDL_SWSURFACE, canvas->w, canvas->h,
|
||||
canvas->format->BitsPerPixel, canvas->format->Rmask,
|
||||
canvas->format->Gmask, canvas->format->Bmask,
|
||||
canvas->format->Amask);
|
||||
canvas->format->Gmask, canvas->format->Bmask, canvas->format->Amask);
|
||||
}
|
||||
|
||||
void string_switchout(magic_api * api ATTRIBUTE_UNUSED,
|
||||
int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * snapshot ATTRIBUTE_UNUSED)
|
||||
SDL_Surface * canvas ATTRIBUTE_UNUSED, SDL_Surface * snapshot ATTRIBUTE_UNUSED)
|
||||
{
|
||||
SDL_FreeSurface(canvas_backup);
|
||||
canvas_backup = NULL;
|
||||
|
|
@ -271,19 +243,15 @@ void string_switchout(magic_api * api ATTRIBUTE_UNUSED,
|
|||
|
||||
|
||||
void string_callback(void *ptr, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y)
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y)
|
||||
{
|
||||
magic_api *api = (magic_api *) ptr;
|
||||
|
||||
api->putpixel(canvas, x, y,
|
||||
SDL_MapRGBA(canvas->format, string_r, string_g, string_b,
|
||||
255));
|
||||
api->putpixel(canvas, x, y, SDL_MapRGBA(canvas->format, string_r, string_g, string_b, 255));
|
||||
}
|
||||
|
||||
void string_callback_xor(void *ptr, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y)
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y)
|
||||
{
|
||||
magic_api *api = (magic_api *) ptr;
|
||||
|
||||
|
|
@ -292,8 +260,7 @@ void string_callback_xor(void *ptr, int which ATTRIBUTE_UNUSED,
|
|||
|
||||
|
||||
void string_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y,
|
||||
SDL_Rect * update_rect)
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
SDL_BlitSurface(canvas, NULL, canvas_backup, NULL);
|
||||
|
||||
|
|
@ -306,9 +273,7 @@ void string_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
|
|||
|
||||
static void string_draw_full_by_offset(void *ptr, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas,
|
||||
SDL_Surface *
|
||||
snapshot ATTRIBUTE_UNUSED, int x,
|
||||
int y, SDL_Rect * update_rect)
|
||||
SDL_Surface * snapshot ATTRIBUTE_UNUSED, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
magic_api *api = (magic_api *) ptr;
|
||||
int u;
|
||||
|
|
@ -318,16 +283,16 @@ static void string_draw_full_by_offset(void *ptr, int which ATTRIBUTE_UNUSED,
|
|||
// int n=y/5;
|
||||
int **a;
|
||||
float step_w, step_h, aux;
|
||||
int side = (int) (y / 3);
|
||||
int side = (int)(y / 3);
|
||||
|
||||
SDL_BlitSurface(snapshot, 0, canvas, 0);
|
||||
|
||||
if (side < 3)
|
||||
side = 3;
|
||||
|
||||
o = (int) (side * 4 * x / canvas->w);
|
||||
step_w = canvas->w / (float) side;
|
||||
step_h = canvas->h / (float) side;
|
||||
o = (int)(side * 4 * x / canvas->w);
|
||||
step_w = canvas->w / (float)side;
|
||||
step_h = canvas->h / (float)side;
|
||||
|
||||
a = malloc(sizeof(int *) * side * 4 * 2);
|
||||
|
||||
|
|
@ -337,22 +302,22 @@ static void string_draw_full_by_offset(void *ptr, int which ATTRIBUTE_UNUSED,
|
|||
if (i < side)
|
||||
{
|
||||
a[i][0] = 0;
|
||||
aux = step_h * (float) i;
|
||||
a[i][1] = (int) aux;
|
||||
aux = step_h * (float)i;
|
||||
a[i][1] = (int)aux;
|
||||
}
|
||||
else if (i < (side * 2))
|
||||
{
|
||||
a[i][0] = (int) ((float) (i % side) * step_w);
|
||||
a[i][0] = (int)((float)(i % side) * step_w);
|
||||
a[i][1] = canvas->h;
|
||||
}
|
||||
else if (i < (int) (side * 3))
|
||||
else if (i < (int)(side * 3))
|
||||
{
|
||||
a[i][0] = canvas->w;
|
||||
a[i][1] = (int) (canvas->h - (float) ((i % side) * step_h));
|
||||
a[i][1] = (int)(canvas->h - (float)((i % side) * step_h));
|
||||
}
|
||||
else if (i < (int) (side * 4))
|
||||
else if (i < (int)(side * 4))
|
||||
{
|
||||
a[i][0] = (int) (canvas->w - ((float) ((i % side) * step_w)));
|
||||
a[i][0] = (int)(canvas->w - ((float)((i % side) * step_w)));
|
||||
a[i][1] = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -361,8 +326,7 @@ static void string_draw_full_by_offset(void *ptr, int which ATTRIBUTE_UNUSED,
|
|||
for (i = 0; i < side * 4; i++)
|
||||
{
|
||||
u = (i + o) % (side * 4);
|
||||
api->line((void *) api, which, canvas, snapshot, a[i][0], a[i][1],
|
||||
a[u][0], a[u][1], 1, string_callback);
|
||||
api->line((void *)api, which, canvas, snapshot, a[i][0], a[i][1], a[u][0], a[u][1], 1, string_callback);
|
||||
}
|
||||
|
||||
for (i = 0; i < side * 4; i++)
|
||||
|
|
@ -403,18 +367,13 @@ void scale_coords(int *ox, int *oy, int *x, int *y)
|
|||
|
||||
void compute_middle(int start_point, int end_point, int vertex, int *middle)
|
||||
{
|
||||
*middle =
|
||||
min(start_point,
|
||||
end_point) + (max(start_point, end_point) - min(start_point,
|
||||
end_point)) / 2;
|
||||
*middle =
|
||||
min(*middle, vertex) + (max(*middle, vertex) - min(*middle, vertex)) / 2;
|
||||
*middle = min(start_point, end_point) + (max(start_point, end_point) - min(start_point, end_point)) / 2;
|
||||
*middle = min(*middle, vertex) + (max(*middle, vertex) - min(*middle, vertex)) / 2;
|
||||
}
|
||||
|
||||
void string_draw_triangle_preview(magic_api * api, int which,
|
||||
SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot, int ox, int oy,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
int middle_x, middle_y;
|
||||
|
||||
|
|
@ -429,21 +388,15 @@ void string_draw_triangle_preview(magic_api * api, int which,
|
|||
compute_middle(x, string_ox, string_ox, &middle_x);
|
||||
compute_middle(y, string_oy, string_oy, &middle_y);
|
||||
|
||||
api->line((void *) api, which, canvas, snapshot, string_ox, string_oy,
|
||||
string_ox, y, 1, string_callback_xor);
|
||||
api->line((void *) api, which, canvas, snapshot, string_ox, string_oy, x,
|
||||
string_oy, 1, string_callback_xor);
|
||||
api->line((void *) api, which, canvas, snapshot, middle_x, middle_y, x,
|
||||
string_oy, 1, string_callback_xor);
|
||||
api->line((void *) api, which, canvas, snapshot, string_ox, y, middle_x,
|
||||
middle_y, 1, string_callback_xor);
|
||||
api->line((void *)api, which, canvas, snapshot, string_ox, string_oy, string_ox, y, 1, string_callback_xor);
|
||||
api->line((void *)api, which, canvas, snapshot, string_ox, string_oy, x, string_oy, 1, string_callback_xor);
|
||||
api->line((void *)api, which, canvas, snapshot, middle_x, middle_y, x, string_oy, 1, string_callback_xor);
|
||||
api->line((void *)api, which, canvas, snapshot, string_ox, y, middle_x, middle_y, 1, string_callback_xor);
|
||||
}
|
||||
|
||||
void string_draw_angle_preview(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot,
|
||||
int ox ATTRIBUTE_UNUSED,
|
||||
int oy ATTRIBUTE_UNUSED, int x, int y,
|
||||
SDL_Rect * update_rect)
|
||||
int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
int middle_x, middle_y;
|
||||
int dx, dy;
|
||||
|
|
@ -454,7 +407,7 @@ void string_draw_angle_preview(magic_api * api, int which,
|
|||
update_rect->h = canvas->h;
|
||||
SDL_BlitSurface(canvas_backup, update_rect, canvas, update_rect);
|
||||
|
||||
api->line((void *) api, which, canvas, snapshot, string_ox, string_oy,
|
||||
api->line((void *)api, which, canvas, snapshot, string_ox, string_oy,
|
||||
string_vertex_x, string_vertex_y, 1, string_callback_xor);
|
||||
if (!string_vertex_done)
|
||||
{
|
||||
|
|
@ -469,22 +422,17 @@ void string_draw_angle_preview(magic_api * api, int which,
|
|||
compute_middle(string_ox, x, string_vertex_x, &middle_x);
|
||||
compute_middle(string_oy, y, string_vertex_y, &middle_y);
|
||||
|
||||
api->line((void *) api, which, canvas, snapshot, string_vertex_x,
|
||||
string_vertex_y, x, y, 1, string_callback_xor);
|
||||
api->line((void *) api, which, canvas, snapshot, string_ox, string_oy,
|
||||
middle_x, middle_y, 1, string_callback_xor);
|
||||
api->line((void *) api, which, canvas, snapshot, x, y, middle_x, middle_y,
|
||||
1, string_callback_xor);
|
||||
api->line((void *)api, which, canvas, snapshot, string_vertex_x, string_vertex_y, x, y, 1, string_callback_xor);
|
||||
api->line((void *)api, which, canvas, snapshot, string_ox, string_oy, middle_x, middle_y, 1, string_callback_xor);
|
||||
api->line((void *)api, which, canvas, snapshot, x, y, middle_x, middle_y, 1, string_callback_xor);
|
||||
}
|
||||
|
||||
void string_draw_angle(magic_api * api, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas,
|
||||
SDL_Surface * snapshot ATTRIBUTE_UNUSED,
|
||||
int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
int ox ATTRIBUTE_UNUSED, int oy ATTRIBUTE_UNUSED, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
float first_arm_step_x, first_arm_step_y, second_arm_step_x,
|
||||
second_arm_step_y;
|
||||
float first_arm_step_x, first_arm_step_y, second_arm_step_x, second_arm_step_y;
|
||||
int i;
|
||||
int max_wh, steps;
|
||||
int max_separation = 10;
|
||||
|
|
@ -498,29 +446,26 @@ void string_draw_angle(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
max_wh =
|
||||
max(max(max(string_ox, string_vertex_x), x) -
|
||||
min(min(string_vertex_x, x), string_ox),
|
||||
max(max(string_oy, string_vertex_y), y) - min(min(string_vertex_y, y),
|
||||
string_oy));
|
||||
max(max(string_oy, string_vertex_y), y) - min(min(string_vertex_y, y), string_oy));
|
||||
|
||||
steps = max_wh / max_separation;
|
||||
first_arm_step_x = (float) (string_ox - string_vertex_x) / (float) steps;
|
||||
first_arm_step_y = (float) (string_oy - string_vertex_y) / (float) steps;
|
||||
second_arm_step_x = (float) (string_vertex_x - x) / (float) steps;
|
||||
second_arm_step_y = (float) (string_vertex_y - y) / (float) steps;
|
||||
first_arm_step_x = (float)(string_ox - string_vertex_x) / (float)steps;
|
||||
first_arm_step_y = (float)(string_oy - string_vertex_y) / (float)steps;
|
||||
second_arm_step_x = (float)(string_vertex_x - x) / (float)steps;
|
||||
second_arm_step_y = (float)(string_vertex_y - y) / (float)steps;
|
||||
|
||||
for (i = 0; i <= steps; i++)
|
||||
{
|
||||
api->line((void *) api, 0, canvas, snapshot,
|
||||
api->line((void *)api, 0, canvas, snapshot,
|
||||
string_ox - first_arm_step_x * i,
|
||||
string_oy - first_arm_step_y * i,
|
||||
string_vertex_x - second_arm_step_x * i,
|
||||
string_vertex_y - second_arm_step_y * i, 1, string_callback);
|
||||
string_vertex_x - second_arm_step_x * i, string_vertex_y - second_arm_step_y * i, 1, string_callback);
|
||||
}
|
||||
}
|
||||
|
||||
void string_draw_triangle(magic_api * api, int which ATTRIBUTE_UNUSED,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot,
|
||||
int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect)
|
||||
int ox, int oy, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
SDL_BlitSurface(canvas_backup, 0, canvas, 0);
|
||||
scale_coords(&ox, &oy, &x, &y);
|
||||
|
|
@ -531,8 +476,7 @@ void string_draw_triangle(magic_api * api, int which ATTRIBUTE_UNUSED,
|
|||
string_oy = y;
|
||||
y = string_vertex_y;
|
||||
|
||||
string_draw_angle((void *) api, which, canvas, snapshot, string_ox,
|
||||
string_oy, x, y, update_rect);
|
||||
string_draw_angle((void *)api, which, canvas, snapshot, string_ox, string_oy, x, y, update_rect);
|
||||
}
|
||||
|
||||
void string_draw_wrapper(magic_api * api, int which,
|
||||
|
|
@ -540,14 +484,11 @@ void string_draw_wrapper(magic_api * api, int which,
|
|||
int oy, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
if (which == STRING_TOOL_FULL_BY_OFFSET)
|
||||
string_draw_full_by_offset((void *) api, which, canvas, snapshot, x, y,
|
||||
update_rect);
|
||||
string_draw_full_by_offset((void *)api, which, canvas, snapshot, x, y, update_rect);
|
||||
else if (which == STRING_TOOL_TRIANGLE)
|
||||
string_draw_triangle_preview((void *) api, which, canvas, snapshot, ox,
|
||||
oy, x, y, update_rect);
|
||||
string_draw_triangle_preview((void *)api, which, canvas, snapshot, ox, oy, x, y, update_rect);
|
||||
else if (which == STRING_TOOL_ANGLE)
|
||||
string_draw_angle_preview((void *) api, which, canvas, snapshot, ox, oy,
|
||||
x, y, update_rect);
|
||||
string_draw_angle_preview((void *)api, which, canvas, snapshot, ox, oy, x, y, update_rect);
|
||||
}
|
||||
|
||||
void string_set_vertex(int x, int y)
|
||||
|
|
@ -569,16 +510,13 @@ void string_set_vertex(int x, int y)
|
|||
}
|
||||
|
||||
void string_drag(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int ox, int oy,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
SDL_Surface * canvas, SDL_Surface * snapshot, int ox, int oy, int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
if ((x < canvas->w) && (y < canvas->h) && (ox < canvas->w)
|
||||
&& (oy < canvas->h) && ((signed) x > 0) && ((signed) y > 0)
|
||||
&& ((signed) ox > 0) && ((signed) oy > 0))
|
||||
&& (oy < canvas->h) && ((signed)x > 0) && ((signed)y > 0) && ((signed)ox > 0) && ((signed)oy > 0))
|
||||
{
|
||||
string_set_vertex(x, y);
|
||||
string_draw_wrapper((void *) api, which, canvas, snapshot, ox, oy, x, y,
|
||||
update_rect);
|
||||
string_draw_wrapper((void *)api, which, canvas, snapshot, ox, oy, x, y, update_rect);
|
||||
api->playsound(string_snd[which], (x * 255) / canvas->w, 255);
|
||||
|
||||
}
|
||||
|
|
@ -596,6 +534,8 @@ Uint8 string_default_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_
|
|||
return 0;
|
||||
}
|
||||
|
||||
void string_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 string_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