mirror of https://github.com/GNOME/gimp.git
Added a preview and minor cleanups. Can someone provide useful testcases
* plug-ins/common/displace.c: Added a preview and minor cleanups. Can someone provide useful testcases for this plug-in?
This commit is contained in:
David Odin
parent
9f6c4515bd
commit
48d2f01f22
|
|
@ -1,3 +1,8 @@
|
|||
2004-10-17 DindinX <dindinx@gimp.org>
|
||||
|
||||
* plug-ins/common/displace.c: Added a preview and minor cleanups.
|
||||
Can someone provide useful testcases for this plug-in?
|
||||
|
||||
2004-10-16 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/widgets/gimpitemtreeview.[ch]: moved "item_type" and
|
||||
|
|
|
|||
|
|
@ -62,13 +62,14 @@
|
|||
|
||||
typedef struct
|
||||
{
|
||||
gdouble amount_x;
|
||||
gdouble amount_y;
|
||||
gint do_x;
|
||||
gint do_y;
|
||||
gint displace_map_x;
|
||||
gint displace_map_y;
|
||||
gint displace_type;
|
||||
gdouble amount_x;
|
||||
gdouble amount_y;
|
||||
gint do_x;
|
||||
gint do_y;
|
||||
gint displace_map_x;
|
||||
gint displace_map_y;
|
||||
gint displace_type;
|
||||
gboolean preview;
|
||||
} DisplaceVals;
|
||||
|
||||
|
||||
|
|
@ -78,20 +79,21 @@ typedef struct
|
|||
|
||||
static void query (void);
|
||||
static void run (const gchar *name,
|
||||
gint nparams,
|
||||
const GimpParam *param,
|
||||
gint *nreturn_vals,
|
||||
GimpParam **return_vals);
|
||||
gint nparams,
|
||||
const GimpParam *param,
|
||||
gint *nreturn_vals,
|
||||
GimpParam **return_vals);
|
||||
|
||||
static void displace (GimpDrawable *drawable);
|
||||
static void displace (GimpDrawable *drawable,
|
||||
GimpPreview *preview);
|
||||
static gboolean displace_dialog (GimpDrawable *drawable);
|
||||
|
||||
static gboolean displace_map_constrain (gint32 image_id,
|
||||
gint32 drawable_id,
|
||||
gpointer data);
|
||||
gint32 drawable_id,
|
||||
gpointer data);
|
||||
static gdouble displace_map_give_value (guchar *ptr,
|
||||
gint alpha,
|
||||
gint bytes);
|
||||
gint alpha,
|
||||
gint bytes);
|
||||
|
||||
/***** Local vars *****/
|
||||
|
||||
|
|
@ -105,13 +107,14 @@ GimpPlugInInfo PLUG_IN_INFO =
|
|||
|
||||
static DisplaceVals dvals =
|
||||
{
|
||||
20.0, /* amount_x */
|
||||
20.0, /* amount_y */
|
||||
TRUE, /* do_x */
|
||||
TRUE, /* do_y */
|
||||
-1, /* displace_map_x */
|
||||
-1, /* displace_map_y */
|
||||
GIMP_PIXEL_FETCHER_EDGE_WRAP /* displace_type */
|
||||
20.0, /* amount_x */
|
||||
20.0, /* amount_y */
|
||||
TRUE, /* do_x */
|
||||
TRUE, /* do_y */
|
||||
-1, /* displace_map_x */
|
||||
-1, /* displace_map_y */
|
||||
GIMP_PIXEL_FETCHER_EDGE_WRAP, /* displace_type */
|
||||
TRUE
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -137,22 +140,22 @@ query (void)
|
|||
};
|
||||
|
||||
gimp_install_procedure ("plug_in_displace",
|
||||
"Displace the contents of the specified drawable",
|
||||
"Displaces the contents of the specified drawable "
|
||||
"by the amounts specified by 'amount_x' and "
|
||||
"'amount_y' multiplied by the intensity of "
|
||||
"corresponding pixels in the 'displace_map' "
|
||||
"drawables. Both 'displace_map' drawables must be "
|
||||
"of type GIMP_GRAY_IMAGE for this operation to succeed.",
|
||||
"Stephen Robert Norris & (ported to 1.0 by) "
|
||||
"Spencer Kimball",
|
||||
"Stephen Robert Norris",
|
||||
"1996",
|
||||
N_("_Displace..."),
|
||||
"RGB*, GRAY*",
|
||||
GIMP_PLUGIN,
|
||||
G_N_ELEMENTS (args), 0,
|
||||
args, NULL);
|
||||
"Displace the contents of the specified drawable",
|
||||
"Displaces the contents of the specified drawable "
|
||||
"by the amounts specified by 'amount_x' and "
|
||||
"'amount_y' multiplied by the intensity of "
|
||||
"corresponding pixels in the 'displace_map' "
|
||||
"drawables. Both 'displace_map' drawables must be "
|
||||
"of type GIMP_GRAY_IMAGE for this operation to succeed.",
|
||||
"Stephen Robert Norris & (ported to 1.0 by) "
|
||||
"Spencer Kimball",
|
||||
"Stephen Robert Norris",
|
||||
"1996",
|
||||
N_("_Displace..."),
|
||||
"RGB*, GRAY*",
|
||||
GIMP_PLUGIN,
|
||||
G_N_ELEMENTS (args), 0,
|
||||
args, NULL);
|
||||
|
||||
gimp_plugin_menu_register ("plug_in_displace", "<Image>/Filters/Map");
|
||||
}
|
||||
|
|
@ -190,25 +193,25 @@ run (const gchar *name,
|
|||
|
||||
/* First acquire information with a dialog */
|
||||
if (! displace_dialog (drawable))
|
||||
return;
|
||||
return;
|
||||
break;
|
||||
|
||||
case GIMP_RUN_NONINTERACTIVE:
|
||||
/* Make sure all the arguments are there! */
|
||||
if (nparams != 10)
|
||||
{
|
||||
status = GIMP_PDB_CALLING_ERROR;
|
||||
}
|
||||
{
|
||||
status = GIMP_PDB_CALLING_ERROR;
|
||||
}
|
||||
else
|
||||
{
|
||||
dvals.amount_x = param[3].data.d_float;
|
||||
dvals.amount_y = param[4].data.d_float;
|
||||
dvals.do_x = param[5].data.d_int32;
|
||||
dvals.do_y = param[6].data.d_int32;
|
||||
dvals.displace_map_x = param[7].data.d_int32;
|
||||
dvals.displace_map_y = param[8].data.d_int32;
|
||||
dvals.displace_type = param[9].data.d_int32;
|
||||
}
|
||||
{
|
||||
dvals.amount_x = param[3].data.d_float;
|
||||
dvals.amount_y = param[4].data.d_float;
|
||||
dvals.do_x = param[5].data.d_int32;
|
||||
dvals.do_y = param[6].data.d_int32;
|
||||
dvals.displace_map_x = param[7].data.d_int32;
|
||||
dvals.displace_map_y = param[8].data.d_int32;
|
||||
dvals.displace_type = param[9].data.d_int32;
|
||||
}
|
||||
break;
|
||||
|
||||
case GIMP_RUN_WITH_LAST_VALS:
|
||||
|
|
@ -228,14 +231,14 @@ run (const gchar *name,
|
|||
gimp_tile_cache_ntiles (TILE_CACHE_SIZE);
|
||||
|
||||
/* run the displace effect */
|
||||
displace (drawable);
|
||||
displace (drawable, NULL);
|
||||
|
||||
if (run_mode != GIMP_RUN_NONINTERACTIVE)
|
||||
gimp_displays_flush ();
|
||||
gimp_displays_flush ();
|
||||
|
||||
/* Store data */
|
||||
if (run_mode == GIMP_RUN_INTERACTIVE)
|
||||
gimp_set_data ("plug_in_displace", &dvals, sizeof (DisplaceVals));
|
||||
gimp_set_data ("plug_in_displace", &dvals, sizeof (DisplaceVals));
|
||||
}
|
||||
|
||||
values[0].data.d_status = status;
|
||||
|
|
@ -246,55 +249,77 @@ run (const gchar *name,
|
|||
static gboolean
|
||||
displace_dialog (GimpDrawable *drawable)
|
||||
{
|
||||
GtkWidget *dlg;
|
||||
GtkWidget *dialog;
|
||||
GtkWidget *main_vbox;
|
||||
GtkWidget *preview;
|
||||
GtkWidget *toggle;
|
||||
GtkWidget *table;
|
||||
GtkWidget *spinbutton;
|
||||
GtkObject *adj;
|
||||
GtkWidget *combo;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *wrap;
|
||||
GtkWidget *smear;
|
||||
GtkWidget *black;
|
||||
gboolean run;
|
||||
|
||||
gimp_ui_init ("displace", FALSE);
|
||||
|
||||
dlg = gimp_dialog_new (_("Displace"), "displace",
|
||||
NULL, 0,
|
||||
gimp_standard_help_func, "plug-in-displace",
|
||||
dialog = gimp_dialog_new (_("Displace"), "displace",
|
||||
NULL, 0,
|
||||
gimp_standard_help_func, "plug-in-displace",
|
||||
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
||||
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
||||
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
main_vbox = gtk_vbox_new (FALSE, 12);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
|
||||
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
|
||||
gtk_widget_show (main_vbox);
|
||||
|
||||
preview = gimp_drawable_preview_new (drawable, &dvals.preview);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
|
||||
gtk_widget_show (preview);
|
||||
g_signal_connect_swapped (preview, "invalidated",
|
||||
G_CALLBACK (displace),
|
||||
drawable);
|
||||
|
||||
/* The main table */
|
||||
|
||||
table = gtk_table_new (3, 3, FALSE);
|
||||
gtk_table_set_row_spacings (GTK_TABLE (table), 12);
|
||||
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (table), 12);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
|
||||
|
||||
/* X options */
|
||||
toggle = gtk_check_button_new_with_mnemonic (_("_X displacement:"));
|
||||
gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 0, 1,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), dvals.do_x);
|
||||
gtk_widget_show (toggle);
|
||||
|
||||
g_signal_connect (toggle, "toggled",
|
||||
G_CALLBACK (gimp_toggle_button_update),
|
||||
&dvals.do_x);
|
||||
g_signal_connect_swapped (toggle, "toggled",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
|
||||
spinbutton = gimp_spin_button_new (&adj, dvals.amount_x,
|
||||
(gint) drawable->width * -2,
|
||||
drawable->width * 2,
|
||||
1, 10, 0, 1, 2);
|
||||
(gint) drawable->width * -2,
|
||||
drawable->width * 2,
|
||||
1, 10, 0, 1, 2);
|
||||
gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 0, 1,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
|
||||
g_signal_connect (adj, "value_changed",
|
||||
G_CALLBACK (gimp_double_adjustment_update),
|
||||
&dvals.amount_x);
|
||||
g_signal_connect_swapped (adj, "value_changed",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
|
||||
gtk_widget_set_sensitive (spinbutton, dvals.do_x);
|
||||
g_object_set_data (G_OBJECT (toggle), "set_sensitive", spinbutton);
|
||||
|
|
@ -304,9 +329,12 @@ displace_dialog (GimpDrawable *drawable)
|
|||
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), dvals.displace_map_x,
|
||||
G_CALLBACK (gimp_int_combo_box_get_active),
|
||||
&dvals.displace_map_x);
|
||||
g_signal_connect_swapped (combo, "changed",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
|
||||
gtk_table_attach (GTK_TABLE (table), combo, 2, 3, 0, 1,
|
||||
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
|
||||
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
gtk_widget_set_sensitive (combo, dvals.do_x);
|
||||
|
|
@ -315,24 +343,30 @@ displace_dialog (GimpDrawable *drawable)
|
|||
/* Y Options */
|
||||
toggle = gtk_check_button_new_with_mnemonic (_("_Y displacement:"));
|
||||
gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 1, 2,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), dvals.do_y);
|
||||
gtk_widget_show (toggle);
|
||||
|
||||
g_signal_connect (toggle, "toggled",
|
||||
G_CALLBACK (gimp_toggle_button_update),
|
||||
&dvals.do_y);
|
||||
g_signal_connect_swapped (toggle, "toggled",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
|
||||
spinbutton = gimp_spin_button_new (&adj, dvals.amount_y,
|
||||
(gint) drawable->height * -2,
|
||||
drawable->height * 2,
|
||||
1, 10, 0, 1, 2);
|
||||
(gint) drawable->height * -2,
|
||||
drawable->height * 2,
|
||||
1, 10, 0, 1, 2);
|
||||
gtk_table_attach (GTK_TABLE (table), spinbutton, 1, 2, 1, 2,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
|
||||
g_signal_connect (adj, "value_changed",
|
||||
G_CALLBACK (gimp_double_adjustment_update),
|
||||
&dvals.amount_y);
|
||||
g_signal_connect_swapped (adj, "value_changed",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
|
||||
gtk_widget_set_sensitive (spinbutton, dvals.do_y);
|
||||
g_object_set_data (G_OBJECT (toggle), "set_sensitive", spinbutton);
|
||||
|
|
@ -342,9 +376,12 @@ displace_dialog (GimpDrawable *drawable)
|
|||
gimp_int_combo_box_connect (GIMP_INT_COMBO_BOX (combo), dvals.displace_map_y,
|
||||
G_CALLBACK (gimp_int_combo_box_get_active),
|
||||
&dvals.displace_map_y);
|
||||
g_signal_connect_swapped (combo, "changed",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
|
||||
gtk_table_attach (GTK_TABLE (table), combo, 2, 3, 1, 2,
|
||||
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
|
||||
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
|
||||
gtk_widget_show (combo);
|
||||
|
||||
gtk_widget_set_sensitive (combo, dvals.do_y);
|
||||
|
|
@ -352,26 +389,36 @@ displace_dialog (GimpDrawable *drawable)
|
|||
|
||||
frame = gimp_int_radio_group_new (TRUE, _("On Edges:"),
|
||||
G_CALLBACK (gimp_radio_button_update),
|
||||
&dvals.displace_type, dvals.displace_type,
|
||||
&dvals.displace_type, dvals.displace_type,
|
||||
|
||||
_("_Wrap"), GIMP_PIXEL_FETCHER_EDGE_WRAP,
|
||||
NULL,
|
||||
&wrap,
|
||||
_("_Smear"), GIMP_PIXEL_FETCHER_EDGE_SMEAR,
|
||||
NULL,
|
||||
&smear,
|
||||
_("_Black"), GIMP_PIXEL_FETCHER_EDGE_BLACK,
|
||||
NULL,
|
||||
&black,
|
||||
|
||||
NULL);
|
||||
gtk_table_attach (GTK_TABLE (table), frame, 0, 3, 2, 3,
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
GTK_FILL, GTK_FILL, 0, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
g_signal_connect_swapped (wrap, "toggled",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
g_signal_connect_swapped (smear, "toggled",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
g_signal_connect_swapped (black, "toggled",
|
||||
G_CALLBACK (gimp_preview_invalidate),
|
||||
preview);
|
||||
|
||||
gtk_widget_show (table);
|
||||
gtk_widget_show (dlg);
|
||||
gtk_widget_show (dialog);
|
||||
|
||||
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
|
||||
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
|
||||
|
||||
gtk_widget_destroy (dlg);
|
||||
gtk_widget_destroy (dialog);
|
||||
|
||||
return run;
|
||||
}
|
||||
|
|
@ -379,41 +426,43 @@ displace_dialog (GimpDrawable *drawable)
|
|||
/* The displacement is done here. */
|
||||
|
||||
static void
|
||||
displace (GimpDrawable *drawable)
|
||||
displace (GimpDrawable *drawable,
|
||||
GimpPreview *preview)
|
||||
{
|
||||
GimpDrawable *map_x;
|
||||
GimpDrawable *map_y;
|
||||
GimpPixelRgn dest_rgn;
|
||||
GimpPixelRgn map_x_rgn;
|
||||
GimpPixelRgn map_y_rgn;
|
||||
gpointer pr;
|
||||
GimpDrawable *map_x;
|
||||
GimpDrawable *map_y;
|
||||
GimpPixelRgn dest_rgn;
|
||||
GimpPixelRgn map_x_rgn;
|
||||
GimpPixelRgn map_y_rgn;
|
||||
gpointer pr;
|
||||
GimpPixelFetcher *pft;
|
||||
|
||||
gint width;
|
||||
gint height;
|
||||
gint bytes;
|
||||
guchar *destrow, *dest;
|
||||
guchar *mxrow, *mx;
|
||||
guchar *myrow, *my;
|
||||
guchar pixel[4][4];
|
||||
gint x1, y1, x2, y2;
|
||||
gint x, y;
|
||||
gint progress, max_progress;
|
||||
gint width;
|
||||
gint height;
|
||||
gint bytes;
|
||||
guchar *destrow, *dest;
|
||||
guchar *mxrow, *mx;
|
||||
guchar *myrow, *my;
|
||||
guchar pixel[4][4];
|
||||
gint x1, y1, x2, y2;
|
||||
gint x, y;
|
||||
gint progress, max_progress;
|
||||
|
||||
gdouble amnt;
|
||||
gdouble needx, needy;
|
||||
gint xi, yi;
|
||||
gdouble amnt;
|
||||
gdouble needx, needy;
|
||||
gint xi, yi;
|
||||
|
||||
guchar values[4];
|
||||
guchar val;
|
||||
guchar values[4];
|
||||
guchar val;
|
||||
|
||||
gint k;
|
||||
gint k;
|
||||
|
||||
gdouble xm_val, ym_val;
|
||||
gint xm_alpha = 0;
|
||||
gint ym_alpha = 0;
|
||||
gint xm_bytes = 1;
|
||||
gint ym_bytes = 1;
|
||||
gdouble xm_val, ym_val;
|
||||
gint xm_alpha = 0;
|
||||
gint ym_alpha = 0;
|
||||
gint xm_bytes = 1;
|
||||
gint ym_bytes = 1;
|
||||
guchar *buffer = NULL;
|
||||
|
||||
/* initialize */
|
||||
|
||||
|
|
@ -423,14 +472,26 @@ displace (GimpDrawable *drawable)
|
|||
pft = gimp_pixel_fetcher_new (drawable, FALSE);
|
||||
gimp_pixel_fetcher_set_edge_mode (pft, dvals.displace_type);
|
||||
|
||||
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
|
||||
|
||||
width = drawable->width;
|
||||
height = drawable->height;
|
||||
bytes = drawable->bpp;
|
||||
|
||||
if (preview)
|
||||
{
|
||||
gimp_preview_get_position (preview, &x1, &y1);
|
||||
gimp_preview_get_size (preview, &width, &height);
|
||||
x2 = x1 + width;
|
||||
y2 = y1 + height;
|
||||
buffer = g_new (guchar, width * height * bytes);
|
||||
}
|
||||
else
|
||||
{
|
||||
gimp_drawable_mask_bounds (drawable->drawable_id,
|
||||
&x1, &y1, &x2, &y2);
|
||||
width = x2 - x1;
|
||||
height = y2 - y1;
|
||||
}
|
||||
|
||||
progress = 0;
|
||||
max_progress = (x2 - x1) * (y2 - y1);
|
||||
max_progress = width * height;
|
||||
|
||||
/*
|
||||
* The algorithm used here is simple - see
|
||||
|
|
@ -442,9 +503,9 @@ displace (GimpDrawable *drawable)
|
|||
{
|
||||
map_x = gimp_drawable_get (dvals.displace_map_x);
|
||||
gimp_pixel_rgn_init (&map_x_rgn, map_x,
|
||||
x1, y1, (x2 - x1), (y2 - y1), FALSE, FALSE);
|
||||
x1, y1, width, height, FALSE, FALSE);
|
||||
if (gimp_drawable_has_alpha(map_x->drawable_id))
|
||||
xm_alpha = 1;
|
||||
xm_alpha = 1;
|
||||
xm_bytes = gimp_drawable_bpp(map_x->drawable_id);
|
||||
}
|
||||
else
|
||||
|
|
@ -454,16 +515,17 @@ displace (GimpDrawable *drawable)
|
|||
{
|
||||
map_y = gimp_drawable_get (dvals.displace_map_y);
|
||||
gimp_pixel_rgn_init (&map_y_rgn, map_y,
|
||||
x1, y1, x2 - x1, y2 - y1, FALSE, FALSE);
|
||||
x1, y1, width, height, FALSE, FALSE);
|
||||
if (gimp_drawable_has_alpha(map_y->drawable_id))
|
||||
ym_alpha = 1;
|
||||
ym_alpha = 1;
|
||||
ym_bytes = gimp_drawable_bpp(map_y->drawable_id);
|
||||
}
|
||||
else
|
||||
map_y = NULL;
|
||||
|
||||
gimp_pixel_rgn_init (&dest_rgn, drawable,
|
||||
x1, y1, (x2 - x1), (y2 - y1), TRUE, TRUE);
|
||||
x1, y1, width, height,
|
||||
preview == NULL, preview == NULL);
|
||||
|
||||
/* Register the pixel regions */
|
||||
if (dvals.do_x && dvals.do_y)
|
||||
|
|
@ -479,83 +541,89 @@ displace (GimpDrawable *drawable)
|
|||
{
|
||||
destrow = dest_rgn.data;
|
||||
if (dvals.do_x)
|
||||
mxrow = map_x_rgn.data;
|
||||
mxrow = map_x_rgn.data;
|
||||
if (dvals.do_y)
|
||||
myrow = map_y_rgn.data;
|
||||
myrow = map_y_rgn.data;
|
||||
|
||||
for (y = dest_rgn.y; y < (dest_rgn.y + dest_rgn.h); y++)
|
||||
{
|
||||
dest = destrow;
|
||||
mx = mxrow;
|
||||
my = myrow;
|
||||
{
|
||||
if (preview)
|
||||
dest = buffer + ((y - y1) * width + (dest_rgn.x - x1)) * bytes;
|
||||
else
|
||||
dest = destrow;
|
||||
mx = mxrow;
|
||||
my = myrow;
|
||||
|
||||
/*
|
||||
* We could move the displacement image address calculation out of here,
|
||||
* but when we can have different sized displacement and destination
|
||||
* images we'd have to move it back anyway.
|
||||
*/
|
||||
/*
|
||||
* We could move the displacement image address calculation out of here,
|
||||
* but when we can have different sized displacement and destination
|
||||
* images we'd have to move it back anyway.
|
||||
*/
|
||||
|
||||
for (x = dest_rgn.x; x < (dest_rgn.x + dest_rgn.w); x++)
|
||||
{
|
||||
if (dvals.do_x)
|
||||
{
|
||||
xm_val = displace_map_give_value(mx, xm_alpha, xm_bytes);
|
||||
amnt = dvals.amount_x * (xm_val - 127.5) / 127.5;
|
||||
needx = x + amnt;
|
||||
mx += xm_bytes;
|
||||
}
|
||||
else
|
||||
needx = x;
|
||||
for (x = dest_rgn.x; x < (dest_rgn.x + dest_rgn.w); x++)
|
||||
{
|
||||
if (dvals.do_x)
|
||||
{
|
||||
xm_val = displace_map_give_value(mx, xm_alpha, xm_bytes);
|
||||
amnt = dvals.amount_x * (xm_val - 127.5) / 127.5;
|
||||
needx = x + amnt;
|
||||
mx += xm_bytes;
|
||||
}
|
||||
else
|
||||
needx = x;
|
||||
|
||||
if (dvals.do_y)
|
||||
{
|
||||
ym_val = displace_map_give_value(my, ym_alpha, ym_bytes);
|
||||
amnt = dvals.amount_y * (ym_val - 127.5) / 127.5;
|
||||
needy = y + amnt;
|
||||
my += ym_bytes;
|
||||
}
|
||||
else
|
||||
needy = y;
|
||||
if (dvals.do_y)
|
||||
{
|
||||
ym_val = displace_map_give_value(my, ym_alpha, ym_bytes);
|
||||
amnt = dvals.amount_y * (ym_val - 127.5) / 127.5;
|
||||
needy = y + amnt;
|
||||
my += ym_bytes;
|
||||
}
|
||||
else
|
||||
needy = y;
|
||||
|
||||
/* Calculations complete; now copy the proper pixel */
|
||||
/* Calculations complete; now copy the proper pixel */
|
||||
|
||||
if (needx >= 0.0)
|
||||
xi = (int) needx;
|
||||
else
|
||||
xi = -((int) -needx + 1);
|
||||
if (needx >= 0.0)
|
||||
xi = (int) needx;
|
||||
else
|
||||
xi = -((int) -needx + 1);
|
||||
|
||||
if (needy >= 0.0)
|
||||
yi = (int) needy;
|
||||
else
|
||||
yi = -((int) -needy + 1);
|
||||
if (needy >= 0.0)
|
||||
yi = (int) needy;
|
||||
else
|
||||
yi = -((int) -needy + 1);
|
||||
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi, yi, pixel[0]);
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi + 1, yi, pixel[1]);
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi, yi + 1, pixel[2]);
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi + 1, yi + 1, pixel[3]);
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi, yi, pixel[0]);
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi + 1, yi, pixel[1]);
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi, yi + 1, pixel[2]);
|
||||
gimp_pixel_fetcher_get_pixel (pft, xi + 1, yi + 1, pixel[3]);
|
||||
|
||||
for (k = 0; k < bytes; k++)
|
||||
{
|
||||
values[0] = pixel[0][k];
|
||||
values[1] = pixel[1][k];
|
||||
values[2] = pixel[2][k];
|
||||
values[3] = pixel[3][k];
|
||||
val = gimp_bilinear_8 (needx, needy, values);
|
||||
for (k = 0; k < bytes; k++)
|
||||
{
|
||||
values[0] = pixel[0][k];
|
||||
values[1] = pixel[1][k];
|
||||
values[2] = pixel[2][k];
|
||||
values[3] = pixel[3][k];
|
||||
val = gimp_bilinear_8 (needx, needy, values);
|
||||
|
||||
*dest++ = val;
|
||||
} /* for */
|
||||
}
|
||||
*dest++ = val;
|
||||
} /* for */
|
||||
}
|
||||
|
||||
destrow += dest_rgn.rowstride;
|
||||
destrow += dest_rgn.rowstride;
|
||||
|
||||
if (dvals.do_x)
|
||||
mxrow += map_x_rgn.rowstride;
|
||||
if (dvals.do_y)
|
||||
myrow += map_y_rgn.rowstride;
|
||||
}
|
||||
if (dvals.do_x)
|
||||
mxrow += map_x_rgn.rowstride;
|
||||
if (dvals.do_y)
|
||||
myrow += map_y_rgn.rowstride;
|
||||
}
|
||||
|
||||
progress += dest_rgn.w * dest_rgn.h;
|
||||
gimp_progress_update ((double) progress / (double) max_progress);
|
||||
if (!preview)
|
||||
{
|
||||
progress += dest_rgn.w * dest_rgn.h;
|
||||
gimp_progress_update ((double) progress / (double) max_progress);
|
||||
}
|
||||
} /* for */
|
||||
|
||||
gimp_pixel_fetcher_destroy (pft);
|
||||
|
|
@ -566,16 +634,26 @@ displace (GimpDrawable *drawable)
|
|||
if (dvals.do_y)
|
||||
gimp_drawable_detach (map_y);
|
||||
|
||||
/* update the region */
|
||||
gimp_drawable_flush (drawable);
|
||||
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
|
||||
gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1));
|
||||
if (preview)
|
||||
{
|
||||
/* gimp_drawable_preview_draw_region (GIMP_DRAWABLE_PREVIEW (preview),
|
||||
&dest_rgn);*/
|
||||
gimp_preview_draw_buffer (preview, buffer, width * bytes);
|
||||
g_free (buffer);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* update the region */
|
||||
gimp_drawable_flush (drawable);
|
||||
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
|
||||
gimp_drawable_update (drawable->drawable_id, x1, y1, width, height);
|
||||
}
|
||||
}
|
||||
|
||||
static gdouble
|
||||
displace_map_give_value (guchar *pt,
|
||||
gint alpha,
|
||||
gint bytes)
|
||||
gint alpha,
|
||||
gint bytes)
|
||||
{
|
||||
gdouble ret, val_alpha;
|
||||
|
||||
|
|
@ -597,11 +675,11 @@ displace_map_give_value (guchar *pt,
|
|||
|
||||
static gboolean
|
||||
displace_map_constrain (gint32 image_id,
|
||||
gint32 drawable_id,
|
||||
gpointer data)
|
||||
gint32 drawable_id,
|
||||
gpointer data)
|
||||
{
|
||||
GimpDrawable *drawable = data;
|
||||
|
||||
return (gimp_drawable_width (drawable_id) == drawable->width &&
|
||||
gimp_drawable_height (drawable_id) == drawable->height);
|
||||
gimp_drawable_height (drawable_id) == drawable->height);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue