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

Don't let the top of the funnel be wider than the half of the canvas

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2009-06-11 16:25:31 +00:00
parent 58f70c5e67
commit a11f34adda
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
magic/src/tornado.c
View file

@ -333,7 +333,11 @@ static void tornado_drawstalk(magic_api * api, SDL_Surface * canvas, SDL_Surface
curve = (Point2D *) malloc(sizeof(Point2D) * n_points); curve = (Point2D *) malloc(sizeof(Point2D) * n_points);
tornado_ComputeBezier(control_points, n_points, curve); tornado_ComputeBezier(control_points, n_points, curve);
top_w = max(32, n_points * n_points / 1000); if (n_points * n_points / 1000 > canvas->w / 2)
top_w = canvas->w / 2;
else
top_w = max(32, n_points * n_points / 1000);
int rotation = 0; int rotation = 0;
int p; int p;
/* Draw the curve: */ /* Draw the curve: */
@ -350,11 +354,17 @@ static void tornado_drawstalk(magic_api * api, SDL_Surface * canvas, SDL_Surface
} }
else else
{ {
int ii; int ii, ww;
ii = n_points - i; ii = n_points - i;
/* min 10 pixels then ii^2 / 2000 after some trys */ /* min 10 pixels then ii^2 / 2000 or 4 * ii^2 / canvas->w,
left = min(curve[i].x, curve[i + 1].x)-5-ii*ii/2000; don't let the top of funnel be wider than the half of canvas */
right = max(curve[i].x, curve[i + 1].x)+5+ii*ii/2000; if (n_points * n_points / 2000 > canvas->w / 4)
ww = 4 * n_points * n_points / canvas->w;
else
ww = 2000;
left = min(curve[i].x, curve[i + 1].x)-5-ii*ii/ww;
right = max(curve[i].x, curve[i + 1].x)+5+ii*ii/ww;
dest.x = left; dest.x = left;
dest.y = curve[i].y; dest.y = curve[i].y;