dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: added gegl value and behind blending modes

Browse source
This commit is contained in:
Ville Sokk 2012-05-11 20:37:47 +03:00
parent c713e80e63
commit cf442d3386
3 changed files with 74 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/gegl/gimp-gegl-nodes.c
View file

@ -318,8 +318,6 @@ gimp_gegl_node_set_layer_mode (GeglNode *node,
switch (mode)
{
case GIMP_BEHIND_MODE:
case GIMP_VALUE_MODE:
case GIMP_COLOR_ERASE_MODE:
case GIMP_ANTI_ERASE_MODE:
gegl_node_set (node,

46
app/operations/gimpoperationbehindmode.c
View file

@ -3,6 +3,7 @@
*
* gimpoperationbehindmode.c
* Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
* 2012 Ville Sokk <ville.sokk@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -72,20 +73,43 @@ gimp_operation_behind_mode_process (GeglOperation *operation,
const GeglRectangle *roi,
gint level)
{
gfloat *in = in_buf;
gfloat *layer = aux_buf;
gfloat *out = out_buf;
GimpOperationPointLayerMode *point = GIMP_OPERATION_POINT_LAYER_MODE (operation);
gfloat *in = in_buf;
gfloat *layer = aux_buf;
gfloat *out = out_buf;
while (samples--)
if (point->premultiplied)
{
out[RED] = in[RED];
out[GREEN] = in[GREEN];
out[BLUE] = in[BLUE];
out[ALPHA] = in[ALPHA];
while (samples--)
{
gint b;
in += 4;
layer += 4;
out += 4;
for (b = RED; b <= ALPHA; b++)
{
out[b] = in[b] + layer[b] * (1 - in[ALPHA]);
}
in += 4;
layer += 4;
out += 4;
}
}
else
{
while (samples--)
{
gint b;
out[ALPHA] = in[ALPHA] + (1 - in[ALPHA]) * layer[ALPHA];
for (b = RED; b < ALPHA; b++)
{
out[b] = (in[b] * in[ALPHA] + layer[b] * layer[ALPHA] * (1 - in[ALPHA])) / out[ALPHA];
}
in += 4;
layer += 4;
out += 4;
}
}
return TRUE;

44
app/operations/gimpoperationvaluemode.c
View file

@ -3,6 +3,7 @@
*
* gimpoperationvaluemode.c
* Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
* 2012 Ville Sokk <ville.sokk@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -22,12 +23,17 @@
#include "config.h"
#include <gegl-plugin.h>
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpcolor/gimpcolor.h"
#include "operations-types.h"
#include "gimpoperationvaluemode.h"
static void gimp_operation_value_mode_prepare (GeglOperation *operation);
static gboolean gimp_operation_value_mode_process (GeglOperation *operation,
void *in_buf,
void *aux_buf,
@ -55,7 +61,8 @@ gimp_operation_value_mode_class_init (GimpOperationValueModeClass *klass)
"description", "GIMP value mode operation",
NULL);
point_class->process = gimp_operation_value_mode_process;
operation_class->prepare = gimp_operation_value_mode_prepare;
point_class->process = gimp_operation_value_mode_process;
}
static void
@ -63,6 +70,16 @@ gimp_operation_value_mode_init (GimpOperationValueMode *self)
{
}
static void
gimp_operation_value_mode_prepare (GeglOperation *operation)
{
const Babl *format = babl_format ("R'G'B'A float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format);
gegl_operation_set_format (operation, "output", format);
}
static gboolean
gimp_operation_value_mode_process (GeglOperation *operation,
void *in_buf,
@ -78,10 +95,27 @@ gimp_operation_value_mode_process (GeglOperation *operation,
while (samples--)
{
out[RED] = in[RED];
out[GREEN] = in[GREEN];
out[BLUE] = in[BLUE];
out[ALPHA] = in[ALPHA];
gint b;
GimpHSV layer_hsv, out_hsv;
GimpRGB layer_rgb = {layer[0], layer[1], layer[2]};
GimpRGB out_rgb = {in[0], in[1], in[2]};
gfloat comp_alpha = MIN (in[ALPHA], layer[ALPHA]);
gfloat new_alpha = in[ALPHA] + (1 - in[ALPHA]) * comp_alpha;
gfloat ratio = comp_alpha / new_alpha;
gimp_rgb_to_hsv (&layer_rgb, &layer_hsv);
gimp_rgb_to_hsv (&out_rgb, &out_hsv);
out_hsv.v = layer_hsv.v;
gimp_hsv_to_rgb (&out_hsv, &out_rgb);
out[0] = out_rgb.r;
out[1] = out_rgb.g;
out[2] = out_rgb.b;
out[3] = in[3];
for (b = RED; b < ALPHA; b++)
out[b] = out[b] * ratio + in[b] * (1 - ratio) + 0.0001;
in += 4;
layer += 4;