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

Wrap up Flower size support; new flower_base.png

Browse source
This commit is contained in:
Bill Kendrick 2023-04-23 15:45:18 -07:00
parent 3c3ba9a3b8
commit a1d3202754
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGES.txt
View file

@ -45,7 +45,7 @@ https://tuxpaint.org/
+ Distortion + Distortion
+ Emboss + Emboss
+ Fisheye + Fisheye
+ [WIP] Flower + Flower
+ Foam + Foam
+ Googly Eyes + Googly Eyes
+ Kaleidoscope, Symmetric L/R & U/D, Pattern, Tiles + Kaleidoscope, Symmetric L/R & U/D, Pattern, Tiles

BIN
magic/icons/flower_base.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

30
magic/src/flower.c
View file

@ -24,9 +24,6 @@
(See COPYING.txt) (See COPYING.txt)
Last updated: April 23, 2023 Last updated: April 23, 2023
FIXME:
* Bitmaps need to be redrawn at a larger size, to avoid blurriness
*/ */
#include <stdio.h> #include <stdio.h>
@ -162,7 +159,7 @@ int flower_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
return(0); return(0);
} }
/* N.B.: Leaf is 1/2 as wide as base & petals */ /* N.B.: Leaf is 1/2 as wide as base & petals */
h = tmp_surf->h * MAX_WIDTH / tmp_surf->w; h = tmp_surf->h * (MAX_WIDTH / 2) / tmp_surf->w;
flower_leaf_full = api->scale(tmp_surf, MAX_WIDTH / 2, h, 1); flower_leaf_full = api->scale(tmp_surf, MAX_WIDTH / 2, h, 1);
if (flower_leaf_full == NULL) { if (flower_leaf_full == NULL) {
fprintf(stderr, "Cannot scale %s", fname); fprintf(stderr, "Cannot scale %s", fname);
@ -446,8 +443,8 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED,
dest.x = left; dest.x = left;
dest.y = curve[i].y; dest.y = curve[i].y;
dest.w = right - left + ((flower_petals->w - 1) / 32) + 1; // 1px wide for smallest sizes; wider for larger sizes dest.w = right - left + (flower_petals->w / 32) + 2;
dest.h = 2 * (((flower_petals->w - 1) / 32) + 1); // 1px tall for smallest sizes; taller for larger sizes dest.h = 2 * ((flower_petals->w / 32) + 1);
} }
SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 42, 177, 42)); SDL_FillRect(canvas, &dest, SDL_MapRGB(canvas->format, 42, 177, 42));
@ -458,6 +455,8 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED,
if (final && i > flower_petals->h && i < n_points - flower_base->h && (i % (flower_leaf->h / 2)) == 0 if (final && i > flower_petals->h && i < n_points - flower_base->h && (i % (flower_leaf->h / 2)) == 0
&& (rand() % 5) > 0) && (rand() % 5) > 0)
{ {
int cx, cy;
/* Check for hard left/right angles: */ /* Check for hard left/right angles: */
side = -1; side = -1;
@ -495,10 +494,13 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED,
/* Draw the appropriately-oriented leaf, if any: */ /* Draw the appropriately-oriented leaf, if any: */
cx = (left + right) / 2;
cy = (curve[i].y);
if (side == LEAFSIDE_RIGHT_DOWN) if (side == LEAFSIDE_RIGHT_DOWN)
{ {
dest.x = curve[i].x; dest.x = cx;
dest.y = curve[i].y; dest.y = cy;
SDL_BlitSurface(flower_leaf, NULL, canvas, &dest); SDL_BlitSurface(flower_leaf, NULL, canvas, &dest);
} }
@ -511,8 +513,8 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED,
src.w = 1; src.w = 1;
src.h = flower_leaf->h; src.h = flower_leaf->h;
dest.x = curve[i].x - xx; dest.x = cx - xx;
dest.y = curve[i].y; dest.y = cy;
SDL_BlitSurface(flower_leaf, &src, canvas, &dest); SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
} }
@ -526,8 +528,8 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED,
src.w = flower_leaf->w; src.w = flower_leaf->w;
src.h = 1; src.h = 1;
dest.x = curve[i].x; dest.x = cx;
dest.y = curve[i].y - yy; dest.y = cy - yy;
SDL_BlitSurface(flower_leaf, &src, canvas, &dest); SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
} }
@ -543,8 +545,8 @@ static void flower_drawstalk(magic_api * api ATTRIBUTE_UNUSED,
src.w = 1; src.w = 1;
src.h = 1; src.h = 1;
dest.x = curve[i].x - xx; dest.x = cx - xx;
dest.y = curve[i].y - yy; dest.y = cy - yy;
SDL_BlitSurface(flower_leaf, &src, canvas, &dest); SDL_BlitSurface(flower_leaf, &src, canvas, &dest);
} }