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

Confetti: Support sizes

Browse source
This commit is contained in:
Bill Kendrick 2023-04-19 23:27:55 -07:00
parent 739881d3bc
commit 50e2e5a10b
2 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/CHANGES.txt
View file

@ -37,6 +37,7 @@ https://tuxpaint.org/
* Various Magic tools now support sizing options: * Various Magic tools now support sizing options:
+ Kaleidoscope + Kaleidoscope
+ Blur + Blur
+ Confetti
+ Googly Eyes + Googly Eyes
+ Puzzle + Puzzle
+ Rainbow & Smooth Rainbow + Rainbow & Smooth Rainbow

28
magic/src/confetti.c
View file

@ -1,5 +1,5 @@
/* /*
Last updated: February 12, 2023 Last updated: April 19, 2023
*/ */
#include <time.h> //For time() #include <time.h> //For time()
@ -8,7 +8,7 @@
#include "SDL_image.h" #include "SDL_image.h"
#include "SDL_mixer.h" #include "SDL_mixer.h"
#define CONFETTI_BRUSH_SIZE 8 //radius of each confetti circle static int CONFETTI_BRUSH_SIZE = 8; //radius of each confetti circle
#define CONFETTI_QUANTITY 3 //how many circles will be created every click? #define CONFETTI_QUANTITY 3 //how many circles will be created every click?
#ifdef __ANDROID__ #ifdef __ANDROID__
@ -28,7 +28,7 @@ Mix_Chunk *confetti_snd;
Uint32 confetti_api_version(void); Uint32 confetti_api_version(void);
void confetti_set_color(magic_api * api, int which, SDL_Surface * canvas, void confetti_set_color(magic_api * api, int which, SDL_Surface * canvas,
SDL_Surface * last, Uint8 r, Uint8 g, Uint8 b, SDL_Rect * update_rect); SDL_Surface * last, Uint8 r, Uint8 g, Uint8 b, SDL_Rect * update_rect);
int confetti_init(magic_api * api); int confetti_init(magic_api * api, Uint32 disabled_features);
int confetti_get_tool_count(magic_api * api); int confetti_get_tool_count(magic_api * api);
SDL_Surface *confetti_get_icon(magic_api * api, int which); SDL_Surface *confetti_get_icon(magic_api * api, int which);
char *confetti_get_name(magic_api * api, int which); char *confetti_get_name(magic_api * api, int which);
@ -71,7 +71,7 @@ void confetti_set_color(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UN
confetti_colors.b = b; confetti_colors.b = b;
} }
int confetti_init(magic_api * api) int confetti_init(magic_api * api, Uint32 disabled_features ATTRIBUTE_UNUSED)
{ {
char fname[1024]; char fname[1024];
@ -209,8 +209,8 @@ void confetti_click(magic_api * api, int which, int mode ATTRIBUTE_UNUSED,
for (i = 0; i < CONFETTI_QUANTITY; i++) for (i = 0; i < CONFETTI_QUANTITY; i++)
{ {
srand((dx + dy) / 2 + time(0)); //to get a unique seed even if dx and dy aren't defined srand((dx + dy) / 2 + time(0)); //to get a unique seed even if dx and dy aren't defined
dx = (rand() % 100) - 50; //generate a value between <-50; +50> dx = (rand() % CONFETTI_BRUSH_SIZE * 12) - (CONFETTI_BRUSH_SIZE * 6); //generate a value between <-50; +50>
dy = (rand() % 100) - 50; //to spread confetti around the cursor position dy = (rand() % CONFETTI_BRUSH_SIZE * 12) - (CONFETTI_BRUSH_SIZE * 6); //to spread confetti around the cursor position
if (!i) if (!i)
{ {
@ -274,3 +274,19 @@ int confetti_modes(magic_api * api ATTRIBUTE_UNUSED,
{ {
return (MODE_PAINT); return (MODE_PAINT);
} }
Uint8 confetti_accepted_sizes(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{
return 8;
}
Uint8 confetti_default_size(magic_api * api ATTRIBUTE_UNUSED, int which ATTRIBUTE_UNUSED, int mode ATTRIBUTE_UNUSED)
{
return 2;
}
void confetti_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)
{
CONFETTI_BRUSH_SIZE = size * 4;
}