gegl r2799 - in trunk: . operations/external

[ok svn gnome org]

Author: ok
Date: Mon Nov 24 00:54:50 2008
New Revision: 2799
URL: http://svn.gnome.org/viewvc/gegl?rev=2799&view=rev

Log:
* operations/external/path.c: added new op that takes over the
roles of gegl:fill and gegl:stroke, it uses mostly the same names
for properties as the svg fill op. The op can be used both as a filter
and as an image source.
* operations/external/Makefile.am: added new op.
* operations/external/stroke.c: removed.
* operations/external/fill.c: removed.


Added:
   trunk/operations/external/path.c
Removed:
   trunk/operations/external/fill.c
   trunk/operations/external/stroke.c
Modified:
   trunk/ChangeLog
   trunk/operations/external/Makefile.am

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Mon Nov 24 00:54:50 2008
@@ -12,13 +12,10 @@
 endif
 
 if HAVE_CAIRO
-fill_la_SOURCES = fill.c
-fill_la_LIBADD = $(op_libs) $(CAIRO_LIBS)
-fill_la_CFLAGS = $(CAIRO_CFLAGS)
-stroke_la_SOURCES = stroke.c
-stroke_la_LIBADD = $(op_libs) $(CAIRO_LIBS)
-stroke_la_CFLAGS = $(CAIRO_CFLAGS)
-ops += fill.la stroke.la
+path_la_SOURCES = path.c
+path_la_LIBADD = $(op_libs) $(CAIRO_LIBS)
+path_la_CFLAGS = $(CAIRO_CFLAGS)
+ops += path.la
 endif
 
 if HAVE_PNG

Added: trunk/operations/external/path.c
==============================================================================
--- (empty file)
+++ trunk/operations/external/path.c	Mon Nov 24 00:54:50 2008
@@ -0,0 +1,274 @@
+/* This file is an image processing operation for GEGL
+ *
+ * GEGL is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * GEGL 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2006 Ãyvind KolÃs <pippin gimp org>
+ */
+
+
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
+
+#ifdef GEGL_CHANT_PROPERTIES
+
+
+gegl_chant_color  (fill, _("Fill Color"),  "black",
+                         _("Color of paint to use for filling, use 0 opacity to disable filling."))
+gegl_chant_color  (stroke,    _("Stroke Color"),      "rgba(0.0,0.0,0.0,0.0)",
+                             _("Color of paint to use for stroking."))
+
+gegl_chant_double (stroke_width,_("Stroke width"),  0.0, 200.0, 2.0,
+                             _("The width of the brush used to stroke the path."))
+
+gegl_chant_double (stroke_opacity,  _("Stroke opacity"),  -2.0, 2.0, 1.0,
+                             _("Opacity of stroke, note, does not behave like SVG since at the moment stroking is done using an airbrush tool."))
+
+gegl_chant_double (stroke_hardness, _("Hardness"),   0.0, 1.0, 0.6,
+                             _("hardness of brush, 0.0 for soft brush 1.0 for hard brush."))
+
+gegl_chant_string (fill_rule,_("Fill rule."), "nonzero",
+                             _("how to determine what to fill (nonzero|evenodd"))
+
+gegl_chant_double (fill_opacity, _("Fill opacity"),  -2.0, 2.0, 1.0,
+                             _("The fill opacity to use."))
+
+gegl_chant_path   (d,        _("Vector"),
+                             _("A GeglVector representing the path of the stroke"))
+gegl_chant_pointer (pad,  "", "")
+
+#else
+
+#define GEGL_CHANT_TYPE_FILTER
+#define GEGL_CHANT_C_FILE "path.c"
+
+#include "gegl-plugin.h"
+
+/* the path api isn't public yet */
+#include "property-types/gegl-path.h"
+static void path_changed (GeglPath *path,
+                          const GeglRectangle *roi,
+                          gpointer userdata);
+
+#include "gegl-chant.h"
+#include <cairo/cairo.h>
+
+
+static void path_changed (GeglPath *path,
+                          const GeglRectangle *roi,
+                          gpointer userdata)
+{
+  GeglRectangle rect = *roi;
+  GeglChantO    *o   = GEGL_CHANT_PROPERTIES (userdata);
+  /* invalidate the incoming rectangle */
+
+  rect.x -= o->stroke_width/2;
+  rect.y -= o->stroke_width/2;
+  rect.width += o->stroke_width;
+  rect.height += o->stroke_width;
+
+  gegl_operation_invalidate (userdata, &rect, FALSE);
+};
+
+static void
+prepare (GeglOperation *operation)
+{
+  gegl_operation_set_format (operation, "output", babl_format ("RaGaBaA float"));
+}
+
+static GeglRectangle
+get_bounding_box (GeglOperation *operation)
+{
+  GeglChantO    *o       = GEGL_CHANT_PROPERTIES (operation);
+  GeglRectangle  defined = { 0, 0, 512, 512 };
+  gdouble        x0, x1, y0, y1;
+
+  gegl_path_get_bounds (o->d, &x0, &x1, &y0, &y1);
+  defined.x      = x0 - o->stroke_width/2;
+  defined.y      = y0 - o->stroke_width/2;
+  defined.width  = x1 - x0 + o->stroke_width;
+  defined.height = y1 - y0 + o->stroke_width;
+
+  return defined;
+}
+
+#if 0
+static GeglRectangle
+get_cached_region (GeglOperation *operation)
+{
+  return get_bounding_box (operation);
+}
+#endif
+static void gegl_path_cairo_play (GeglPath *path,
+                                    cairo_t *cr);
+
+static gboolean
+process (GeglOperation       *operation,
+         GeglBuffer          *input,
+         GeglBuffer          *output,
+         const GeglRectangle *result)
+{
+  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
+
+  if (input)
+    {
+      gegl_buffer_copy (input, result, output, result);
+    }
+  else
+    {
+      gegl_buffer_clear (output, result);
+    }
+
+  if (o->fill_opacity > 0.0001 && o->fill)
+    {
+      gfloat r,g,b,a;
+      gegl_color_get_rgba (o->fill, &r,&g,&b,&a);
+      a *= o->fill_opacity;
+      if (a>0.001)
+        {
+          cairo_t *cr;
+          cairo_surface_t *surface;
+          guchar *data = (void*)gegl_buffer_linear_open (output, result, NULL, babl_format ("B'aG'aR'aA u8"));
+
+          surface = cairo_image_surface_create_for_data (data,
+                                                         CAIRO_FORMAT_ARGB32,
+                                                         result->width,
+                                                         result->height,
+                                                         result->width * 4);
+          cr = cairo_create (surface);
+          cairo_translate (cr, -result->x, -result->y);
+
+          if (g_str_equal (o->fill_rule, "evenodd"))
+            {
+              cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+            }
+
+          gegl_path_cairo_play (o->d, cr);
+          cairo_set_source_rgba (cr, r,g,b,a);
+          cairo_fill (cr);
+          gegl_buffer_linear_close (output, data);
+        }
+    }
+
+  g_object_set_data (G_OBJECT (operation), "path-radius", GINT_TO_POINTER((gint)(o->stroke_width+1)/2));
+
+  if (o->stroke_width > 0.1 && o->stroke_opacity > 0.0001)
+    {
+      gegl_path_stroke (output, result,
+                                o->d,
+                                o->stroke,
+                                o->stroke_width,
+                                o->stroke_hardness,
+                                o->stroke_opacity);
+    }
+
+  return  TRUE;
+}
+
+
+static void foreach_cairo (const GeglPathItem *knot,
+                           gpointer              cr)
+{
+  switch (knot->type)
+    {
+      case 'M':
+        cairo_move_to (cr, knot->point[0].x, knot->point[0].y);
+        break;
+      case 'L':
+        cairo_line_to (cr, knot->point[0].x, knot->point[0].y);
+        break;
+      case 'C':
+        cairo_curve_to (cr, knot->point[0].x, knot->point[0].y,
+                            knot->point[1].x, knot->point[1].y,
+                            knot->point[2].x, knot->point[2].y);
+        break;
+      case 'z':
+        cairo_close_path (cr);
+        break;
+      default:
+        g_print ("%s uh?:%c\n", G_STRLOC, knot->type);
+    }
+}
+
+static void gegl_path_cairo_play (GeglPath *path,
+                                    cairo_t *cr)
+{
+  gegl_path_foreach_flat (path, foreach_cairo, cr);
+}
+
+static GeglNode *detect (GeglOperation *operation,
+                         gint           x,
+                         gint           y)
+{
+  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
+  cairo_t *cr;
+  cairo_surface_t *surface;
+  gchar *data = "     ";
+  gboolean result = FALSE;
+
+  surface = cairo_image_surface_create_for_data ((guchar*)data,
+                                                 CAIRO_FORMAT_ARGB32,
+                                                 1,1,4);
+  cr = cairo_create (surface);
+  gegl_path_cairo_play (o->d, cr);
+  cairo_set_line_width (cr, o->stroke_width);
+
+
+  if (o->stroke_width > 0.1 && o->stroke_opacity > 0.0001)
+    result = cairo_in_stroke (cr, x, y);
+
+  if (!result)
+    {
+      if (o->d)
+        {
+          gfloat r,g,b,a;
+          gegl_color_get_rgba (o->fill, &r,&g,&b,&a);
+          if (a>0.001)
+            result = cairo_in_fill (cr, x, y);
+        }
+    }
+
+
+  cairo_destroy (cr);
+
+  if (result)
+    return operation->node;
+
+  return NULL;
+}
+
+static void
+gegl_chant_class_init (GeglChantClass *klass)
+{
+  GeglOperationClass       *operation_class;
+  GeglOperationSourceClass *source_class;
+
+  operation_class = GEGL_OPERATION_CLASS (klass);
+  source_class    = GEGL_OPERATION_SOURCE_CLASS (klass);
+
+  source_class->process = process;
+  operation_class->get_bounding_box = get_bounding_box;
+  operation_class->prepare = prepare;
+  operation_class->detect = detect;
+
+  operation_class->name        = "gegl:path";
+  operation_class->categories  = "render";
+  operation_class->description = _("Renders a brush stroke");
+#if 0
+  operation_class->get_cached_region = (void*)get_cached_region;
+#endif
+}
+
+
+#endif