![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index 8d2e6dc3c2b657fd2c0082109412851597b2d91b..886ee118e12f7cc0ef9c1c80493cdede17752342 100644 (file)
#include "display/nr-filter-displacement-map.h"
#include "display/nr-filter-types.h"
+#include "display/nr-filter-units.h"
+#include "libnr/nr-blit.h"
+#include "libnr/nr-matrix-fns.h"
#include "libnr/nr-pixops.h"
namespace NR {
FilterDisplacementMap::FilterDisplacementMap()
-: scale(0),
- _input2(NR_FILTER_SLOT_NOT_SET),
- Xchannel(3),
- Ychannel(3)
{}
FilterPrimitive * FilterDisplacementMap::create() {
FilterDisplacementMap::~FilterDisplacementMap()
{}
-int FilterDisplacementMap::render(FilterSlot &slot, Matrix const &trans) {
- g_warning("FIX-ME: FilterDisplacementMap::render method is still a bit buggy. Needs Love.");
-
+int FilterDisplacementMap::render(FilterSlot &slot, FilterUnits const &units) {
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;
}
+
+ //TODO: check whether do we really need this check:
+ if (map->area.x1 <= map->area.x0 || map->area.y1 <= map->area.y0) return 0; //nothing to do!
+
+ NRPixBlock *out = new NRPixBlock;
- nr_pixblock_setup_fast(out, map->mode,
- map->area.x0, map->area.y0, map->area.x1, map->area.y1,
- true);
+ out_x0 = map->area.x0;
+ out_y0 = map->area.y0;
+ out_w = map->area.x1 - map->area.x0;
+ out_h = map->area.y1 - map->area.y0;
+
+ out->area.x0 = out_x0;
+ out->area.y0 = out_y0;
+ out->area.x1 = out_x0 + out_w;
+ out->area.y1 = out_y0 + out_h;
+
+ nr_pixblock_setup_fast(out, texture->mode, out->area.x0, out->area.y0, out->area.x1, out->area.y1, true);
+
+ // this primitive is defined for non-premultiplied RGBA values,
+ // thus convert them to that format
+ bool free_map_on_exit = false;
+ if (map->mode != NR_PIXBLOCK_MODE_R8G8B8A8N) {
+ NRPixBlock *original_map = map;
+ map = new NRPixBlock;
+ nr_pixblock_setup_fast(map, NR_PIXBLOCK_MODE_R8G8B8A8N,
+ original_map->area.x0, original_map->area.y0,
+ original_map->area.x1, original_map->area.y1,
+ false);
+ nr_blit_pixblock_pixblock(map, original_map);
+ free_map_on_exit = 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;
+ int x, y;
+ int in_w = map->area.x1 - map->area.x0;
+ int in_h = map->area.y1 - map->area.y0;
double coordx, coordy;
-// unsigned int alpha; //used for demultiplication
- 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++){
-/* SVG spec states that pixel values must be alpha-demultiplied before processing this filter operation.
-The following code does it, but when we DON'T do it, output is more similar to output from Batik.
-
-Batik output:
- http://bighead.poli.usp.br/~juca/code/inkscape/batik-fed02.png
-Inkscape output without demultiplication:
- http://bighead.poli.usp.br/~juca/code/inkscape/displacement-map-test.png
-
- There is also this other bug that can be seen in the above screenshot: the lower and the right portions are not rendered, I dont know why.
-
- --JucaBlues
-
- if (map->mode == NR_PIXBLOCK_MODE_R8G8B8A8P){
- alpha = (unsigned int) map_data[4*((x-x0) + width*(y-y0)) + 3];
- if (alpha==0){
- coordx = x-x0;
- coordy = y-y0;
+ Matrix trans = units.get_matrix_primitiveunits2pb();
+ double scalex = scale*NR::expansionX(trans);
+ double scaley = scale*NR::expansionY(trans);
+
+ for (x=0; x < out_w; x++){
+ for (y=0; y < out_h; y++){
+ int xmap = x+out_x0-map->area.x0;
+ int ymap = y+out_y0-map->area.y0;
+ if (xmap >= 0 &&
+ xmap < in_w &&
+ ymap >= 0 &&
+ ymap < in_h){
+
+ coordx = xmap + scalex * ( double(map_data[4*(xmap + in_w*ymap) + Xchannel]-128.)/256);
+ coordy = ymap + scaley * ( double(map_data[4*(xmap + in_w*ymap) + Ychannel]-128.)/256);
+
+ if (coordx>=0 && coordx<in_w && coordy>=0 && coordy<in_h){
+ out_data[4*(x + out_w*y) ] = texture_data[4*(int(coordx) + int(coordy)*in_w) ];
+ out_data[4*(x + out_w*y) + 1] = texture_data[4*(int(coordx) + int(coordy)*in_w) + 1];
+ out_data[4*(x + out_w*y) + 2] = texture_data[4*(int(coordx) + int(coordy)*in_w) + 2];
+ out_data[4*(x + out_w*y) + 3] = texture_data[4*(int(coordx) + int(coordy)*in_w) + 3];
} else {
- coordx = x-x0 + scale * ( ((double)NR_DEMUL_111( (unsigned int)map_data[4*((x-x0) + width*(y-y0)) + Xchannel], alpha))/255 - 0.5 );
- coordy = y-y0 + scale * ( ((double)NR_DEMUL_111( (unsigned int)map_data[4*((x-x0) + width*(y-y0)) + Ychannel], alpha))/255 - 0.5 );
+ out_data[4*(x + out_w*y) ] = 255;
+ out_data[4*(x + out_w*y) + 1] = 255;
+ out_data[4*(x + out_w*y) + 2] = 255;
+ out_data[4*(x + out_w*y) + 3] = 0;
}
- } else {*/
- 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 + ((int)coordy)*width)];
- out_data[4*((x-x0) + width*(y-y0)) + 1] = texture_data[4*((int)coordx + ((int)coordy)*width) + 1];
- out_data[4*((x-x0) + width*(y-y0)) + 2] = texture_data[4*((int)coordx + ((int)coordy)*width) + 2];
- out_data[4*((x-x0) + width*(y-y0)) + 3] = texture_data[4*((int)coordx + ((int)coordy)*width) + 3];
+ }
}
}
+ if (free_map_on_exit) {
+ nr_pixblock_release(map);
+ delete map;
+ }
+
out->empty = FALSE;
slot.set(_output, out);
return 0;
_input = slot;
}
-void FilterDisplacementMap::set_scale(int s) {
+void FilterDisplacementMap::set_scale(double s) {
scale = s;
}
if (input == 1) _input2 = slot;
}
-void FilterDisplacementMap::set_channel_selector(int s, int channel) {
+void FilterDisplacementMap::set_channel_selector(int s, FilterDisplacementMapChannelSelector channel) {
+ if (channel > DISPLACEMENTMAP_CHANNEL_ALPHA || channel < DISPLACEMENTMAP_CHANNEL_RED) {
+ g_warning("Selected an invalid channel value. (%d)", channel);
+ return;
+ }
+
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;
+ //I assume scale is in user coordinates (?!?)
+ //FIXME: trans should be multiplied by some primitiveunits2user, shouldn't it?
+
+ double scalex = scale/2.*(std::fabs(trans[0])+std::fabs(trans[1]));
+ double scaley = scale/2.*(std::fabs(trans[2])+std::fabs(trans[3]));
+
+ //FIXME: no +2 should be there!... (noticable only for big scales at big zoom factor)
+ area.x0 -= (int)(scalex)+2;
+ area.x1 += (int)(scalex)+2;
+ area.y0 -= (int)(scaley)+2;
+ area.y1 += (int)(scaley)+2;
+}
+
+FilterTraits FilterDisplacementMap::get_input_traits() {
+ return TRAIT_PARALLER;
}
} /* namespace NR */