From 6f95e18d35a10a5c50bb70c496e196390e663137 Mon Sep 17 00:00:00 2001 From: JazzyNico Date: Tue, 11 Jan 2011 14:47:53 +0100 Subject: [PATCH] Filters. New custom predefined filters (all ABCs, Neon draw, Color shilf, Silhouette and Cross engraving) and code clean-up. --- src/extension/internal/filter/abc.h | 824 ++++++++++++++++--- src/extension/internal/filter/color.h | 595 +++++++------ src/extension/internal/filter/drop-shadow.h | 65 -- src/extension/internal/filter/experimental.h | 671 +++++++++------ src/extension/internal/filter/filter-all.cpp | 11 + src/extension/internal/filter/morphology.h | 72 +- src/extension/internal/filter/shadows.h | 111 +++ 7 files changed, 1629 insertions(+), 720 deletions(-) create mode 100644 src/extension/internal/filter/shadows.h diff --git a/src/extension/internal/filter/abc.h b/src/extension/internal/filter/abc.h index c93bbb7f7..b96585113 100755 --- a/src/extension/internal/filter/abc.h +++ b/src/extension/internal/filter/abc.h @@ -9,8 +9,15 @@ * * Basic filters * Blur + * Clean edges + * Color shift * Diffuse light + * Feather + * Matte jelly + * Noise fill + * Outline * Roughen + * Silhouette * Specular light * * Released under GNU GPL, read the file 'COPYING' for more information @@ -31,7 +38,7 @@ namespace Filter { /** \brief Custom predefined Blur filter. - Simple horizontal and vertical blur. + Simple horizontal and vertical blur Filter's parameters: * Horizontal blur (0.01->100., default 2) -> blur (stdDeviation) @@ -40,37 +47,37 @@ namespace Filter { class Blur : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Blur ( ) : Filter() { }; - virtual ~Blur ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Blur, custom (ABCs)") "\n" - "org.inkscape.effect.filter.blur\n" - "2\n" - "2\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Simple vertical and horizontal blur effect") "\n" - "\n" - "\n", new Blur()); - }; + Blur ( ) : Filter() { }; + virtual ~Blur ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Blur, custom (ABCs)") "\n" + "org.inkscape.effect.filter.Blur\n" + "2\n" + "2\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Simple vertical and horizontal blur effect") "\n" + "\n" + "\n", new Blur()); + }; }; gchar const * Blur::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream hblur; std::ostringstream vblur; @@ -78,14 +85,130 @@ Blur::get_filter_text (Inkscape::Extension::Extension * ext) hblur << ext->get_param_float("hblur"); vblur << ext->get_param_float("vblur"); - _filter = g_strdup_printf( - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" "\n", hblur.str().c_str(), vblur.str().c_str()); - return _filter; + return _filter; }; /* Blur filter */ +/** + \brief Custom predefined Clean edges filter. + + Removes or decreases glows and jaggeries around objects edges after applying some filters + + Filter's parameters: + * Strength (0.01->100., default 0.4) -> blur (stdDeviation) +*/ + +class CleanEdges : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + CleanEdges ( ) : Filter() { }; + virtual ~CleanEdges ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Clean edges, custom (ABCs)") "\n" + "org.inkscape.effect.filter.CleanEdges\n" + "0.4\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Removes or decreases glows and jaggeries around objects edges after applying some filters") "\n" + "\n" + "\n", new CleanEdges()); + }; + +}; + +gchar const * +CleanEdges::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream blur; + + blur << ext->get_param_float("blur"); + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n", blur.str().c_str()); + + return _filter; +}; /* CleanEdges filter */ + + +/** + \brief Custom predefined Color shift filter. + + Rotate and desaturate hue + + Filter's parameters: + * Shift (0->360, default 330) -> color1 (values) + * Saturation (0.->10., default 6) -> color2 (values [/10]) +*/ + +class ColorShift : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + ColorShift ( ) : Filter() { }; + virtual ~ColorShift ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Color shift, custom (ABCs)") "\n" + "org.inkscape.effect.filter.ColorShift\n" + "330\n" + "6\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Rotate and desaturate hue") "\n" + "\n" + "\n", new ColorShift()); + }; + +}; + +gchar const * +ColorShift::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream shift; + std::ostringstream sat; + + shift << ext->get_param_int("shift"); + sat << (ext->get_param_float("sat") / 10); + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n", shift.str().c_str(), sat.str().c_str()); + + return _filter; +}; /* ColorShift filter */ + /** \brief Custom predefined Diffuse light filter. @@ -96,45 +219,43 @@ Blur::get_filter_text (Inkscape::Extension::Extension * ext) * Elevation (0->360, default 25) -> feDistantLight (elevation) * Azimuth (0->360, default 235) -> feDistantLight (azimuth) * Lightning color (guint, default -1 [white]) -> diffuse (lighting-color) - - TODO: use the alpha channel to calculate the lightning color */ class DiffuseLight : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - DiffuseLight ( ) : Filter() { }; - virtual ~DiffuseLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Diffuse light, custom (ABCs)") "\n" - "org.inkscape.effect.filter.diffuselight\n" - "6\n" - "25\n" - "235\n" - "-1\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Basic diffuse bevel to use for building textures") "\n" - "\n" - "\n", new DiffuseLight()); - }; + DiffuseLight ( ) : Filter() { }; + virtual ~DiffuseLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Diffuse light, custom (ABCs)") "\n" + "org.inkscape.effect.filter.DiffuseLight\n" + "6\n" + "25\n" + "235\n" + "-1\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Basic diffuse bevel to use for building textures") "\n" + "\n" + "\n", new DiffuseLight()); + }; }; gchar const * DiffuseLight::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream smooth; std::ostringstream elevation; @@ -154,81 +275,516 @@ DiffuseLight::get_filter_text (Inkscape::Extension::Extension * ext) b << ((color >> 8) & 0xff); a << (color & 0xff) / 255.0F; - _filter = g_strdup_printf( - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" "\n" - "\n" - "\n" - "\n" + "\n" + "\n" + "\n" "\n", smooth.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), elevation.str().c_str(), azimuth.str().c_str(), a.str().c_str()); - return _filter; + return _filter; }; /* DiffuseLight filter */ +/** + \brief Custom predefined Feather filter. + + Blurred mask on the edge without altering the contents + + Filter's parameters: + * Strength (0.01->100., default 5) -> blur (stdDeviation) +*/ + +class Feather : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + Feather ( ) : Filter() { }; + virtual ~Feather ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Feather, custom (ABCs)") "\n" + "org.inkscape.effect.filter.Feather\n" + "5\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Blurred mask on the edge without altering the contents") "\n" + "\n" + "\n", new Feather()); + }; + +}; + +gchar const * +Feather::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream blur; + + blur << ext->get_param_float("blur"); + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", blur.str().c_str()); + + return _filter; +}; /* Feather filter */ + +/** + \brief Custom predefined Matte jelly filter. + + Bulging, matte jelly covering + + Filter's parameters: + * Smoothness (0.0->10., default 7.) -> blur (stdDeviation) + * Brightness (0.0->5., default .9) -> specular (specularConstant) + * Elevation (0->360, default 60) -> feDistantLight (elevation) + * Azimuth (0->360, default 225) -> feDistantLight (azimuth) + * Lightning color (guint, default -1 [white]) -> specular (lighting-color) +*/ + +class MatteJelly : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + MatteJelly ( ) : Filter() { }; + virtual ~MatteJelly ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Matte jelly, custom (ABCs)") "\n" + "org.inkscape.effect.filter.MatteJelly\n" + "7\n" + "0.9\n" + "60\n" + "225\n" + "-1\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Bulging, matte jelly covering") "\n" + "\n" + "\n", new MatteJelly()); + }; + +}; + +gchar const * +MatteJelly::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream smooth; + std::ostringstream bright; + std::ostringstream elevation; + std::ostringstream azimuth; + std::ostringstream r; + std::ostringstream g; + std::ostringstream b; + std::ostringstream a; + + smooth << ext->get_param_float("smooth"); + bright << ext->get_param_float("bright"); + elevation << ext->get_param_int("elevation"); + azimuth << ext->get_param_int("azimuth"); + guint32 color = ext->get_param_color("color"); + + r << ((color >> 24) & 0xff); + g << ((color >> 16) & 0xff); + b << ((color >> 8) & 0xff); + a << (color & 0xff) / 255.0F; + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", smooth.str().c_str(), bright.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), elevation.str().c_str(), azimuth.str().c_str(), a.str().c_str()); + + return _filter; +}; /* MatteJelly filter */ + +/** + \brief Custom predefined Noise fill filter. + + Basic noise fill and transparency texture + + Filter's parameters: + * Turbulence type (enum, default fractalNoise else turbulence) -> turbulence (type) + * Horizontal frequency (*100) (0.001->1000., default 2) -> turbulence (baseFrequency [/100]) + * Vertical frequency (*100) (0.001->1000., default 4) -> turbulence (baseFrequency [/100]) + * Complexity (1->5, default 5) -> turbulence (numOctaves) + * Variation (1->360, default 1) -> turbulence (seed) + * Dilatation (1.->50., default 3) -> color (n-1th value) + * Erosion (0.->50., default 1) -> color (nth value 0->-50) + * Color (guint, default 148,115,39,255) -> flood (flood-color, flood-opacity) + * Inverted (boolean, default false) -> composite1 (operator, true="in", false="out") +*/ + +class NoiseFill : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + NoiseFill ( ) : Filter() { }; + virtual ~NoiseFill ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Noise fill, custom (ABCs)") "\n" + "org.inkscape.effect.filter.NoiseFill\n" + "\n" + "\n" + "\n" + "<_item value=\"fractalNoise\">Fractal noise\n" + "<_item value=\"turbulence\">Turbulence\n" + "\n" + "2\n" + "4\n" + "5\n" + "0\n" + "3\n" + "1\n" + "false\n" + "\n" + "\n" + "354957823\n" + "\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Basic noise fill and transparency texture") "\n" + "\n" + "\n", new NoiseFill()); + }; + +}; + +gchar const * +NoiseFill::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream type; + std::ostringstream hfreq; + std::ostringstream vfreq; + std::ostringstream complexity; + std::ostringstream variation; + std::ostringstream dilat; + std::ostringstream erosion; + std::ostringstream r; + std::ostringstream g; + std::ostringstream b; + std::ostringstream a; + std::ostringstream inverted; + + type << ext->get_param_enum("type"); + hfreq << (ext->get_param_float("hfreq") / 100); + vfreq << (ext->get_param_float("vfreq") / 100); + complexity << ext->get_param_int("complexity"); + variation << ext->get_param_int("variation"); + dilat << ext->get_param_float("dilat"); + erosion << (- ext->get_param_float("erosion")); + guint32 color = ext->get_param_color("color"); + r << ((color >> 24) & 0xff); + g << ((color >> 16) & 0xff); + b << ((color >> 8) & 0xff); + a << (color & 0xff) / 255.0F; + if (ext->get_param_bool("inverted")) + inverted << "out"; + else + inverted << "in"; + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", type.str().c_str(), hfreq.str().c_str(), vfreq.str().c_str(), complexity.str().c_str(), variation.str().c_str(), inverted.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str()); + + return _filter; +}; /* NoiseFill filter */ + +/** + \brief Custom predefined Outline filter. + + Adds a colorizable outline + + Filter's parameters: + * Width (0.01->50., default 5) -> blur1 (stdDeviation) + * Melt (0.01->50., default 2) -> blur2 (stdDeviation) + * Dilatation (1.->50., default 8) -> color2 (n-1th value) + * Erosion (0.->50., default 5) -> color2 (nth value 0->-50) + * Color (guint, default 156,102,102,255) -> flood (flood-color, flood-opacity) + * Blend (enum, default Normal) -> blend (mode) +*/ + +class Outline : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + Outline ( ) : Filter() { }; + virtual ~Outline ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Outline, custom (ABCs)") "\n" + "org.inkscape.effect.filter.Outline\n" + "\n" + "\n" + "5\n" + "2\n" + "8\n" + "5\n" + "\n" + "\n" + "1029214207\n" + "\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Adds a colorizable outline") "\n" + "\n" + "\n", new Outline()); + }; + +}; + +gchar const * +Outline::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream width; + std::ostringstream melt; + std::ostringstream dilat; + std::ostringstream erosion; + std::ostringstream r; + std::ostringstream g; + std::ostringstream b; + std::ostringstream a; + std::ostringstream blend; + + width << ext->get_param_float("width"); + melt << ext->get_param_float("melt"); + dilat << ext->get_param_float("dilat"); + erosion << (- ext->get_param_float("erosion")); + guint32 color = ext->get_param_color("color"); + r << ((color >> 24) & 0xff); + g << ((color >> 16) & 0xff); + b << ((color >> 8) & 0xff); + a << (color & 0xff) / 255.0F; + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", width.str().c_str(), melt.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str()); + + return _filter; +}; /* Outline filter */ + /** \brief Custom predefined Roughen filter. Small-scale roughening to edges and content Filter's parameters: - * Frequency (*100) (0.0->40., default 1.3) -> turbulence (baseFrequency) + * Turbulence type (enum, default fractalNoise else turbulence) -> turbulence (type) + * Horizontal frequency (*100) (0.001->1000., default 1.3) -> turbulence (baseFrequency) + * Vertical frequency (*100) (0.001->1000., default 1.3) -> turbulence (baseFrequency) + * Complexity (1->5, default 5) -> turbulence (numOctaves) + * Variation (1->360, default 1) -> turbulence (seed) * Intensity (0.0->50., default 6.6) -> displacement (scale) */ class Roughen : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Roughen ( ) : Filter() { }; - virtual ~Roughen ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Roughen, custom (ABCs)") "\n" - "org.inkscape.effect.filter.roughen\n" - "1.3\n" - "1.3\n" - "6.6\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Small-scale roughening to edges and content") "\n" - "\n" - "\n", new Roughen()); - }; + Roughen ( ) : Filter() { }; + virtual ~Roughen ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Roughen, custom (ABCs)") "\n" + "org.inkscape.effect.filter.Roughen\n" + "\n" + "<_item value=\"fractalNoise\">Fractal noise\n" + "<_item value=\"turbulence\">Turbulence\n" + "\n" + "1.3\n" + "1.3\n" + "5\n" + "0\n" + "6.6\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Small-scale roughening to edges and content") "\n" + "\n" + "\n", new Roughen()); + }; }; gchar const * Roughen::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); - + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream type; std::ostringstream hfreq; std::ostringstream vfreq; + std::ostringstream complexity; + std::ostringstream variation; std::ostringstream intensity; - + + type << ext->get_param_enum("type"); hfreq << (ext->get_param_float("hfreq") / 100); vfreq << (ext->get_param_float("vfreq") / 100); + complexity << ext->get_param_int("complexity"); + variation << ext->get_param_int("variation"); intensity << ext->get_param_float("intensity"); - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n", hfreq.str().c_str(), vfreq.str().c_str(), intensity.str().c_str()); + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n", type.str().c_str(), complexity.str().c_str(), variation.str().c_str(), hfreq.str().c_str(), vfreq.str().c_str(), intensity.str().c_str()); - return _filter; + return _filter; }; /* Roughen filter */ +/** + \brief Custom predefined Silhouette filter. + + Repaint anything visible monochrome + + Filter's parameters: + * Blur (0.->50., default 0) -> blur (stdDeviation) + * Cutout (boolean, default False) -> composite (false=in, true=out) + * Color (guint, default 0,0,0,255) -> flood (flood-color, flood-opacity) +*/ + +class Silhouette : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + Silhouette ( ) : Filter() { }; + virtual ~Silhouette ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Silhouette, custom (ABCs)") "\n" + "org.inkscape.effect.filter.Silhouette\n" + "0\n" + "false\n" + "255\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Repaint anything visible monochrome") "\n" + "\n" + "\n", new Silhouette()); + }; + +}; + +gchar const * +Silhouette::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream a; + std::ostringstream r; + std::ostringstream g; + std::ostringstream b; + std::ostringstream cutout; + std::ostringstream blur; + + guint32 color = ext->get_param_color("color"); + r << ((color >> 24) & 0xff); + g << ((color >> 16) & 0xff); + b << ((color >> 8) & 0xff); + a << (color & 0xff) / 255.0F; + if (ext->get_param_bool("cutout")) + cutout << "out"; + else + cutout << "in"; + blur << ext->get_param_float("blur"); + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n", a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), cutout.str().c_str(), blur.str().c_str()); + + return _filter; +}; /* Silhouette filter */ + /** \brief Custom predefined Specular light filter. @@ -237,49 +793,47 @@ Roughen::get_filter_text (Inkscape::Extension::Extension * ext) Filter's parameters: * Smoothness (0.0->10., default 6.) -> blur (stdDeviation) * Brightness (0.0->5., default 1.) -> specular (specularConstant) - * Elevation (0->360, default 25) -> feDistantLight (elevation) + * Elevation (0->360, default 45) -> feDistantLight (elevation) * Azimuth (0->360, default 235) -> feDistantLight (azimuth) * Lightning color (guint, default -1 [white]) -> specular (lighting-color) - - TODO: use the alpha channel to calculate the lightning color (but do we really need a lightning color here?) */ class SpecularLight : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - SpecularLight ( ) : Filter() { }; - virtual ~SpecularLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Specular light, custom (ABCs)") "\n" - "org.inkscape.effect.filter.specularlight\n" - "6\n" - "1\n" - "45\n" - "235\n" - "-1\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Basic specular bevel to use for building textures") "\n" - "\n" - "\n", new SpecularLight()); - }; + SpecularLight ( ) : Filter() { }; + virtual ~SpecularLight ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Specular light, custom (ABCs)") "\n" + "org.inkscape.effect.filter.SpecularLight\n" + "6\n" + "1\n" + "45\n" + "235\n" + "-1\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Basic specular bevel to use for building textures") "\n" + "\n" + "\n", new SpecularLight()); + }; }; gchar const * SpecularLight::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream smooth; std::ostringstream bright; @@ -301,17 +855,17 @@ SpecularLight::get_filter_text (Inkscape::Extension::Extension * ext) b << ((color >> 8) & 0xff); a << (color & 0xff) / 255.0F; - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", smooth.str().c_str(), bright.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), elevation.str().c_str(), azimuth.str().c_str(), a.str().c_str()); - return _filter; + return _filter; }; /* SpecularLight filter */ @@ -320,5 +874,5 @@ SpecularLight::get_filter_text (Inkscape::Extension::Extension * ext) }; /* namespace Extension */ }; /* namespace Inkscape */ -/* Change the 'COLOR' below to be your file name */ +/* Change the 'ABC' below to be your file name */ #endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_ABC_H__ */ diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h index 05173b684..559ecd3cc 100755 --- a/src/extension/internal/filter/color.h +++ b/src/extension/internal/filter/color.h @@ -3,13 +3,14 @@ /* Change the 'COLOR' above to be your file name */ /* - * Copyright (C) 2010 Authors: + * Copyright (C) 2011 Authors: * Ivan Louette (filters) * Nicolas Dufour (UI) * * Color filters * Colorize * Duochrome + * Electrize * Quadritone * Solarize * Tritone @@ -45,53 +46,59 @@ namespace Filter { class Colorize : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Colorize ( ) : Filter() { }; - virtual ~Colorize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Colorize, custom (color)") "\n" - "org.inkscape.effect.filter.Colorize\n" - "0\n" - "1\n" - "false\n" - "\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"screen\">Screen\n" - "<_item value=\"lighten\">Lighten\n" - "<_item value=\"darken\">Darken\n" - "\n" - "\n" - "<_item value=\"screen\">Screen\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"lighten\">Lighten\n" - "<_item value=\"darken\">Darken\n" - "\n" - "-1639776001\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Blend image or object with a flood color") "\n" - "\n" - "\n", new Colorize()); - }; + Colorize ( ) : Filter() { }; + virtual ~Colorize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Colorize, custom (Color)") "\n" + "org.inkscape.effect.filter.Colorize\n" + "\n" + "\n" + "0\n" + "1\n" + "false\n" + "\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"screen\">Screen\n" + "<_item value=\"lighten\">Lighten\n" + "<_item value=\"darken\">Darken\n" + "\n" + "\n" + "<_item value=\"screen\">Screen\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"lighten\">Lighten\n" + "<_item value=\"darken\">Darken\n" + "\n" + "\n" + "\n" + "-1639776001\n" + "\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Blend image or object with a flood color") "\n" + "\n" + "\n", new Colorize()); + }; }; gchar const * Colorize::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream a; std::ostringstream r; @@ -118,18 +125,18 @@ Colorize::get_filter_text (Inkscape::Extension::Extension * ext) else duotone << "1"; - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", hlight.str().c_str(), nlight.str().c_str(), duotone.str().c_str(), a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), blend1.str().c_str(), blend2.str().c_str()); - return _filter; + return _filter; }; /* Colorize filter */ @@ -147,52 +154,52 @@ Colorize::get_filter_text (Inkscape::Extension::Extension * ext) class Duochrome : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Duochrome ( ) : Filter() { }; - virtual ~Duochrome ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Duochrome, custom (color)") "\n" - "org.inkscape.effect.filter.Duochrome\n" - "\n" - "\n" - "0\n" - "\n" - "<_item value=\"none\">No swap\n" - "<_item value=\"full\">Color and alpha\n" - "<_item value=\"color\">Color only\n" - "<_item value=\"alpha\">Alpha only\n" - "\n" - "\n" - "\n" - "1364325887\n" - "\n" - "\n" - "-65281\n" - "\n" - "\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Convert luminance values to a duochrome palette") "\n" - "\n" - "\n", new Duochrome()); - }; + Duochrome ( ) : Filter() { }; + virtual ~Duochrome ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Duochrome, custom (Color)") "\n" + "org.inkscape.effect.filter.Duochrome\n" + "\n" + "\n" + "0\n" + "\n" + "<_item value=\"none\">No swap\n" + "<_item value=\"full\">Color and alpha\n" + "<_item value=\"color\">Color only\n" + "<_item value=\"alpha\">Alpha only\n" + "\n" + "\n" + "\n" + "1364325887\n" + "\n" + "\n" + "-65281\n" + "\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Convert luminance values to a duochrome palette") "\n" + "\n" + "\n", new Duochrome()); + }; }; gchar const * Duochrome::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream a1; std::ostringstream r1; @@ -240,23 +247,107 @@ Duochrome::get_filter_text (Inkscape::Extension::Extension * ext) a2 << (color2 & 0xff) / 255.0F; } - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", a1.str().c_str(), r1.str().c_str(), g1.str().c_str(), b1.str().c_str(), swap1.str().c_str(), a2.str().c_str(), r2.str().c_str(), g2.str().c_str(), b2.str().c_str(), swap2.str().c_str(), fluo.str().c_str()); - return _filter; + return _filter; }; /* Duochrome filter */ +/** + \brief Custom predefined Electrize filter. + + Electro solarization effects. + + Filter's parameters: + * Simplify (0.01->10., default 2.) -> blur (stdDeviation) + * Effect type (enum: table or discrete, default "table") -> component (type) + * Level (0->10, default 3) -> component (tableValues) + * Inverted (boolean, default false) -> component (tableValues) +*/ +class Electrize : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + Electrize ( ) : Filter() { }; + virtual ~Electrize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Electrize, custom (Color)") "\n" + "org.inkscape.effect.filter.Electrize\n" + "2.0\n" + "\n" + "<_item value=\"table\">Table\n" + "<_item value=\"discrete\">Discrete\n" + "\n" + "3\n" + "false\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Electro solarization effects") "\n" + "\n" + "\n", new Electrize()); + }; +}; + +gchar const * +Electrize::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream blur; + std::ostringstream type; + std::ostringstream values; + + blur << ext->get_param_float("blur"); + type << ext->get_param_enum("type"); + + // TransfertComponent table values are calculated based on the effect level and inverted parameters. + int val = 0; + int levels = ext->get_param_int("levels") + 1; + if (ext->get_param_bool("invert")) + val = 1; + values << val; + for ( int step = 1 ; step <= levels ; step++ ) { + if (val == 1) { + val = 0; + } + else { + val = 1; + } + values << " " << val; + } + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", blur.str().c_str(), type.str().c_str(), values.str().c_str(), type.str().c_str(), values.str().c_str(), type.str().c_str(), values.str().c_str()); + + return _filter; +}; /* Electrize filter */ /** \brief Custom predefined Quadritone filter. @@ -273,50 +364,50 @@ Duochrome::get_filter_text (Inkscape::Extension::Extension * ext) class Quadritone : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Quadritone ( ) : Filter() { }; - virtual ~Quadritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Quadritone fantasy, custom (color)") "\n" - "org.inkscape.effect.filter.Quadritone\n" - "280\n" - "100\n" - "\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"screen\">Screen\n" - "\n" - "0\n" - "\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"screen\">Screen\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"lighten\">Lighten\n" - "<_item value=\"darken\">Darken\n" - "\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Replace hue by two colors") "\n" - "\n" - "\n", new Quadritone()); - }; + Quadritone ( ) : Filter() { }; + virtual ~Quadritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Quadritone fantasy, custom (Color)") "\n" + "org.inkscape.effect.filter.Quadritone\n" + "280\n" + "100\n" + "\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"screen\">Screen\n" + "\n" + "0\n" + "\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"screen\">Screen\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"lighten\">Lighten\n" + "<_item value=\"darken\">Darken\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Replace hue by two colors") "\n" + "\n" + "\n", new Quadritone()); + }; }; gchar const * Quadritone::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream dist; std::ostringstream colors; @@ -330,18 +421,18 @@ Quadritone::get_filter_text (Inkscape::Extension::Extension * ext) sat << ext->get_param_float("sat"); blend2 << ext->get_param_enum("blend2"); - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", dist.str().c_str(), colors.str().c_str(), blend1.str().c_str(), sat.str().c_str(), blend2.str().c_str()); - return _filter; + return _filter; }; /* Quadritone filter */ @@ -360,40 +451,40 @@ Quadritone::get_filter_text (Inkscape::Extension::Extension * ext) class Solarize : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Solarize ( ) : Filter() { }; - virtual ~Solarize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Solarize, custom (color)") "\n" - "org.inkscape.effect.filter.Solarize\n" - "0\n" - "\n" - "<_item value=\"solarize\">Solarize\n" - "<_item value=\"moonarize\">Moonarize\n" - "\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Classic photographic solarization effect") "\n" - "\n" - "\n", new Solarize()); - }; + Solarize ( ) : Filter() { }; + virtual ~Solarize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Solarize, custom (Color)") "\n" + "org.inkscape.effect.filter.Solarize\n" + "0\n" + "\n" + "<_item value=\"solarize\">Solarize\n" + "<_item value=\"moonarize\">Moonarize\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Classic photographic solarization effect") "\n" + "\n" + "\n", new Solarize()); + }; }; gchar const * Solarize::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream rotate; std::ostringstream blend1; @@ -411,17 +502,17 @@ Solarize::get_filter_text (Inkscape::Extension::Extension * ext) blend2 << "multiply"; } - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", rotate.str().c_str(), blend1.str().c_str(), blend2.str().c_str()); - return _filter; + return _filter; }; /* Solarize filter */ @@ -447,63 +538,63 @@ Solarize::get_filter_text (Inkscape::Extension::Extension * ext) class Tritone : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Tritone ( ) : Filter() { }; - virtual ~Tritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Tritone, custom (color)") "\n" - "org.inkscape.effect.filter.Tritone\n" - "\n" - "\n" - "\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"enhue\">Enhance hue\n" - "<_item value=\"rad\">Radiation\n" - "<_item value=\"htb\">Hue to background\n" - "\n" - "\n" - "<_item value=\"lighten\">Lighten\n" - "<_item value=\"screen\">Screen\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"darken\">Darken\n" - "\n" - "0.01\n" - "\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"darken\">Darken\n" - "\n" - "0\n" - "1\n" - "\n" - "\n" - "0\n" - "-73203457\n" - "\n" - "\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Create a custom tritone palette with additional glow, blend modes and hue moving") "\n" - "\n" - "\n", new Tritone()); - }; + Tritone ( ) : Filter() { }; + virtual ~Tritone ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Tritone, custom (Color)") "\n" + "org.inkscape.effect.filter.Tritone\n" + "\n" + "\n" + "\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"enhue\">Enhance hue\n" + "<_item value=\"rad\">Radiation\n" + "<_item value=\"htb\">Hue to background\n" + "\n" + "\n" + "<_item value=\"lighten\">Lighten\n" + "<_item value=\"screen\">Screen\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"darken\">Darken\n" + "\n" + "0.01\n" + "\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"darken\">Darken\n" + "\n" + "0\n" + "1\n" + "\n" + "\n" + "0\n" + "-73203457\n" + "\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Create a custom tritone palette with additional glow, blend modes and hue moving") "\n" + "\n" + "\n", new Tritone()); + }; }; gchar const * Tritone::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream dist; std::ostringstream a; @@ -564,30 +655,30 @@ Tritone::get_filter_text (Inkscape::Extension::Extension * ext) b6in2 << "qminpc"; } - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", dist.str().c_str(), globalblend.str().c_str(), a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), c1in.str().c_str(), c1in2.str().c_str(), glow.str().c_str(), b6in2.str().c_str(), glowblend.str().c_str(), c2in.str().c_str(), c2in2.str().c_str(), llight.str().c_str(), glight.str().c_str()); - return _filter; + return _filter; }; /* Tritone filter */ }; /* namespace Filter */ diff --git a/src/extension/internal/filter/drop-shadow.h b/src/extension/internal/filter/drop-shadow.h index 22890d39a..12f0c6055 100644 --- a/src/extension/internal/filter/drop-shadow.h +++ b/src/extension/internal/filter/drop-shadow.h @@ -141,71 +141,6 @@ DropGlow::get_filter_text (Inkscape::Extension::Extension * ext) return _filter; }; -class ColorizableDropShadow : public Inkscape::Extension::Internal::Filter::Filter { -protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); - -public: - ColorizableDropShadow ( ) : Filter() { }; - virtual ~ColorizableDropShadow ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Drop shadow, color") "\n" - "org.inkscape.effect.filter.colorizable-drop-shadow\n" - "3.0\n" - "6.0\n" - "6.0\n" - "127\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Colorizable Drop shadow") "\n" - "\n" - "\n", new ColorizableDropShadow()); - }; - -}; - -gchar const * -ColorizableDropShadow::get_filter_text (Inkscape::Extension::Extension * ext) -{ - if (_filter != NULL) g_free((void *)_filter); - - std::ostringstream blur; - std::ostringstream a; - std::ostringstream r; - std::ostringstream g; - std::ostringstream b; - std::ostringstream x; - std::ostringstream y; - - guint32 color = ext->get_param_color("color"); - - blur << ext->get_param_float("blur"); - x << ext->get_param_float("xoffset"); - y << ext->get_param_float("yoffset"); - a << (color & 0xff) / 255.0F; - r << ((color >> 24) & 0xff); - g << ((color >> 16) & 0xff); - b << ((color >> 8) & 0xff); - - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n", a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), blur.str().c_str(), x.str().c_str(), y.str().c_str()); - - return _filter; -}; }; /* namespace Filter */ }; /* namespace Internal */ }; /* namespace Extension */ diff --git a/src/extension/internal/filter/experimental.h b/src/extension/internal/filter/experimental.h index acd258805..0375f008d 100755 --- a/src/extension/internal/filter/experimental.h +++ b/src/extension/internal/filter/experimental.h @@ -9,7 +9,9 @@ * * Experimental filters (no assigned menu) * Chromolitho + * Cross engraving * Drawing + * Neon draw * Posterize * Posterize basic * @@ -55,70 +57,70 @@ namespace Filter { */ class Chromolitho : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Chromolitho ( ) : Filter() { }; - virtual ~Chromolitho ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Chromolitho, custom") "\n" - "org.inkscape.effect.filter.Chromolitho\n" - "\n" - "\n" - "true\n" - "\n" - "<_item value=\"darken\">Darken\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"screen\">Screen\n" - "<_item value=\"lighten\">Lighten\n" - "\n" - "false\n" - "false\n" - "false\n" - "0\n" - "1\n" - "10\n" - "1\n" - "\n" - "\n" - "true\n" - "100\n" - "100\n" - "1\n" - "0\n" - "1\n" - "0\n" - "true\n" - "\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"multiply\">Multiply\n" - "<_item value=\"screen\">Screen\n" - "<_item value=\"lighten\">Lighten\n" - "<_item value=\"darken\">Darken\n" - "\n" - "\n" - "\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Chromo effect with customizable edge drawing and graininess") "\n" - "\n" - "\n", new Chromolitho()); - }; + Chromolitho ( ) : Filter() { }; + virtual ~Chromolitho ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Chromolitho, custom") "\n" + "org.inkscape.effect.filter.Chromolitho\n" + "\n" + "\n" + "true\n" + "\n" + "<_item value=\"darken\">Darken\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"screen\">Screen\n" + "<_item value=\"lighten\">Lighten\n" + "\n" + "false\n" + "false\n" + "false\n" + "0\n" + "1\n" + "10\n" + "1\n" + "\n" + "\n" + "true\n" + "100\n" + "100\n" + "1\n" + "0\n" + "1\n" + "0\n" + "true\n" + "\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"screen\">Screen\n" + "<_item value=\"lighten\">Lighten\n" + "<_item value=\"darken\">Darken\n" + "\n" + "\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Chromo effect with customizable edge drawing and graininess") "\n" + "\n" + "\n", new Chromolitho()); + }; }; gchar const * Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream b1in; std::ostringstream b2in; @@ -178,51 +180,137 @@ Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext) else graincol << "0"; - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n" "\n" "\n" - "\n" - "\n" - "\n" - "\n" + "\n" + "\n" + "\n" + "\n" "\n", light.str().c_str(), noise.str().c_str(), b1in.str().c_str(), dblend.str().c_str(), smooth.str().c_str(), grainxf.str().c_str(), grainyf.str().c_str(), grainc.str().c_str(), grainv.str().c_str(), grainexp.str().c_str(), grainero.str().c_str(), graincol.str().c_str(), b2in.str().c_str(), gblend.str().c_str(), saturation.str().c_str(), transf.str().c_str(), transf.str().c_str(), transf.str().c_str(), col3in.str().c_str()); - return _filter; + return _filter; }; /* Chromolitho filter */ +/** + \brief Custom predefined Cross engraving filter. + + Convert image to an engraving made of vertical and horizontal lines + + Filter's parameters: + * Clean-up (1->500, default 30) -> convolve1 (kernelMatrix, central value -1001->-1500, default -1030) + * Dilatation (1.->50., default 1) -> color2 (n-1th value) + * Erosion (0.->50., default 0) -> color2 (nth value 0->-50) + * Strength (0.->10., default 0.5) -> composite2 (k2) + * Length (0.5->20, default 4) -> blur1 (stdDeviation x), blur2 (stdDeviation y) + * Transparent (boolean, default false) -> composite 4 (in, true->composite3, false->blend) +*/ +class CrossEngraving : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + CrossEngraving ( ) : Filter() { }; + virtual ~CrossEngraving ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Cross engraving, custom") "\n" + "org.inkscape.effect.filter.CrossEngraving\n" + "30\n" + "1\n" + "0\n" + "0.5\n" + "4\n" + "false\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Convert image to an engraving made of vertical and horizontal lines") "\n" + "\n" + "\n", new CrossEngraving()); + }; +}; + +gchar const * +CrossEngraving::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream clean; + std::ostringstream dilat; + std::ostringstream erosion; + std::ostringstream strength; + std::ostringstream length; + std::ostringstream trans; + + clean << (-1000 - ext->get_param_int("clean")); + dilat << ext->get_param_float("dilat"); + erosion << (- ext->get_param_float("erosion")); + strength << ext->get_param_float("strength"); + length << ext->get_param_float("length"); + if (ext->get_param_bool("trans")) + trans << "composite3"; + else + trans << "blend"; + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", clean.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), strength.str().c_str(), length.str().c_str(), length.str().c_str(), trans.str().c_str()); + + return _filter; +}; /* CrossEngraving filter */ + /** \brief Custom predefined Drawing filter. Convert images to duochrome drawings. Filter's parameters: - * Simplification (0.01->20, default 0.6) -> blur1 (stdDeviation) - * Lightness (1->500, default 10) -> convolve1 (kernelMatrix, central value -1001->-1500, default -1010) - * Fading (0.->6., default 0) -> composite1 (k4) - * Smoothness (0.01->20, default 0.6) -> blur2 (stdDeviation) - * Dilatation (1->50, default 6) -> color2 (n-1th value) - * Erosion (0->50, default 3) -> color2 (nth value 0->-50) + * Simplification strength (0.01->20, default 0.6) -> blur1 (stdDeviation) + * Clean-up (1->500, default 10) -> convolve1 (kernelMatrix, central value -1001->-1500, default -1010) + * Erase (0.->6., default 0) -> composite1 (k4) + * Smoothness strength (0.01->20, default 0.6) -> blur2 (stdDeviation) + * Dilatation (1.->50., default 6) -> color2 (n-1th value) + * Erosion (0.->50., default 3) -> color2 (nth value 0->-50) * Transluscent (boolean, default false) -> composite 8 (in, true->merge1, false->composite7) - * Offset (-100->100, default 0) -> offset (val) - * Blur (0.01->20., default 1.) -> blur3 (stdDeviation) - * Blur spread (1->50, default 6) -> color4 (n-1th value) - * Blur erosion (0->50, default 3) -> color4 (nth value 0->-50) + * Blur strength (0.01->20., default 1.) -> blur3 (stdDeviation) + * Blur dilatation (1.->50., default 6) -> color4 (n-1th value) + * Blur erosion (0.->50., default 3) -> color4 (nth value 0->-50) * Stroke color (guint, default 64,64,64,255) -> flood2 (flood-color), composite3 (k2) * Image on stroke (boolean, default false) -> composite2 (in="flood2" true-> in="SourceGraphic") + * Offset (-100->100, default 0) -> offset (val) + * Fill color (guint, default 200,200,200,255) -> flood3 (flood-opacity), composite5 (k2) * Image on fill (boolean, default false) -> composite4 (in="flood3" true-> in="SourceGraphic") @@ -230,62 +318,64 @@ Chromolitho::get_filter_text (Inkscape::Extension::Extension * ext) class Drawing : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Drawing ( ) : Filter() { }; - virtual ~Drawing ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Drawing, custom") "\n" - "org.inkscape.effect.filter.Drawing\n" - "\n" - "\n" - "0.6\n" - "10\n" - "0\n" - "0.6\n" - "6\n" - "3\n" - "false\n" - "<_param name=\"blurheader\" type=\"groupheader\">Blur\n" - "1\n" - "6\n" - "3\n" - "\n" - "\n" - "-1515870721\n" - "false\n" - "\n" - "\n" - "589505535\n" - "false\n" - "0\n" - "\n" - "\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Convert images to duochrome drawings") "\n" - "\n" - "\n", new Drawing()); - }; + Drawing ( ) : Filter() { }; + virtual ~Drawing ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Drawing, custom") "\n" + "org.inkscape.effect.filter.Drawing\n" + "\n" + "\n" + "<_param name=\"simplifyheader\" type=\"groupheader\">Simplify\n" + "0.6\n" + "10\n" + "0\n" + "false\n" + "<_param name=\"smoothheader\" type=\"groupheader\">Smoothness\n" + "0.6\n" + "6\n" + "3\n" + "<_param name=\"meltheader\" type=\"groupheader\">Melt\n" + "1\n" + "6\n" + "3\n" + "\n" + "\n" + "-1515870721\n" + "false\n" + "\n" + "\n" + "589505535\n" + "false\n" + "0\n" + "\n" + "\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Convert images to duochrome drawings") "\n" + "\n" + "\n", new Drawing()); + }; }; gchar const * Drawing::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream simply; - std::ostringstream light; - std::ostringstream fade; + std::ostringstream clean; + std::ostringstream erase; std::ostringstream smooth; std::ostringstream dilat; std::ostringstream erosion; @@ -306,8 +396,8 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext) std::ostringstream iof; simply << ext->get_param_float("simply"); - light << (-1000 - ext->get_param_int("light")); - fade << (ext->get_param_float("fade") / 10); + clean << (-1000 - ext->get_param_int("clean")); + erase << (ext->get_param_float("erase") / 10); smooth << ext->get_param_float("smooth"); dilat << ext->get_param_float("dilat"); erosion << (- ext->get_param_float("erosion")); @@ -341,8 +431,8 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext) else ios << "flood2"; - _filter = g_strdup_printf( - "\n" + _filter = g_strdup_printf( + "\n" "\n" "\n" "\n" @@ -373,72 +463,189 @@ Drawing::get_filter_text (Inkscape::Extension::Extension * ext) "\n" "\n" "\n" - "\n", simply.str().c_str(), light.str().c_str(), fade.str().c_str(), smooth.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), blur.str().c_str(), bdilat.str().c_str(), berosion.str().c_str(), stroker.str().c_str(), strokeg.str().c_str(), strokeb.str().c_str(), ios.str().c_str(), strokea.str().c_str(), offset.str().c_str(), offset.str().c_str(), fillr.str().c_str(), fillg.str().c_str(), fillb.str().c_str(), iof.str().c_str(), filla.str().c_str(), transluscent.str().c_str()); + "\n", simply.str().c_str(), clean.str().c_str(), erase.str().c_str(), smooth.str().c_str(), dilat.str().c_str(), erosion.str().c_str(), blur.str().c_str(), bdilat.str().c_str(), berosion.str().c_str(), stroker.str().c_str(), strokeg.str().c_str(), strokeb.str().c_str(), ios.str().c_str(), strokea.str().c_str(), offset.str().c_str(), offset.str().c_str(), fillr.str().c_str(), fillg.str().c_str(), fillb.str().c_str(), iof.str().c_str(), filla.str().c_str(), transluscent.str().c_str()); - return _filter; + return _filter; }; /* Drawing filter */ + /** - \brief Custom predefined Posterize filter. + \brief Custom predefined Neon draw filter. + + Posterize and draw smooth lines around color shapes + + Filter's parameters: + * Lines type (enum, default smooth) -> + smooth = component1 (type="table"), component2 (type="table"), composite1 (in2="blur2") + hard = component1 (type="discrete"), component2 (type="discrete"), composite1 (in2="component1") + * Simplify (0.01->20., default 1.5) -> blur1 (stdDeviation) + * Line width (0.01->20., default 1.5) -> blur2 (stdDeviation) + * Lightness (0.->10., default 5) -> composite1 (k3) + * Blend (enum [normal, multiply, screen], default normal) -> blend (mode) + * Dark mode (boolean, default false) -> composite1 (true: in2="component2") +*/ +class NeonDraw : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + NeonDraw ( ) : Filter() { }; + virtual ~NeonDraw ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Neon draw, custom") "\n" + "org.inkscape.effect.filter.NeonDraw\n" + "\n" + "<_item value=\"smooth\">Smoothed\n" + "<_item value=\"hard\">Contrasted\n" + "\n" + "1.5\n" + "1.5\n" + "5\n" + "\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"multiply\">Multiply\n" + "<_item value=\"screen\">Screen\n" + "\n" + "false\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Posterize and draw smooth lines around color shapes") "\n" + "\n" + "\n", new NeonDraw()); + }; +}; + +gchar const * +NeonDraw::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream blend; + std::ostringstream simply; + std::ostringstream width; + std::ostringstream lightness; + std::ostringstream type1; + std::ostringstream type2; + std::ostringstream dark; + + const gchar *type = ext->get_param_enum("type"); + if ((g_ascii_strcasecmp("smooth", type) == 0)) { + type1 << "table"; + type2 << "table"; + } else { + type1 << "discrete"; + type2 << "discrete"; + } + + blend << ext->get_param_enum("blend"); + simply << ext->get_param_float("simply"); + width << ext->get_param_float("width"); + lightness << ext->get_param_float("lightness"); + + if (ext->get_param_bool("dark")) + dark << "component2"; + else if ((g_ascii_strcasecmp("smooth", type) == 0)) + dark << "blur2"; + else + dark << "component1"; + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", blend.str().c_str(), simply.str().c_str(), type1.str().c_str(), type1.str().c_str(), type1.str().c_str(), width.str().c_str(), type2.str().c_str(), type2.str().c_str(), type2.str().c_str(), dark.str().c_str(), lightness.str().c_str()); + + return _filter; +}; /* NeonDraw filter */ + +/** + \brief Custom predefined Poster paint filter. Poster and painting effects. - Filter's parameters (not finished yet): + Filter's parameters: * Effect type (enum, default "Normal") -> Normal = feComponentTransfer Dented = Normal + intermediate values - * Blur (0.01->10., default 5.) -> blur3 (stdDeviation) - + * Transfer type (enum, default "descrete") -> component (type) + * Levels (1->15, default 5) -> component (tableValues) + * Blend mode (enum, default "Lighten") -> blend (mode) + * Primary blur (0.01->100., default 4.) -> blur1 (stdDeviation) + * Secondary blur (0.01->100., default 0.5) -> blur2 (stdDeviation) + * Pre-saturation (0.->1., default 1.) -> color1 (values) + * Post-saturation (0.->1., default 1.) -> color2 (values) + * Simulate antialiasing (boolean, default false) -> blur3 (true->stdDeviation=0.5, false->stdDeviation=0.01) */ class Posterize : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Posterize ( ) : Filter() { }; - virtual ~Posterize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Poster and painting, custom") "\n" - "org.inkscape.effect.filter.Posterize\n" - "\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"dented\">Dented\n" - "\n" - "\n" - "<_item value=\"discrete\">Poster\n" - "<_item value=\"table\">Painting\n" - "\n" - "5\n" - "\n" - "<_item value=\"lighten\">Lighten\n" - "<_item value=\"normal\">Normal\n" - "<_item value=\"darken\">Darken\n" - "\n" - "4.0\n" - "0.5\n" - "1.00\n" - "1.00\n" - "false\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Poster and painting effects") "\n" - "\n" - "\n", new Posterize()); - }; + Posterize ( ) : Filter() { }; + virtual ~Posterize ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Poster paint, custom") "\n" + "org.inkscape.effect.filter.Posterize\n" + "\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"dented\">Dented\n" + "\n" + "\n" + "<_item value=\"discrete\">Poster\n" + "<_item value=\"table\">Painting\n" + "\n" + "5\n" + "\n" + "<_item value=\"lighten\">Lighten\n" + "<_item value=\"normal\">Normal\n" + "<_item value=\"darken\">Darken\n" + "\n" + "4.0\n" + "0.5\n" + "1.00\n" + "1.00\n" + "false\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Poster and painting effects") "\n" + "\n" + "\n", new Posterize()); + }; }; gchar const * Posterize::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream table; std::ostringstream blendmode; @@ -475,28 +682,28 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext) else antialias << "0.01"; - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", blur1.str().c_str(), blur2.str().c_str(), blendmode.str().c_str(), presat.str().c_str(), table.str().c_str(), transf.str().c_str(), table.str().c_str(), transf.str().c_str(), table.str().c_str(), transf.str().c_str(), postsat.str().c_str(), antialias.str().c_str()); - return _filter; + return _filter; }; /* Posterize filter */ /** - \brief Custom predefined PosterizeBasic filter. + \brief Custom predefined Posterize basic filter. Simple posterizing effect @@ -506,36 +713,36 @@ Posterize::get_filter_text (Inkscape::Extension::Extension * ext) */ class PosterizeBasic : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - PosterizeBasic ( ) : Filter() { }; - virtual ~PosterizeBasic ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Posterize basic, custom") "\n" - "org.inkscape.effect.filter.PosterizeBasic\n" - "5\n" - "4.0\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Simple posterizing effect") "\n" - "\n" - "\n", new PosterizeBasic()); - }; + PosterizeBasic ( ) : Filter() { }; + virtual ~PosterizeBasic ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Posterize basic, custom") "\n" + "org.inkscape.effect.filter.PosterizeBasic\n" + "5\n" + "4.0\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Simple posterizing effect") "\n" + "\n" + "\n", new PosterizeBasic()); + }; }; gchar const * PosterizeBasic::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream blur; std::ostringstream transf; @@ -551,18 +758,18 @@ PosterizeBasic::get_filter_text (Inkscape::Extension::Extension * ext) } transf << " 1"; - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", blur.str().c_str(), transf.str().c_str(), transf.str().c_str(), transf.str().c_str()); - return _filter; + return _filter; }; /* PosterizeBasic filter */ }; /* namespace Filter */ @@ -570,5 +777,5 @@ PosterizeBasic::get_filter_text (Inkscape::Extension::Extension * ext) }; /* namespace Extension */ }; /* namespace Inkscape */ -/* Change the 'COLOR' below to be your file name */ +/* Change the 'EXPERIMENTAL' below to be your file name */ #endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_EXPERIMENTAL_H__ */ diff --git a/src/extension/internal/filter/filter-all.cpp b/src/extension/internal/filter/filter-all.cpp index 846725472..7383b793a 100755 --- a/src/extension/internal/filter/filter-all.cpp +++ b/src/extension/internal/filter/filter-all.cpp @@ -12,6 +12,7 @@ #include "color.h" #include "drop-shadow.h" #include "morphology.h" +#include "shadows.h" #include "snow.h" #include "experimental.h" @@ -34,13 +35,21 @@ Filter::filters_all (void ) // ABCs Blur::init(); + CleanEdges::init(); + ColorShift::init(); DiffuseLight::init(); + Feather::init(); + MatteJelly::init(); + NoiseFill::init(); + Outline::init(); Roughen::init(); + Silhouette::init(); SpecularLight::init(); // Color Colorize::init(); Duochrome::init(); + Electrize::init(); Quadritone::init(); Solarize::init(); Tritone::init(); @@ -53,7 +62,9 @@ Filter::filters_all (void ) // TDB Chromolitho::init(); + CrossEngraving::init(); Drawing::init(); + NeonDraw::init(); Posterize::init(); PosterizeBasic::init(); diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h index 8e00b47be..5584ce506 100644 --- a/src/extension/internal/filter/morphology.h +++ b/src/extension/internal/filter/morphology.h @@ -3,7 +3,7 @@ /* Change the 'MORPHOLOGY' above to be your file name */ /* - * Copyright (C) 2010 Authors: + * Copyright (C) 2011 Authors: * Ivan Louette (filters) * Nicolas Dufour (UI) * @@ -39,40 +39,40 @@ namespace Filter { class Crosssmooth : public Inkscape::Extension::Internal::Filter::Filter { protected: - virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); public: - Crosssmooth ( ) : Filter() { }; - virtual ~Crosssmooth ( ) { if (_filter != NULL) g_free((void *)_filter); return; } - - static void init (void) { - Inkscape::Extension::build_from_mem( - "\n" - "" N_("Cross-smooth, custom (morphology)") "\n" - "org.inkscape.effect.filter.crosssmooth\n" - "\n" - "<_item value=\"edges\">Smooth edges\n" - "<_item value=\"all\">Smooth all\n" - "\n" - "5\n" - "\n" - "all\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "" N_("Smooth edges and angles of shapes") "\n" - "\n" - "\n", new Crosssmooth()); - }; + Crosssmooth ( ) : Filter() { }; + virtual ~Crosssmooth ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Cross-smooth, custom (Morphology)") "\n" + "org.inkscape.effect.filter.crosssmooth\n" + "\n" + "<_item value=\"edges\">Smooth edges\n" + "<_item value=\"all\">Smooth all\n" + "\n" + "5\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Smooth edges and angles of shapes") "\n" + "\n" + "\n", new Crosssmooth()); + }; }; gchar const * Crosssmooth::get_filter_text (Inkscape::Extension::Extension * ext) { - if (_filter != NULL) g_free((void *)_filter); + if (_filter != NULL) g_free((void *)_filter); std::ostringstream blur; std::ostringstream c1in; @@ -86,16 +86,16 @@ Crosssmooth::get_filter_text (Inkscape::Extension::Extension * ext) c1in << "SourceGraphic"; } - _filter = g_strdup_printf( - "\n" - "\n" - "\n" - "\n" - "\n" - "\n" + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" "\n", blur.str().c_str(), c1in.str().c_str()); - return _filter; + return _filter; }; /* Crosssmooth filter */ }; /* namespace Filter */ @@ -103,5 +103,5 @@ Crosssmooth::get_filter_text (Inkscape::Extension::Extension * ext) }; /* namespace Extension */ }; /* namespace Inkscape */ -/* Change the 'COLOR' below to be your file name */ +/* Change the 'MORPHOLOGY' below to be your file name */ #endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_MORPHOLOGY_H__ */ diff --git a/src/extension/internal/filter/shadows.h b/src/extension/internal/filter/shadows.h new file mode 100644 index 000000000..1924c5bb3 --- /dev/null +++ b/src/extension/internal/filter/shadows.h @@ -0,0 +1,111 @@ +#ifndef __INKSCAPE_EXTENSION_INTERNAL_FILTER_SHADOWS_H__ +#define __INKSCAPE_EXTENSION_INTERNAL_FILTER_SHADOWS_H__ +/* Change the 'SHADOWS' above to be your file name */ + +/* + * Copyright (C) 2011 Authors: + * Ivan Louette (filters) + * Nicolas Dufour (UI) + * + * Color filters + * Drop shadow + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ +/* ^^^ Change the copyright to be you and your e-mail address ^^^ */ + +#include "filter.h" + +#include "extension/internal/clear-n_.h" +#include "extension/system.h" +#include "extension/extension.h" + +namespace Inkscape { +namespace Extension { +namespace Internal { +namespace Filter { + +/** + \brief Custom predefined Drop shadow filter. + + Colorizable Drop shadow. + + Filter's parameters: + * Blur radius (0.->200., default 3) -> blur (stdDeviation) + * Horizontal offset (-50.->50., default 6.0) -> offset (dx) + * Vertical offset (-50.->50., default 6.0) -> offset (dy) + * Color (guint, default 0,0,0,127) -> flood (flood-opacity, flood-color) +*/ +class ColorizableDropShadow : public Inkscape::Extension::Internal::Filter::Filter { +protected: + virtual gchar const * get_filter_text (Inkscape::Extension::Extension * ext); + +public: + ColorizableDropShadow ( ) : Filter() { }; + virtual ~ColorizableDropShadow ( ) { if (_filter != NULL) g_free((void *)_filter); return; } + + static void init (void) { + Inkscape::Extension::build_from_mem( + "\n" + "" N_("Drop shadow, custom (Shadows and Glows)") "\n" + "org.inkscape.effect.filter.ColorDropShadow\n" + "3.0\n" + "6.0\n" + "6.0\n" + "127\n" + "\n" + "all\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "" N_("Colorizable Drop shadow") "\n" + "\n" + "\n", new ColorizableDropShadow()); + }; + +}; + +gchar const * +ColorizableDropShadow::get_filter_text (Inkscape::Extension::Extension * ext) +{ + if (_filter != NULL) g_free((void *)_filter); + + std::ostringstream blur; + std::ostringstream a; + std::ostringstream r; + std::ostringstream g; + std::ostringstream b; + std::ostringstream x; + std::ostringstream y; + + guint32 color = ext->get_param_color("color"); + + blur << ext->get_param_float("blur"); + x << ext->get_param_float("xoffset"); + y << ext->get_param_float("yoffset"); + a << (color & 0xff) / 255.0F; + r << ((color >> 24) & 0xff); + g << ((color >> 16) & 0xff); + b << ((color >> 8) & 0xff); + + _filter = g_strdup_printf( + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n", a.str().c_str(), r.str().c_str(), g.str().c_str(), b.str().c_str(), blur.str().c_str(), x.str().c_str(), y.str().c_str()); + + return _filter; +}; + +}; /* namespace Filter */ +}; /* namespace Internal */ +}; /* namespace Extension */ +}; /* namespace Inkscape */ + +/* Change the 'SHADOWS' below to be your file name */ +#endif /* __INKSCAPE_EXTENSION_INTERNAL_FILTER_SHADOWS_H__ */ -- 2.30.2