X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-fecomposite.cpp;h=cb1726be79b3be2744a7f28da5546fad2716ce8e;hb=57eb32794c2df43d60ee8f0a9aa8576567358ce6;hp=621ea300aae43a26f9982954ef21501b357d5a64;hpb=761a541468cc0b8a7fcfb8c65784c0896f0f80f4;p=inkscape.git

diff --git a/src/sp-fecomposite.cpp b/src/sp-fecomposite.cpp
index 621ea300a..cb1726be7 100644
--- a/src/sp-fecomposite.cpp
+++ b/src/sp-fecomposite.cpp
@@ -20,21 +20,9 @@
 #include "attributes.h"
 #include "svg/svg.h"
 #include "sp-fecomposite.h"
+#include "helper-fns.h"
 #include "xml/repr.h"
-
-//#define SP_MACROS_SILENT
-//#include "macros.h"
-
-#define DEBUG_FECOMPOSITE
-#ifdef DEBUG_FECOMPOSITE
-# 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-composite.h"
 
 /* FeComposite base class */
 
@@ -46,8 +34,9 @@ static void sp_feComposite_release(SPObject *object);
 static void sp_feComposite_set(SPObject *object, unsigned int key, gchar const *value);
 static void sp_feComposite_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feComposite_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static void sp_feComposite_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter);
 
-static SPObjectClass *feComposite_parent_class;
+static SPFilterPrimitiveClass *feComposite_parent_class;
 
 GType
 sp_feComposite_get_type()
@@ -65,7 +54,7 @@ sp_feComposite_get_type()
             (GInstanceInitFunc) sp_feComposite_init,
             NULL,    /* value_table */
         };
-        feComposite_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeComposite", &feComposite_info, (GTypeFlags)0);
+        feComposite_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeComposite", &feComposite_info, (GTypeFlags)0);
     }
     return feComposite_type;
 }
@@ -74,20 +63,28 @@ static void
 sp_feComposite_class_init(SPFeCompositeClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
+    SPFilterPrimitiveClass *sp_primitive_class = (SPFilterPrimitiveClass *)klass;
 
-    feComposite_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
+    feComposite_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
 
     sp_object_class->build = sp_feComposite_build;
     sp_object_class->release = sp_feComposite_release;
     sp_object_class->write = sp_feComposite_write;
     sp_object_class->set = sp_feComposite_set;
     sp_object_class->update = sp_feComposite_update;
+
+    sp_primitive_class->build_renderer = sp_feComposite_build_renderer;
 }
 
 static void
 sp_feComposite_init(SPFeComposite *feComposite)
 {
-    debug("0x%p",feComposite);
+    feComposite->composite_operator = COMPOSITE_DEFAULT;
+    feComposite->k1 = 0;
+    feComposite->k2 = 0;
+    feComposite->k3 = 0;
+    feComposite->k4 = 0;
+    feComposite->in2 = NR::NR_FILTER_SLOT_NOT_SET;
 }
 
 /**
@@ -98,12 +95,20 @@ sp_feComposite_init(SPFeComposite *feComposite)
 static void
 sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    debug("0x%p",object);
     if (((SPObjectClass *) feComposite_parent_class)->build) {
         ((SPObjectClass *) feComposite_parent_class)->build(object, document, repr);
     }
 
-    /*LOAD ATTRIBUTES FROM REPR HERE*/
+    SPFeComposite *composite = SP_FECOMPOSITE(object);
+
+    sp_object_read_attr(object, "operator");
+    if (composite->composite_operator == COMPOSITE_ARITHMETIC) {
+        sp_object_read_attr(object, "k1");
+        sp_object_read_attr(object, "k2");
+        sp_object_read_attr(object, "k3");
+        sp_object_read_attr(object, "k4");
+    }
+    sp_object_read_attr(object, "in2");
 }
 
 /**
@@ -112,24 +117,89 @@ sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node
 static void
 sp_feComposite_release(SPObject *object)
 {
-    debug("0x%p",object);
-
     if (((SPObjectClass *) feComposite_parent_class)->release)
         ((SPObjectClass *) feComposite_parent_class)->release(object);
 }
 
+static FeCompositeOperator
+sp_feComposite_read_operator(gchar const *value) {
+    if (!value) return COMPOSITE_DEFAULT;
+
+    if (strcmp(value, "over") == 0) return COMPOSITE_OVER;
+    else if (strcmp(value, "in") == 0) return COMPOSITE_IN;
+    else if (strcmp(value, "out") == 0) return COMPOSITE_OUT;
+    else if (strcmp(value, "atop") == 0) return COMPOSITE_ATOP;
+    else if (strcmp(value, "xor") == 0) return COMPOSITE_XOR;
+    else if (strcmp(value, "arithmetic") == 0) return COMPOSITE_ARITHMETIC;
+    return COMPOSITE_DEFAULT;
+}
+
 /**
  * Sets a specific value in the SPFeComposite.
  */
 static void
 sp_feComposite_set(SPObject *object, unsigned int key, gchar const *value)
 {
-    debug("0x%p %s(%u): '%s'",object,
-            sp_attribute_name(key),key,value);
     SPFeComposite *feComposite = SP_FECOMPOSITE(object);
+    (void)feComposite;
 
-    switch(key) {
+    int input;
+    FeCompositeOperator op;
+    double k_n;
+    switch(key) {
 	/*DEAL WITH SETTING ATTRIBUTES HERE*/
+        case SP_ATTR_OPERATOR:
+            op = sp_feComposite_read_operator(value);
+            if (op != feComposite->composite_operator) {
+                feComposite->composite_operator = op;
+                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+
+        case SP_ATTR_K1:
+            k_n = helperfns_read_number(value);
+            if (k_n != feComposite->k1) {
+                feComposite->k1 = k_n;
+                if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)
+                    object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+
+        case SP_ATTR_K2:
+            k_n = helperfns_read_number(value);
+            if (k_n != feComposite->k2) {
+                feComposite->k2 = k_n;
+                if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)
+                    object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+
+        case SP_ATTR_K3:
+            k_n = helperfns_read_number(value);
+            if (k_n != feComposite->k3) {
+                feComposite->k3 = k_n;
+                if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)
+                    object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+
+        case SP_ATTR_K4:
+            k_n = helperfns_read_number(value);
+            if (k_n != feComposite->k4) {
+                feComposite->k4 = k_n;
+                if (feComposite->composite_operator == COMPOSITE_ARITHMETIC)
+                    object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+
+        case SP_ATTR_IN2:
+            input = sp_filter_primitive_read_in(feComposite, value);
+            if (input != feComposite->in2) {
+                feComposite->in2 = input;
+                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+
         default:
             if (((SPObjectClass *) feComposite_parent_class)->set)
                 ((SPObjectClass *) feComposite_parent_class)->set(object, key, value);
@@ -144,8 +214,6 @@ sp_feComposite_set(SPObject *object, unsigned int key, gchar const *value)
 static void
 sp_feComposite_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)) {
 
@@ -164,15 +232,13 @@ sp_feComposite_update(SPObject *object, SPCtx *ctx, guint flags)
 static Inkscape::XML::Node *
 sp_feComposite_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 +249,27 @@ sp_feComposite_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
     return repr;
 }
 
+static void sp_feComposite_build_renderer(SPFilterPrimitive *primitive, NR::Filter *filter) {
+    g_assert(primitive != NULL);
+    g_assert(filter != NULL);
+
+    SPFeComposite *sp_composite = SP_FECOMPOSITE(primitive);
+
+    int primitive_n = filter->add_primitive(NR::NR_FILTER_COMPOSITE);
+    NR::FilterPrimitive *nr_primitive = filter->get_primitive(primitive_n);
+    NR::FilterComposite *nr_composite = dynamic_cast<NR::FilterComposite*>(nr_primitive);
+    g_assert(nr_composite != NULL);
+
+    sp_filter_primitive_renderer_common(primitive, nr_primitive);
+
+    nr_composite->set_operator(sp_composite->composite_operator);
+    nr_composite->set_input(1, sp_composite->in2);
+    if (sp_composite->composite_operator == COMPOSITE_ARITHMETIC) {
+        nr_composite->set_arithmetic(sp_composite->k1, sp_composite->k2,
+                                     sp_composite->k3, sp_composite->k4);
+    }
+}
+
 
 /*
   Local Variables: