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

app: keep the transform graph around during one paint stroke

Browse Source
This commit is contained in:
Michael Natterer
2012-03-31 02:16:59 +02:00
parent ebd419d4d5
commit 7da52eb917
2 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/paint/gimpperspectiveclone.c
View File

@ -174,12 +174,43 @@ gimp_perspective_clone_paint (GimpPaintCore *paint_core,
source_core->first_stroke = TRUE; source_core->first_stroke = TRUE;
} }
else if (options->align_mode == GIMP_SOURCE_ALIGN_NO) else
{ {
source_core->orig_src_x = source_core->src_x; if (options->align_mode == GIMP_SOURCE_ALIGN_NO)
source_core->orig_src_y = source_core->src_y; {
source_core->orig_src_x = source_core->src_x;
source_core->orig_src_y = source_core->src_y;
source_core->first_stroke = TRUE; source_core->first_stroke = TRUE;
}
clone->node = gegl_node_new ();
g_object_set (clone->node,
"dont-cache", TRUE,
NULL);
clone->src_node =
gegl_node_new_child (clone->node,
"operation", "gegl:buffer-source",
NULL);
clone->transform_node =
gegl_node_new_child (clone->node,
"operation", "gegl:transform",
"filter", gimp_interpolation_to_gegl_filter (GIMP_INTERPOLATION_NONE),
"hard-edges", TRUE,
NULL);
clone->dest_node =
gegl_node_new_child (clone->node,
"operation", "gegl:write-buffer",
NULL);
gegl_node_link_many (clone->src_node,
clone->transform_node,
clone->dest_node,
NULL);
} }
break; break;
@ -240,6 +271,14 @@ gimp_perspective_clone_paint (GimpPaintCore *paint_core,
break; break;
case GIMP_PAINT_STATE_FINISH: case GIMP_PAINT_STATE_FINISH:
if (clone->node)
{
g_object_unref (clone->node);
clone->node = NULL;
clone->src_node = NULL;
clone->transform_node = NULL;
clone->dest_node = NULL;
}
break; break;
default: default:
@ -276,7 +315,6 @@ gimp_perspective_clone_get_source (GimpSourceCore *source_core,
GeglBuffer *orig_buffer; GeglBuffer *orig_buffer;
GeglBuffer *dest_buffer; GeglBuffer *dest_buffer;
GimpMatrix3 matrix; GimpMatrix3 matrix;
GeglNode *affine;
gchar *matrix_string; gchar *matrix_string;
GimpMatrix3 gegl_matrix; GimpMatrix3 gegl_matrix;
@ -365,19 +403,19 @@ gimp_perspective_clone_get_source (GimpSourceCore *source_core,
gimp_matrix3_translate (&gegl_matrix, -x1d, -y1d); gimp_matrix3_translate (&gegl_matrix, -x1d, -y1d);
matrix_string = gegl_matrix3_to_string ((GeglMatrix3 *) &gegl_matrix); matrix_string = gegl_matrix3_to_string ((GeglMatrix3 *) &gegl_matrix);
affine = gegl_node_new_child (NULL, gegl_node_set (clone->transform_node,
"operation", "gegl:transform", "transform", matrix_string,
"transform", matrix_string, NULL);
"filter", gimp_interpolation_to_gegl_filter (GIMP_INTERPOLATION_LINEAR),
"hard-edges", TRUE,
NULL);
g_free (matrix_string); g_free (matrix_string);
gimp_apply_operation (orig_buffer, NULL, NULL, gegl_node_set (clone->src_node,
affine, "buffer", orig_buffer,
dest_buffer, NULL); NULL);
gegl_node_set (clone->dest_node,
"buffer", dest_buffer,
NULL);
g_object_unref (affine); gegl_node_process (clone->dest_node);
g_object_unref (orig_buffer); g_object_unref (orig_buffer);

5
app/paint/gimpperspectiveclone.h
View File

@ -44,6 +44,11 @@ struct _GimpPerspectiveClone
GimpMatrix3 transform; GimpMatrix3 transform;
GimpMatrix3 transform_inv; GimpMatrix3 transform_inv;
GeglNode *node;
GeglNode *src_node;
GeglNode *transform_node;
GeglNode *dest_node;
}; };
struct _GimpPerspectiveCloneClass struct _GimpPerspectiveCloneClass