X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-feblend.cpp;h=1c560e81bdc96c31a3b37599d31ba183f3dad624;hb=57eb32794c2df43d60ee8f0a9aa8576567358ce6;hp=41f1ceaf1d38d3ce8d5f896d8cfd1102ba411318;hpb=761a541468cc0b8a7fcfb8c65784c0896f0f80f4;p=inkscape.git diff --git a/src/sp-feblend.cpp b/src/sp-feblend.cpp index 41f1ceaf1..1c560e81b 100644 --- a/src/sp-feblend.cpp +++ b/src/sp-feblend.cpp @@ -6,9 +6,10 @@ */ /* * Authors: - * hugo Rodrigues + * Hugo Rodrigues + * Niko Kiirala * - * Copyright (C) 2006 Hugo Rodrigues + * Copyright (C) 2006,2007 authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -17,24 +18,17 @@ # include "config.h" #endif +#include + #include "attributes.h" #include "svg/svg.h" #include "sp-feblend.h" #include "xml/repr.h" -//#define SP_MACROS_SILENT -//#include "macros.h" - -#define DEBUG_FEBLEND -#ifdef DEBUG_FEBLEND -# define debug(f, a...) { g_print("%s(%d) %s:", \ - __FILE__,__LINE__,__FUNCTION__); \ - g_print(f, ## a); \ - g_print("\n"); \ - } -#else -# define debug(f, a...) /**/ -#endif +#include "display/nr-filter.h" +#include "display/nr-filter-primitive.h" +#include "display/nr-filter-blend.h" +#include "display/nr-filter-types.h" /* FeBlend base class */ @@ -46,8 +40,9 @@ static void sp_feBlend_release(SPObject *object); static void sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value); static void sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags); static Inkscape::XML::Node *sp_feBlend_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); +static void sp_feBlend_build_renderer(SPFilterPrimitive *sp_prim, NR::Filter *filter); -static SPObjectClass *feBlend_parent_class; +static SPFilterPrimitiveClass *feBlend_parent_class; GType sp_feBlend_get_type() @@ -65,7 +60,7 @@ sp_feBlend_get_type() (GInstanceInitFunc) sp_feBlend_init, NULL, /* value_table */ }; - feBlend_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeBlend", &feBlend_info, (GTypeFlags)0); + feBlend_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeBlend", &feBlend_info, (GTypeFlags)0); } return feBlend_type; } @@ -74,20 +69,23 @@ static void sp_feBlend_class_init(SPFeBlendClass *klass) { SPObjectClass *sp_object_class = (SPObjectClass *)klass; + SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass; - feBlend_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); + feBlend_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass); sp_object_class->build = sp_feBlend_build; sp_object_class->release = sp_feBlend_release; sp_object_class->write = sp_feBlend_write; sp_object_class->set = sp_feBlend_set; sp_object_class->update = sp_feBlend_update; + + sp_primitive_class->build_renderer = sp_feBlend_build_renderer; } static void sp_feBlend_init(SPFeBlend *feBlend) { - debug("0x%p",feBlend); + feBlend->in2 = NR::NR_FILTER_SLOT_NOT_SET; } /** @@ -98,12 +96,13 @@ sp_feBlend_init(SPFeBlend *feBlend) static void sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - debug("0x%p",object); if (((SPObjectClass *) feBlend_parent_class)->build) { ((SPObjectClass *) feBlend_parent_class)->build(object, document, repr); } /*LOAD ATTRIBUTES FROM REPR HERE*/ + sp_object_read_attr(object, "mode"); + sp_object_read_attr(object, "in2"); } /** @@ -112,24 +111,68 @@ sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re static void sp_feBlend_release(SPObject *object) { - debug("0x%p",object); - if (((SPObjectClass *) feBlend_parent_class)->release) ((SPObjectClass *) feBlend_parent_class)->release(object); } +static NR::FilterBlendMode sp_feBlend_readmode(gchar const *value) +{ + if (!value) return NR::BLEND_NORMAL; + switch (value[0]) { + case 'n': + if (strncmp(value, "normal", 6) == 0) + return NR::BLEND_NORMAL; + break; + case 'm': + if (strncmp(value, "multiply", 8) == 0) + return NR::BLEND_MULTIPLY; + break; + case 's': + if (strncmp(value, "screen", 6) == 0) + return NR::BLEND_SCREEN; + break; + case 'd': + if (strncmp(value, "darken", 6) == 0) + return NR::BLEND_DARKEN; + break; + case 'l': + if (strncmp(value, "lighten", 7) == 0) + return NR::BLEND_LIGHTEN; + break; + default: + // do nothing by default + break; + } + return NR::BLEND_NORMAL; +} + /** * Sets a specific value in the SPFeBlend. */ static void sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value) { - debug("0x%p %s(%u): '%s'",object, - sp_attribute_name(key),key,value); SPFeBlend *feBlend = SP_FEBLEND(object); + (void)feBlend; - switch(key) { + NR::FilterBlendMode mode; + int input; + switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ + case SP_ATTR_MODE: + mode = sp_feBlend_readmode(value); + if (mode != feBlend->blend_mode) { + feBlend->blend_mode = mode; + object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG); + } + break; + case SP_ATTR_IN2: + input = sp_filter_primitive_read_in(feBlend, value); + if (input != feBlend->in2) { + feBlend->in2 = input; + object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG); + } + break; default: if (((SPObjectClass *) feBlend_parent_class)->set) ((SPObjectClass *) feBlend_parent_class)->set(object, key, value); @@ -144,13 +187,9 @@ sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value) static void sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags) { - debug("0x%p",object); - - if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG | - SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) { - - /* do something to trigger redisplay, updates? */ - + if (flags & SP_OBJECT_MODIFIED_FLAG) { + sp_object_read_attr(object, "mode"); + sp_object_read_attr(object, "in2"); } if (((SPObjectClass *) feBlend_parent_class)->update) { @@ -164,15 +203,13 @@ sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags) static Inkscape::XML::Node * sp_feBlend_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) { - debug("0x%p",object); - // Inkscape-only object, not copied during an "plain SVG" dump: if (flags & SP_OBJECT_WRITE_EXT) { if (repr) { // is this sane? - repr->mergeFrom(SP_OBJECT_REPR(object), "id"); + // repr->mergeFrom(SP_OBJECT_REPR(object), "id"); } else { - repr = SP_OBJECT_REPR(object)->duplicate(); + repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME } } @@ -183,6 +220,22 @@ sp_feBlend_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) return repr; } +static void sp_feBlend_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) { + g_assert(primitive != NULL); + g_assert(filter != NULL); + + SPFeBlend *sp_blend = SP_FEBLEND(primitive); + + int primitive_n = filter->add_primitive(NR::NR_FILTER_BLEND); + NR::FilterPrimitive *nr_primitive = filter->get_primitive(primitive_n); + NR::FilterBlend *nr_blend = dynamic_cast(nr_primitive); + g_assert(nr_blend != NULL); + + sp_filter_primitive_renderer_common(primitive, nr_primitive); + + nr_blend->set_mode(sp_blend->blend_mode); + nr_blend->set_input(1, sp_blend->in2); +} /* Local Variables: