callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins, pdb: remove the Solid Noise plug-in and add a PDB compat procedure

Browse Source
This commit is contained in:
Michael Natterer
2014-11-22 21:04:31 +01:00
parent 01c79a2661
commit 212b44cf2f
9 changed files with 202 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/pdb/internal-procs.c
View File

@ -28,7 +28,7 @@
#include "internal-procs.h"
/* 745 procedures registered total */
/* 746 procedures registered total */
void
internal_procs_init (GimpPDB *pdb)

133
app/pdb/plug-in-compat-cmds.c
View File

@ -2558,6 +2558,67 @@ plug_in_sobel_invoker (GimpProcedure *procedure,
error ? *error : NULL);
}
static GimpValueArray *
plug_in_solid_noise_invoker (GimpProcedure *procedure,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
const GimpValueArray *args,
GError **error)
{
gboolean success = TRUE;
GimpDrawable *drawable;
gboolean tilable;
gboolean turbulent;
gint32 seed;
gint32 detail;
gdouble xsize;
gdouble ysize;
drawable = gimp_value_get_drawable (gimp_value_array_index (args, 2), gimp);
tilable = g_value_get_boolean (gimp_value_array_index (args, 3));
turbulent = g_value_get_boolean (gimp_value_array_index (args, 4));
seed = g_value_get_int (gimp_value_array_index (args, 5));
detail = g_value_get_int (gimp_value_array_index (args, 6));
xsize = g_value_get_double (gimp_value_array_index (args, 7));
ysize = g_value_get_double (gimp_value_array_index (args, 8));
if (success)
{
if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
GIMP_PDB_ITEM_CONTENT, error) &&
gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
{
GeglNode *node;
gint x, y, width, height;
gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height);
node = gegl_node_new_child (NULL,
"operation", "gegl:noise-solid",
"x-size", xsize,
"y-size", ysize,
"detail", detail,
"tilable", tilable,
"turbulent", turbulent,
"seed", seed,
"width", width,
"height", height,
NULL);
gimp_drawable_apply_operation (drawable, progress,
C_("undo-type", "Solid Noise"),
node);
g_object_unref (node);
}
else
success = FALSE;
}
return gimp_procedure_get_return_values (procedure, success,
error ? *error : NULL);
}
static GimpValueArray *
plug_in_spread_invoker (GimpProcedure *procedure,
Gimp *gimp,
@ -5322,6 +5383,78 @@ register_plug_in_compat_procs (GimpPDB *pdb)
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
* gimp-plug-in-solid-noise
*/
procedure = gimp_procedure_new (plug_in_solid_noise_invoker);
gimp_object_set_static_name (GIMP_OBJECT (procedure),
"plug-in-solid-noise");
gimp_procedure_set_static_strings (procedure,
"plug-in-solid-noise",
"Create a random cloud-like texture",
"Generates 2D textures using Perlin's classic solid noise function.",
"Compatibility procedure. Please see 'gegl:noise-solid' for credits.",
"Compatibility procedure. Please see 'gegl:noise-solid' for credits.",
"2014",
NULL);
gimp_procedure_add_argument (procedure,
g_param_spec_enum ("run-mode",
"run mode",
"The run mode",
GIMP_TYPE_RUN_MODE,
GIMP_RUN_INTERACTIVE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_image_id ("image",
"image",
"Input image (unused)",
pdb->gimp, FALSE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_drawable_id ("drawable",
"drawable",
"Input drawable",
pdb->gimp, FALSE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("tilable",
"tilable",
"Create a tilable output",
FALSE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("turbulent",
"turbulent",
"Make a turbulent noise",
FALSE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("seed",
"seed",
"Random seed",
G_MININT32, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("detail",
"detail",
"Detail level",
0, 15, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("xsize",
"xsize",
"Horizontal texture size",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("ysize",
"ysize",
"Vertical texture size",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
* gimp-plug-in-spread
*/

2
plug-ins/common/.gitignore vendored
View File

@ -170,8 +170,6 @@
/newsprint.exe
/nl-filter
/nl-filter.exe
/noise-solid
/noise-solid.exe
/oilify
/oilify.exe
/photocopy

18
plug-ins/common/Makefile.am
View File

@ -128,7 +128,6 @@ libexec_PROGRAMS = \
metadata \
newsprint \
nl-filter \
noise-solid \
oilify \
photocopy \
plugin-browser \
@ -1669,23 +1668,6 @@ nl_filter_LDADD = \
$(INTLLIBS) \
$(nl_filter_RC)
noise_solid_SOURCES = \
noise-solid.c
noise_solid_LDADD = \
$(libgimpui) \
$(libgimpwidgets) \
$(libgimpmodule) \
$(libgimp) \
$(libgimpmath) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(noise_solid_RC)
oilify_SOURCES = \
oilify.c

1
plug-ins/common/gimprc.common
View File

@ -82,7 +82,6 @@ max_rgb_RC = max-rgb.rc.o
metadata_RC = metadata.rc.o
newsprint_RC = newsprint.rc.o
nl_filter_RC = nl-filter.rc.o
noise_solid_RC = noise-solid.rc.o
oilify_RC = oilify.rc.o
photocopy_RC = photocopy.rc.o
plugin_browser_RC = plugin-browser.rc.o

686
plug-ins/common/noise-solid.c
View File

@ -1,686 +0,0 @@
/* Solid Noise plug-in -- creates solid noise textures
* Copyright (C) 1997, 1998 Marcelo de Gomensoro Malheiros
*
* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Solid Noise plug-in version 1.04, May 2004
*
* This plug-in generates solid noise textures based on the
* `Noise' and `Turbulence' functions described in the paper
*
* Perlin, K, and Hoffert, E. M., "Hypertexture",
* Computer Graphics 23, 3 (August 1989)
*
* The algorithm implemented here also makes possible the
* creation of seamless tiles.
*
* You can contact me at <malheiro@dca.fee.unicamp.br>.
* Comments and improvements for this code are welcome.
*
* The overall plug-in structure is based on the Whirl plug-in,
* which is Copyright (C) 1997 Federico Mena Quintero
*/
/* Version 1.04:
*
* Dynamic preview added (Yeti <yeti@physics.muni.cz>).
*
* Version 1.03:
*
* Added patch from Kevin Turner <kevint@poboxes.com> to use the
* current time as the random seed. Thank you!
* Incorporated some portability changes from the GIMP distribution.
*
* Version 1.02:
*
* Fixed a stupid bug with the alpha channel.
* Fixed a rounding bug for small tilable textures.
* Now the dialog is more compact; using the settings from gtkrc.
*
* Version 1.01:
*
* Quick fix for wrong pdb declaration. Also changed default seed to 1.
* Thanks to Adrian Likins and Federico Mena for the patch!
*
* Version 1.0:
*
* Initial release.
*/
#include "config.h"
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
#include "libgimp/stdplugins-intl.h"
/*---- Defines ----*/
#define PLUG_IN_PROC "plug-in-solid-noise"
#define PLUG_IN_BINARY "noise-solid"
#define PLUG_IN_ROLE "gimp-noise-solid"
#define TABLE_SIZE 64
#define WEIGHT(T) ((2.0*fabs(T)-3.0)*(T)*(T)+1.0)
#define SCALE_WIDTH 128
#define MIN_SIZE 0.1
#define MAX_SIZE 16.0
/*---- Typedefs ----*/
typedef struct
{
gboolean tilable;
gboolean turbulent;
guint seed;
gint detail;
gdouble xsize;
gdouble ysize;
gboolean random_seed;
} SolidNoiseValues;
/*---- Prototypes ----*/
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static void solid_noise (GimpDrawable *drawable,
GimpPreview *preview);
static void solid_noise_init (void);
static gdouble plain_noise (gdouble x,
gdouble y,
guint s);
static gdouble noise (gdouble x,
gdouble y);
static gboolean solid_noise_dialog (GimpDrawable *drawable);
static void solid_noise_draw_one_tile (GimpPixelRgn *rgn,
gdouble width,
gdouble height,
gint xoffset,
gint yoffset,
gint chns,
gboolean has_alpha);
/*---- Variables ----*/
const GimpPlugInInfo PLUG_IN_INFO =
{
NULL, /* init_proc */
NULL, /* quit_proc */
query, /* query_proc */
run, /* run_proc */
};
static SolidNoiseValues snvals =
{
FALSE, /* tilable */
FALSE, /* turbulent */
0, /* seed */
1, /* detail */
4.0, /* xsize */
4.0, /* ysize */
FALSE /* random seed */
};
static gint xclip, yclip;
static gdouble offset, factor;
static gdouble xsize, ysize;
static gint perm_tab[TABLE_SIZE];
static GimpVector2 grad_tab[TABLE_SIZE];
/*---- Functions ----*/
MAIN ()
static void
query (void)
{
static const GimpParamDef args[] =
{
{ GIMP_PDB_INT32, "run-mode", "The run mode { RUN-INTERACTIVE (0), RUN-NONINTERACTIVE (1) }" },
{ GIMP_PDB_IMAGE, "image", "Input image" },
{ GIMP_PDB_DRAWABLE, "drawable", "Input drawable" },
{ GIMP_PDB_INT32, "tilable", "Create a tilable output { TRUE, FALSE }" },
{ GIMP_PDB_INT32, "turbulent", "Make a turbulent noise { TRUE, FALSE }" },
{ GIMP_PDB_INT32, "seed", "Random seed" },
{ GIMP_PDB_INT32, "detail", "Detail level (0 - 15)" },
{ GIMP_PDB_FLOAT, "xsize", "Horizontal texture size" },
{ GIMP_PDB_FLOAT, "ysize", "Vertical texture size" }
};
gimp_install_procedure (PLUG_IN_PROC,
N_("Create a random cloud-like texture"),
"Generates 2D textures using Perlin's classic "
"solid noise function.",
"Marcelo de Gomensoro Malheiros",
"Marcelo de Gomensoro Malheiros",
"May 2004, v1.04",
N_("_Solid Noise..."),
"RGB*, GRAY*",
GIMP_PLUGIN,
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Render/Noise");
}
static void
run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals)
{
static GimpParam values[1];
GimpDrawable *drawable;
GimpRunMode run_mode;
GimpPDBStatusType status;
status = GIMP_PDB_SUCCESS;
run_mode = param[0].data.d_int32;
INIT_I18N ();
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
drawable = gimp_drawable_get (param[2].data.d_drawable);
switch (run_mode)
{
case GIMP_RUN_INTERACTIVE:
gimp_get_data (PLUG_IN_PROC, &snvals);
if (!solid_noise_dialog (drawable))
return;
break;
case GIMP_RUN_NONINTERACTIVE:
if (nparams != 9)
{
status = GIMP_PDB_CALLING_ERROR;
}
else
{
snvals.tilable = param[3].data.d_int32;
snvals.turbulent = param[4].data.d_int32;
snvals.seed = param[5].data.d_int32;
snvals.detail = param[6].data.d_int32;
snvals.xsize = param[7].data.d_float;
snvals.ysize = param[8].data.d_float;
if (snvals.random_seed)
snvals.seed = g_random_int ();
}
break;
case GIMP_RUN_WITH_LAST_VALS:
/* Possibly retrieve data */
gimp_get_data (PLUG_IN_PROC, &snvals);
if (snvals.random_seed)
snvals.seed = g_random_int ();
break;
default:
break;
}
if ((status == GIMP_PDB_SUCCESS) &&
(gimp_drawable_is_rgb (drawable->drawable_id) ||
gimp_drawable_is_gray (drawable->drawable_id)))
{
solid_noise (drawable, NULL);
if (run_mode != GIMP_RUN_NONINTERACTIVE)
gimp_displays_flush ();
if (run_mode == GIMP_RUN_INTERACTIVE ||
run_mode == GIMP_RUN_WITH_LAST_VALS)
{
gimp_set_data (PLUG_IN_PROC, &snvals, sizeof (SolidNoiseValues));
}
}
else
{
status = GIMP_PDB_EXECUTION_ERROR;
}
values[0].data.d_status = status;
gimp_drawable_detach (drawable);
}
static void
solid_noise (GimpDrawable *drawable,
GimpPreview *preview)
{
GimpPixelRgn dest_rgn;
gint bytes;
gint x, y;
gint width, height;
gint progress, max_progress;
gpointer pr;
gboolean has_alpha;
gint rowstride;
gint i;
/* Get selection area */
if (preview)
{
x = 0;
y = 0;
gimp_preview_get_size (preview, &width, &height);
}
else
{
if (! gimp_drawable_mask_intersect (drawable->drawable_id,
&x, &y, &width, &height))
return;
}
/* Initialization */
solid_noise_init ();
if (!preview)
gimp_progress_init (_("Solid Noise"));
progress = 0;
max_progress = width * height;
bytes = gimp_drawable_bpp (drawable->drawable_id);
rowstride = width * bytes;
has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
if (preview)
{
dest_rgn.x = dest_rgn.y = 0;
dest_rgn.w = width;
dest_rgn.h = height;
dest_rgn.bpp = bytes;
dest_rgn.rowstride = rowstride;
dest_rgn.data = g_new (guchar, rowstride * height);
}
else
{
gimp_pixel_rgn_init (&dest_rgn, drawable,
x, y, width, height, TRUE, TRUE);
}
if (has_alpha)
bytes--;
if (preview)
{
solid_noise_draw_one_tile (&dest_rgn, width, height,
x, y, bytes, has_alpha);
}
else
{
for (pr = gimp_pixel_rgns_register (1, &dest_rgn), i = 0;
pr != NULL;
pr = gimp_pixel_rgns_process (pr), i++)
{
solid_noise_draw_one_tile (&dest_rgn, width, height,
x, y, bytes, has_alpha);
progress += dest_rgn.w * dest_rgn.h;
if (i % 16 == 0)
gimp_progress_update ((gdouble) progress / (gdouble) max_progress);
}
gimp_progress_update (1.0);
}
/* Update the drawable */
if (preview)
{
gimp_preview_draw_buffer (preview, dest_rgn.data, rowstride);
g_free (dest_rgn.data);
}
else
{
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x, y, width, height);
}
}
static void
solid_noise_draw_one_tile (GimpPixelRgn *dest_rgn,
gdouble width,
gdouble height,
gint xoffset,
gint yoffset,
gint chns,
gboolean has_alpha)
{
guchar *dest, *dest_row;
gint row, col, i;
guchar val;
dest_row = dest_rgn->data;
for (row = dest_rgn->y; row < (dest_rgn->y + dest_rgn->h); row++)
{
dest = dest_row;
for (col = dest_rgn->x; col < (dest_rgn->x + dest_rgn->w); col++)
{
val = (guchar) floor (255.0 * noise ((col - xoffset) / width,
(row - yoffset) / height));
for (i = 0; i < chns; i++)
*dest++ = val;
if (has_alpha)
*dest++ = 255;
}
dest_row += dest_rgn->rowstride;
}
}
static void
solid_noise_init (void)
{
gint i, j, k, t;
gdouble m;
GRand *gr;
gr = g_rand_new ();
g_rand_set_seed (gr, snvals.seed);
/* Force sane parameters */
snvals.detail = CLAMP (snvals.detail, 0, 15);
snvals.xsize = CLAMP (snvals.xsize, MIN_SIZE, MAX_SIZE);
snvals.ysize = CLAMP (snvals.ysize, MIN_SIZE, MAX_SIZE);
/* Set scaling factors */
if (snvals.tilable)
{
xsize = ceil (snvals.xsize);
ysize = ceil (snvals.ysize);
xclip = (gint) xsize;
yclip = (gint) ysize;
}
else
{
xsize = snvals.xsize;
ysize = snvals.ysize;
}
/* Set totally empiric normalization values */
if (snvals.turbulent)
{
offset = 0.0;
factor = 1.0;
}
else
{
offset = 0.94;
factor = 0.526;
}
/* Initialize the permutation table */
for (i = 0; i < TABLE_SIZE; i++)
perm_tab[i] = i;
for (i = 0; i < (TABLE_SIZE >> 1); i++)
{
j = g_rand_int_range (gr, 0, TABLE_SIZE);
k = g_rand_int_range (gr, 0, TABLE_SIZE);
t = perm_tab[j];
perm_tab[j] = perm_tab[k];
perm_tab[k] = t;
}
/* Initialize the gradient table */
for (i = 0; i < TABLE_SIZE; i++)
{
do
{
grad_tab[i].x = g_rand_double_range (gr, -1, 1);
grad_tab[i].y = g_rand_double_range (gr, -1, 1);
m = grad_tab[i].x * grad_tab[i].x + grad_tab[i].y * grad_tab[i].y;
}
while (m == 0.0 || m > 1.0);
m = 1.0 / sqrt(m);
grad_tab[i].x *= m;
grad_tab[i].y *= m;
}
g_rand_free (gr);
}
static gdouble
plain_noise (gdouble x,
gdouble y,
guint s)
{
GimpVector2 v;
gint a, b, i, j, n;
gdouble sum;
sum = 0.0;
x *= s;
y *= s;
a = (int) floor (x);
b = (int) floor (y);
for (i = 0; i < 2; i++)
for (j = 0; j < 2; j++)
{
if (snvals.tilable)
n = perm_tab[(((a + i) % (xclip * s)) + perm_tab[((b + j) % (yclip * s)) % TABLE_SIZE]) % TABLE_SIZE];
else
n = perm_tab[(a + i + perm_tab[(b + j) % TABLE_SIZE]) % TABLE_SIZE];
v.x = x - a - i;
v.y = y - b - j;
sum += WEIGHT(v.x) * WEIGHT(v.y) * (grad_tab[n].x * v.x + grad_tab[n].y * v.y);
}
return sum / s;
}
static gdouble
noise (gdouble x,
gdouble y)
{
gint i;
guint s;
gdouble sum;
s = 1;
sum = 0.0;
x *= xsize;
y *= ysize;
for (i = 0; i <= snvals.detail; i++)
{
if (snvals.turbulent)
sum += fabs (plain_noise (x, y, s));
else
sum += plain_noise (x, y, s);
s <<= 1;
}
return (sum+offset)*factor;
}
static gboolean
solid_noise_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *toggle;
GtkWidget *table;
GtkWidget *label;
GtkWidget *seed_hbox;
GtkWidget *spinbutton;
GtkObject *adj;
gboolean run;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
/* Dialog initialization */
dialog = gimp_dialog_new (_("Solid Noise"), PLUG_IN_ROLE,
NULL, 0,
gimp_standard_help_func, PLUG_IN_PROC,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
gimp_window_set_transient (GTK_WINDOW (dialog));
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
main_vbox, TRUE, TRUE, 0);
gtk_widget_show (main_vbox);
preview = gimp_aspect_preview_new (drawable, NULL);
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated",
G_CALLBACK (solid_noise),
drawable);
/* Table */
table = gtk_table_new (4, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Random Seed */
seed_hbox = gimp_random_seed_new (&snvals.seed, &snvals.random_seed);
label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("_Random seed:"), 1.0, 0.5,
seed_hbox, 1, TRUE);
gtk_label_set_mnemonic_widget (GTK_LABEL (label),
GIMP_RANDOM_SEED_SPINBUTTON (seed_hbox));
g_signal_connect_swapped (GIMP_RANDOM_SEED_SPINBUTTON_ADJ (seed_hbox),
"value-changed",
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Detail */
spinbutton = gimp_spin_button_new (&adj, snvals.detail,
1, 15, 1, 3, 0, 1, 0);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("_Detail:"), 0.0, 0.5,
spinbutton, 1, TRUE);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&snvals.detail);
g_signal_connect_swapped (adj, "value-changed",
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Turbulent */
toggle = gtk_check_button_new_with_mnemonic ( _("T_urbulent"));
gtk_table_attach (GTK_TABLE (table), toggle, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_FILL, 1, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), snvals.turbulent);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&snvals.turbulent);
g_signal_connect_swapped (toggle, "toggled",
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Tilable */
toggle = gtk_check_button_new_with_mnemonic ( _("T_ilable"));
gtk_table_attach (GTK_TABLE (table), toggle, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_FILL, 1, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), snvals.tilable);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&snvals.tilable);
g_signal_connect_swapped (toggle, "toggled",
G_CALLBACK (gimp_preview_invalidate),
preview);
/* X Size */
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
_("_X size:"), SCALE_WIDTH, 0,
snvals.xsize, MIN_SIZE, MAX_SIZE, 0.1, 1.0, 1,
TRUE, 0, 0,
NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&snvals.xsize);
g_signal_connect_swapped (adj, "value-changed",
G_CALLBACK (gimp_preview_invalidate),
preview);
/* Y Size */
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
_("_Y size:"), SCALE_WIDTH, 0,
snvals.ysize, MIN_SIZE, MAX_SIZE, 0.1, 1.0, 1,
TRUE, 0, 0,
NULL, NULL);
g_signal_connect (adj, "value-changed",
G_CALLBACK (gimp_double_adjustment_update),
&snvals.ysize);
g_signal_connect_swapped (adj, "value-changed",
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);
return run;
}

1
plug-ins/common/plugin-defs.pl
View File

@ -83,7 +83,6 @@
'metadata' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'newsprint' => { ui => 1 },
'nl-filter' => { ui => 1 },
'noise-solid' => { ui => 1 },
'oilify' => { ui => 1 },
'photocopy' => { ui => 1 },
'plugin-browser' => { ui => 1 },

1
po-plug-ins/POTFILES.in
View File

@ -87,7 +87,6 @@ plug-ins/common/max-rgb.c
plug-ins/common/metadata.c
plug-ins/common/newsprint.c
plug-ins/common/nl-filter.c
plug-ins/common/noise-solid.c
plug-ins/common/oilify.c
plug-ins/common/photocopy.c
plug-ins/common/plugin-browser.c

68
tools/pdbgen/pdb/plug_in_compat.pdb
View File

@ -2697,6 +2697,73 @@ CODE
);
}
sub plug_in_solid_noise {
$blurb = 'Create a random cloud-like texture';
$help = <<'HELP';
Generates 2D textures using Perlin's classic solid noise function.
HELP
&std_pdb_compat('gegl:noise-solid');
$date = '2014';
@inargs = (
{ name => 'run_mode', type => 'enum GimpRunMode', dead => 1,
desc => 'The run mode' },
{ name => 'image', type => 'image', dead => 1,
desc => 'Input image (unused)' },
{ name => 'drawable', type => 'drawable',
desc => 'Input drawable' },
{ name => 'tilable', type => 'boolean',
desc => 'Create a tilable output' },
{ name => 'turbulent', type => 'boolean',
desc => 'Make a turbulent noise' },
{ name => 'seed', type => 'int32',
desc => 'Random seed' },
{ name => 'detail', type => '0 <= int32 <= 15',
desc => 'Detail level' },
{ name => 'xsize', type => 'float',
desc => 'Horizontal texture size' },
{ name => 'ysize', type => 'float',
desc => 'Vertical texture size' }
);
%invoke = (
code => <<'CODE'
{
if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL,
GIMP_PDB_ITEM_CONTENT, error) &&
gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
{
GeglNode *node;
gint x, y, width, height;
gimp_item_mask_intersect (GIMP_ITEM (drawable), &x, &y, &width, &height);
node = gegl_node_new_child (NULL,
"operation", "gegl:noise-solid",
"x-size", xsize,
"y-size", ysize,
"detail", detail,
"tilable", tilable,
"turbulent", turbulent,
"seed", seed,
"width", width,
"height", height,
NULL);
gimp_drawable_apply_operation (drawable, progress,
C_("undo-type", "Solid Noise"),
node);
g_object_unref (node);
}
else
success = FALSE;
}
CODE
);
}
sub plug_in_spread {
$blurb = 'Move pixels around randomly';
@ -3231,6 +3298,7 @@ CODE
plug_in_shift
plug_in_sinus
plug_in_sobel
plug_in_solid_noise
plug_in_spread
plug_in_threshold_alpha
plug_in_video