DisplacementMap filter boilerplate code + renderer draft implementation.

General setting of attributes and default values.

renderer method is still not correct. Needs some more effort.

(bzr r3293)

4 files changed, 173 insertions, 1 deletions

diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index a72175b3f..f31236674 100644
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -83,6 +83,8 @@ display_libspdisplay_a_SOURCES = \
 	display/nr-filter-composite.cpp	\
 	display/nr-filter-convolve-matrix.cpp	\
 	display/nr-filter-convolve-matrix.h	\
+    display/nr-filter-displacement-map.cpp      \
+    display/nr-filter-displacement-map.h        \
 	display/nr-filter-slot.cpp      \
 	display/nr-filter-slot.h        \
 	display/nr-filter-getalpha.cpp	\
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
new file mode 100644
index 000000000..ec8681ad1
--- /dev/null
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -0,0 +1,115 @@
+/*
+ * feDisplacementMap filter primitive renderer
+ *
+ * Authors:
+ *   Felipe Corrêa da Silva Sanches <felipe.sanches@gmail.com>
+ *
+ * Copyright (C) 2007 authors
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#include "display/nr-filter-displacement-map.h"
+#include "display/nr-filter-types.h"
+
+namespace NR {
+
+FilterDisplacementMap::FilterDisplacementMap()
+: Xchannel(3),
+  Ychannel(3),
+  scale(0),
+  _input2(NR_FILTER_SLOT_NOT_SET)
+{}
+
+FilterPrimitive * FilterDisplacementMap::create() {
+    return new FilterDisplacementMap();
+}
+
+FilterDisplacementMap::~FilterDisplacementMap()
+{}
+
+int FilterDisplacementMap::render(FilterSlot &slot, Matrix const &trans) {
+    g_warning("FIX-ME: FilterDisplacementMap::render method is still a bit buggy. Needs Love.");
+    
+    NRPixBlock *texture = slot.get(_input);
+    NRPixBlock *map = slot.get(_input2);
+    NRPixBlock *out = new NRPixBlock;
+    
+    // Bail out if either one of source images is missing
+    if (!map || !texture) {
+        g_warning("Missing source image for feDisplacementMap (map=%d texture=%d)", _input, _input2);
+        return 1;
+    }
+    
+    nr_pixblock_setup_fast(out, map->mode,
+                           map->area.x0, map->area.y0, map->area.x1, map->area.y1,
+                           true);
+
+    unsigned char *map_data = NR_PIXBLOCK_PX(map);
+    unsigned char *texture_data = NR_PIXBLOCK_PX(texture);
+    unsigned char *out_data = NR_PIXBLOCK_PX(out);
+    int x, y, x0, y0, x1, y1, width;
+    double coordx, coordy;
+   
+    x0 = out->area.x0;
+    y0 = out->area.y0;
+    x1 = out->area.x1;
+    y1 = out->area.y1;
+    width = x1 - x0;
+        
+    for (x=x0 + scale/2; x < x1 - scale/2; x++){
+        for (y=y0 + scale/2; y < y1 - scale/2; y++){
+            coordx = x-x0 + scale * ( ((double)map_data[4*((x-x0) + width*(y-y0)) + Xchannel])/255 - 0.5);
+            coordy = y-y0 + scale * ( ((double)map_data[4*((x-x0) + width*(y-y0)) + Ychannel])/255 - 0.5);
+            
+            out_data[4*((x-x0) + width*(y-y0))] = texture_data[4*(int)(coordx + coordy*width)];
+            out_data[4*((x-x0) + width*(y-y0)) + 1] = texture_data[4*(int)(coordx + coordy*width) + 1];
+            out_data[4*((x-x0) + width*(y-y0)) + 2] = texture_data[4*(int)(coordx + coordy*width) + 2];
+            out_data[4*((x-x0) + width*(y-y0)) + 3] = texture_data[4*(int)(coordx + coordy*width) + 3];
+        }
+    }
+
+    out->empty = FALSE;
+    slot.set(_output, out);
+            return 0;
+}
+
+void FilterDisplacementMap::set_input(int slot) {
+    _input = slot;
+}
+
+void FilterDisplacementMap::set_scale(int s) {
+    scale = s;
+}
+
+void FilterDisplacementMap::set_input(int input, int slot) {
+    if (input == 0) _input = slot;
+    if (input == 1) _input2 = slot;
+}
+
+void FilterDisplacementMap::set_channel_selector(int s, int channel) {
+    if (s == 0) Xchannel = channel;
+    if (s == 1) Ychannel = channel;
+}
+
+void FilterDisplacementMap::area_enlarge(NRRectL &area, Matrix const &trans)
+{
+    //I'm in doubt whether this affects all input buffers or only 'in'
+    area.x0 -= scale/2;
+    area.y0 -= scale/2;
+    area.x1 += scale/2;
+    area.y1 += scale/2;
+}
+
+} /* namespace NR */
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h
new file mode 100644
index 000000000..4b5c6ada5
--- /dev/null
+++ b/src/display/nr-filter-displacement-map.h
@@ -0,0 +1,54 @@
+#ifndef __NR_FILTER_DISPLACEMENT_MAP_H__
+#define __NR_FILTER_DISPLACEMENT_MAP_H__
+
+/*
+ * feDisplacementMap filter primitive renderer
+ *
+ * Authors:
+ *   Felipe Corrêa da Silva Sanches <felipe.sanches@gmail.com>
+ *
+ * Copyright (C) 2007 authors
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#include "display/nr-filter-primitive.h"
+#include "display/nr-filter-slot.h"
+#include "libnr/nr-matrix.h"
+#include "libnr/nr-rect-l.h"
+
+namespace NR {
+
+class FilterDisplacementMap : public FilterPrimitive {
+public:
+    FilterDisplacementMap();
+    static FilterPrimitive *create();
+    virtual ~FilterDisplacementMap();
+
+    virtual void set_input(int slot);
+    virtual void set_input(int input, int slot);
+    virtual void set_scale(int s);
+    virtual void set_channel_selector(int channel, int s);
+    virtual int render(FilterSlot &slot, Matrix const &trans);
+    virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+
+private:
+    int scale;
+    int _input2;
+    int Xchannel;
+    int Ychannel;
+};
+
+} /* namespace NR */
+
+#endif /* __NR_FILTER_DISPLACEMENT_MAP_H__ */
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 47b05d0b8..2491fba35 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -21,6 +21,7 @@
 #include "display/pixblock-scaler.h"
 #include "display/pixblock-transform.h"
 
+#include "display/nr-filter-displacement-map.h"
 #include "display/nr-filter-gaussian.h"
 #include "display/nr-filter-convolve-matrix.h"
 #include "display/nr-filter-blend.h"
@@ -317,7 +318,7 @@ void Filter::_create_constructor_table()
     _constructor[NR_FILTER_COMPOSITE] = &FilterComposite::create;
     _constructor[NR_FILTER_CONVOLVEMATRIX] = &FilterConvolveMatrix::create;
     _constructor[NR_FILTER_DIFFUSELIGHTING] = &FilterDiffuseLighting::create;
-    _constructor[NR_FILTER_DISPLACEMENTMAP] = NULL;
+    _constructor[NR_FILTER_DISPLACEMENTMAP] = &FilterDisplacementMap::create;
     _constructor[NR_FILTER_FLOOD] = NULL;
     _constructor[NR_FILTER_GAUSSIANBLUR] = &FilterGaussian::create;
     _constructor[NR_FILTER_IMAGE] = NULL;