X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-feblend.cpp;h=1c560e81bdc96c31a3b37599d31ba183f3dad624;hb=1d292290278c99756affd4d351fa7b9baea2c49c;hp=7192f3bc672110698e609c5c05b87b8cc10de563;hpb=7333a6d3d0e1b6b738726a859e5875d5d97b27d9;p=inkscape.git

diff --git a/src/sp-feblend.cpp b/src/sp-feblend.cpp
index 7192f3bc6..1c560e81b 100644
--- a/src/sp-feblend.cpp
+++ b/src/sp-feblend.cpp
@@ -6,9 +6,10 @@
  */
 /*
  * Authors:
- *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Niko Kiirala <niko@kiirala.com>
  *
- * Copyright (C) 2006 Hugo Rodrigues
+ * Copyright (C) 2006,2007 authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -17,11 +18,17 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include "attributes.h"
 #include "svg/svg.h"
 #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 */
 
@@ -33,6 +40,7 @@ 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 SPFilterPrimitiveClass *feBlend_parent_class;
 
@@ -61,6 +69,7 @@ static void
 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);
 
@@ -69,11 +78,14 @@ sp_feBlend_class_init(SPFeBlendClass *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;
 }
 
 /**
@@ -89,6 +101,8 @@ sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
+    sp_object_read_attr(object, "mode");
+    sp_object_read_attr(object, "in2");
 }
 
 /**
@@ -101,6 +115,37 @@ sp_feBlend_release(SPObject *object)
         ((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.
  */
@@ -110,8 +155,24 @@ sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value)
     SPFeBlend *feBlend = SP_FEBLEND(object);
     (void)feBlend;
 
+    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);
@@ -126,11 +187,9 @@ sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value)
 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) {
@@ -148,9 +207,9 @@ sp_feBlend_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
     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->document());
+            repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
         }
     }
 
@@ -161,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::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: