Added ripples magic.
Added (not finished) (new) sparkles magic. Fixed printf localization bug in postscript printing. Got Text tool working when Pango is used.
This commit is contained in:
William Kendrick
parent
0ed6e2fd30
commit
c4b3e49215
7 changed files with 525 additions and 65 deletions
|
|
@ -32,7 +32,9 @@ all: negative.$(SO_TYPE) \
|
|||
metalpaint.$(SO_TYPE) \
|
||||
waves.$(SO_TYPE) \
|
||||
flower.$(SO_TYPE) \
|
||||
foam.$(SO_TYPE)
|
||||
foam.$(SO_TYPE) \
|
||||
ripples.$(SO_TYPE) \
|
||||
sparkles.$(SO_TYPE)
|
||||
|
||||
install:
|
||||
cd .. ; make install-magic-plugins
|
||||
|
|
@ -122,3 +124,11 @@ foam.$(SO_TYPE): src/foam.c
|
|||
@echo "Building Foam magic tool"
|
||||
@$(CC) $(CFLAGS) -shared -o $@ $<
|
||||
|
||||
ripples.$(SO_TYPE): src/ripples.c
|
||||
@echo "Building Ripples magic tool"
|
||||
@$(CC) $(CFLAGS) -shared -o $@ $<
|
||||
|
||||
sparkles.$(SO_TYPE): src/sparkles.c
|
||||
@echo "Building Sparkles magic tool"
|
||||
@$(CC) $(CFLAGS) -shared -o $@ $<
|
||||
|
||||
|
|
|
|||
149
magic/src/ripples.c
Normal file
149
magic/src/ripples.c
Normal file
|
|
@ -0,0 +1,149 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <libintl.h>
|
||||
#include "tp_magic_api.h"
|
||||
#include "SDL_image.h"
|
||||
#include "SDL_mixer.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
/* Our globals: */
|
||||
|
||||
Mix_Chunk * ripples_snd;
|
||||
|
||||
int ripples_z, ripples_brite;
|
||||
|
||||
Uint32 ripples_api_version(void) { return(TP_MAGIC_API_VERSION); }
|
||||
|
||||
#define deg_cos(x) cos((x) * M_PI / 180.0)
|
||||
#define deg_sin(x) sin((x) * M_PI / 180.0)
|
||||
|
||||
// No setup required:
|
||||
int ripples_init(magic_api * api)
|
||||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%s/sounds/magic/ripples.wav",
|
||||
api->data_directory);
|
||||
ripples_snd = Mix_LoadWAV(fname);
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
// We have multiple tools:
|
||||
int ripples_get_tool_count(magic_api * api)
|
||||
{
|
||||
return(1);
|
||||
}
|
||||
|
||||
// Load our icons:
|
||||
SDL_Surface * ripples_get_icon(magic_api * api, int which)
|
||||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%s/images/magic/ripples.png",
|
||||
api->data_directory);
|
||||
|
||||
return(IMG_Load(fname));
|
||||
}
|
||||
|
||||
// Return our names, localized:
|
||||
char * ripples_get_name(magic_api * api, int which)
|
||||
{
|
||||
return(strdup(gettext("Ripples")));
|
||||
}
|
||||
|
||||
// Return our descriptions, localized:
|
||||
char * ripples_get_description(magic_api * api, int which)
|
||||
{
|
||||
return(strdup(gettext("Click to make ripples appear over your picture.")));
|
||||
}
|
||||
|
||||
// Affect the canvas on drag:
|
||||
void ripples_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 ripples_linecb(void * ptr, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * last,
|
||||
int x, int y)
|
||||
{
|
||||
magic_api * api = (magic_api *) ptr;
|
||||
Uint8 r, g, b;
|
||||
Uint32 pix;
|
||||
|
||||
pix = api->getpixel(last, x + ripples_z, y + ripples_z);
|
||||
SDL_GetRGB(pix, last->format, &r, &g, &b);
|
||||
|
||||
r = max(0, min(255, r + ripples_brite));
|
||||
g = max(0, min(255, g + ripples_brite));
|
||||
b = max(0, min(255, b + ripples_brite));
|
||||
|
||||
api->putpixel(canvas, x, y, SDL_MapRGB(canvas->format, r, g, b));
|
||||
}
|
||||
|
||||
// Affect the canvas on click:
|
||||
void ripples_click(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * last,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
float radius;
|
||||
float fli;
|
||||
int ox, oy, nx, ny, d;
|
||||
|
||||
radius = 100;
|
||||
|
||||
for (fli = 0; fli < radius; fli = fli + .25)
|
||||
{
|
||||
ripples_z = (10 * deg_sin(((50 * 50) / (fli + 4)) * 10));
|
||||
|
||||
ox = fli * deg_cos(0) + x;
|
||||
oy = -fli * deg_sin(0) + y;
|
||||
|
||||
for (d = 0; d <= 360 + (360 / (fli + 1)); d = d + 360 / (fli + 1))
|
||||
{
|
||||
nx = fli * deg_cos(d) + x;
|
||||
ny = -fli * deg_sin(d) + y;
|
||||
|
||||
ripples_brite = (ripples_z * 20 * deg_sin(d + 45)) / ((fli / 4) + 1);
|
||||
|
||||
api->line(which, canvas, last, ox, oy, nx, ny, 1, ripples_linecb);
|
||||
|
||||
ox = nx;
|
||||
oy = ny;
|
||||
}
|
||||
}
|
||||
|
||||
update_rect->x = x - 100;
|
||||
update_rect->y = y - 100;
|
||||
update_rect->w = 200;
|
||||
update_rect->h = 200;
|
||||
}
|
||||
|
||||
// Affect the canvas on release:
|
||||
void ripples_release(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * last,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
}
|
||||
|
||||
// No setup happened:
|
||||
void ripples_shutdown(magic_api * api)
|
||||
{
|
||||
if (ripples_snd != NULL)
|
||||
Mix_FreeChunk(ripples_snd);
|
||||
}
|
||||
|
||||
// Record the color from Tux Paint:
|
||||
void ripples_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b)
|
||||
{
|
||||
}
|
||||
|
||||
// Use colors:
|
||||
int ripples_requires_colors(magic_api * api, int which)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
148
magic/src/sparkles.c
Normal file
148
magic/src/sparkles.c
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <libintl.h>
|
||||
#include "tp_magic_api.h"
|
||||
#include "SDL_image.h"
|
||||
#include "SDL_mixer.h"
|
||||
|
||||
|
||||
/* Our globals: */
|
||||
|
||||
Mix_Chunk * sparkles_snd;
|
||||
Uint8 sparkles_r, sparkles_g, sparkles_b;
|
||||
|
||||
|
||||
Uint32 sparkles_api_version(void) { return(TP_MAGIC_API_VERSION); }
|
||||
|
||||
|
||||
// No setup required:
|
||||
int sparkles_init(magic_api * api)
|
||||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%s/sounds/magic/sparkles.wav",
|
||||
api->data_directory);
|
||||
sparkles_snd = Mix_LoadWAV(fname);
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
// We have multiple tools:
|
||||
int sparkles_get_tool_count(magic_api * api)
|
||||
{
|
||||
return(1);
|
||||
}
|
||||
|
||||
// Load our icons:
|
||||
SDL_Surface * sparkles_get_icon(magic_api * api, int which)
|
||||
{
|
||||
char fname[1024];
|
||||
|
||||
snprintf(fname, sizeof(fname), "%s/images/magic/sparkles.png",
|
||||
api->data_directory);
|
||||
|
||||
return(IMG_Load(fname));
|
||||
}
|
||||
|
||||
// Return our names, localized:
|
||||
char * sparkles_get_name(magic_api * api, int which)
|
||||
{
|
||||
return(strdup(gettext("Sparkles")));
|
||||
}
|
||||
|
||||
// Return our descriptions, localized:
|
||||
char * sparkles_get_description(magic_api * api, int which)
|
||||
{
|
||||
return(strdup(gettext("Click and drag to draw glowing sparkles on your picture.")));
|
||||
}
|
||||
|
||||
// Do the effect:
|
||||
|
||||
void do_sparkles(void * ptr, int which, SDL_Surface * canvas, SDL_Surface * last,
|
||||
int x, int y)
|
||||
{
|
||||
magic_api * api = (magic_api *) ptr;
|
||||
int xx, yy;
|
||||
Uint32 pix;
|
||||
Uint8 r, g, b;
|
||||
int div;
|
||||
|
||||
for (yy = -8; yy < 8; yy++)
|
||||
{
|
||||
for (xx = -8; xx < 8; xx++)
|
||||
{
|
||||
if (api->in_circle(xx, yy, 8))
|
||||
{
|
||||
pix = api->getpixel(canvas, x + xx, y + yy);
|
||||
|
||||
SDL_GetRGB(pix, canvas->format, &r, &g, &b);
|
||||
|
||||
div = abs(xx * yy);
|
||||
if (div == 0)
|
||||
div = 1;
|
||||
|
||||
r = min(255, r + (sparkles_r / div));
|
||||
g = min(255, g + (sparkles_g / div));
|
||||
b = min(255, b + (sparkles_b / div));
|
||||
|
||||
api->putpixel(canvas, x + xx, y + yy,
|
||||
SDL_MapRGB(canvas->format, r, g, b));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Affect the canvas on drag:
|
||||
void sparkles_drag(magic_api * api, int which, SDL_Surface * canvas,
|
||||
SDL_Surface * last, int ox, int oy, int x, int y,
|
||||
SDL_Rect * update_rect)
|
||||
{
|
||||
api->line(which, canvas, last, ox, oy, x, y, 1, do_sparkles);
|
||||
|
||||
if (ox > x) { int tmp = ox; ox = x; x = tmp; }
|
||||
if (oy > y) { int tmp = oy; oy = y; y = tmp; }
|
||||
|
||||
update_rect->x = ox - 8;
|
||||
update_rect->y = oy - 8;
|
||||
update_rect->w = (x + 8) - update_rect->x;
|
||||
update_rect->h = (y + 8) - update_rect->h;
|
||||
|
||||
api->playsound(sparkles_snd, (x * 255) / canvas->w, 255);
|
||||
}
|
||||
|
||||
// Affect the canvas on click:
|
||||
void sparkles_click(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * last,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
sparkles_drag(api, which, canvas, last, x, y, x, y, update_rect);
|
||||
}
|
||||
|
||||
// Affect the canvas on release:
|
||||
void sparkles_release(magic_api * api, int which,
|
||||
SDL_Surface * canvas, SDL_Surface * last,
|
||||
int x, int y, SDL_Rect * update_rect)
|
||||
{
|
||||
}
|
||||
|
||||
// No setup happened:
|
||||
void sparkles_shutdown(magic_api * api)
|
||||
{
|
||||
if (sparkles_snd != NULL)
|
||||
Mix_FreeChunk(sparkles_snd);
|
||||
}
|
||||
|
||||
// Record the color from Tux Paint:
|
||||
void sparkles_set_color(magic_api * api, Uint8 r, Uint8 g, Uint8 b)
|
||||
{
|
||||
sparkles_r = r + 10;
|
||||
sparkles_g = g + 10;
|
||||
sparkles_b = b + 10;
|
||||
}
|
||||
|
||||
// Use colors:
|
||||
int sparkles_requires_colors(magic_api * api, int which)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue