diff --git a/src/sp-feblend.cpp b/src/sp-feblend.cpp
index 55c387e0036570e92ee7a7ffdd3a8c7ac3ec72e0..1c560e81bdc96c31a3b37599d31ba183f3dad624 100644 (file)
--- a/src/sp-feblend.cpp
+++ b/src/sp-feblend.cpp
#include "sp-feblend.h"
#include "xml/repr.h"
+#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 */
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 SPFilterPrimitiveClass *feBlend_parent_class;
sp_feBlend_class_init(SPFeBlendClass *klass)
{
SPObjectClass *sp_object_class = (SPObjectClass *)klass;
+ SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
feBlend_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
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)
{
+ feBlend->in2 = NR::NR_FILTER_SLOT_NOT_SET;
}
/**
/*LOAD ATTRIBUTES FROM REPR HERE*/
sp_object_read_attr(object, "mode");
+ sp_object_read_attr(object, "in2");
}
/**
SPFeBlend *feBlend = SP_FEBLEND(object);
(void)feBlend;
+ NR::FilterBlendMode mode;
+ int input;
switch(key) {
/*DEAL WITH SETTING ATTRIBUTES HERE*/
case SP_ATTR_MODE:
- feBlend->blend_mode = sp_feBlend_readmode(value);
+ 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)
static void
sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags)
{
- 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) {
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::FilterBlend*>(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: