GIMP's OVERLAY mode was identical to SOFTLIGHT. This commit fixes the issue and introduces a NEW_OVERLAY mode and enum value. - change gimp:overlay-mode to be a real (svg-ish) overlay mode - when compositing, map OVERLAY to gimp:softlight-mode - when compisiting, map NEW_OVERLAY to gimp:overlay-mode - bump the XCF version when NEW_OVERLAY is used - map OVERLAY to SOFTLIGHT when loading and saving XCF - map OVERLAY to softlight in all PDB setters - map OVERLAY to softlight when deserializing a GimpContext - change all paint mode menus to show an entry for NEW_OVERLAY instead of OVERLAY - change PSP, PSD and OpenRaster to use NEW_OVERLAY These changes should (redundantly) make sure that no OVERLAY enum value is used in the core any longer because it gets mapped to SOFTLIGHT at all entry points, with the downside of introducing a setter/getter asymmetry when OVERLAY was set in a PDB api.
170 lines
5.9 KiB
C
170 lines
5.9 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpoperationsoftlightmode.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
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gegl-plugin.h>
|
|
|
|
#include "operations-types.h"
|
|
|
|
#include "gimpoperationsoftlightmode.h"
|
|
|
|
|
|
static gboolean gimp_operation_softlight_mode_process (GeglOperation *operation,
|
|
void *in_buf,
|
|
void *aux_buf,
|
|
void *aux2_buf,
|
|
void *out_buf,
|
|
glong samples,
|
|
const GeglRectangle *roi,
|
|
gint level);
|
|
|
|
|
|
G_DEFINE_TYPE (GimpOperationSoftlightMode, gimp_operation_softlight_mode,
|
|
GIMP_TYPE_OPERATION_POINT_LAYER_MODE)
|
|
|
|
static const gchar* reference_xml = "<?xml version='1.0' encoding='UTF-8'?>"
|
|
"<gegl>"
|
|
"<node operation='gimp:softlight-mode'>"
|
|
" <node operation='gegl:load'>"
|
|
" <params>"
|
|
" <param name='path'>B.png</param>"
|
|
" </params>"
|
|
" </node>"
|
|
"</node>"
|
|
"<node operation='gegl:load'>"
|
|
" <params>"
|
|
" <param name='path'>A.png</param>"
|
|
" </params>"
|
|
"</node>"
|
|
"</gegl>";
|
|
|
|
|
|
static void
|
|
gimp_operation_softlight_mode_class_init (GimpOperationSoftlightModeClass *klass)
|
|
{
|
|
GeglOperationClass *operation_class;
|
|
GeglOperationPointComposer3Class *point_class;
|
|
|
|
operation_class = GEGL_OPERATION_CLASS (klass);
|
|
point_class = GEGL_OPERATION_POINT_COMPOSER3_CLASS (klass);
|
|
|
|
gegl_operation_class_set_keys (operation_class,
|
|
"name", "gimp:softlight-mode",
|
|
"description", "GIMP softlight mode operation",
|
|
"reference-image", "soft-light-mode.png",
|
|
"reference-composition", reference_xml,
|
|
NULL);
|
|
|
|
point_class->process = gimp_operation_softlight_mode_process;
|
|
}
|
|
|
|
static void
|
|
gimp_operation_softlight_mode_init (GimpOperationSoftlightMode *self)
|
|
{
|
|
}
|
|
|
|
static gboolean
|
|
gimp_operation_softlight_mode_process (GeglOperation *operation,
|
|
void *in_buf,
|
|
void *aux_buf,
|
|
void *aux2_buf,
|
|
void *out_buf,
|
|
glong samples,
|
|
const GeglRectangle *roi,
|
|
gint level)
|
|
{
|
|
gfloat opacity = GIMP_OPERATION_POINT_LAYER_MODE (operation)->opacity;
|
|
|
|
return gimp_operation_softlight_mode_process_pixels (in_buf, aux_buf, aux2_buf, out_buf, opacity, samples, roi, level);
|
|
}
|
|
|
|
gboolean
|
|
gimp_operation_softlight_mode_process_pixels (gfloat *in,
|
|
gfloat *layer,
|
|
gfloat *mask,
|
|
gfloat *out,
|
|
gfloat opacity,
|
|
glong samples,
|
|
const GeglRectangle *roi,
|
|
gint level)
|
|
{
|
|
const gboolean has_mask = mask != NULL;
|
|
|
|
while (samples--)
|
|
{
|
|
gfloat comp_alpha, new_alpha;
|
|
|
|
comp_alpha = MIN (in[ALPHA], layer[ALPHA]) * opacity;
|
|
if (has_mask)
|
|
comp_alpha *= *mask;
|
|
|
|
new_alpha = in[ALPHA] + (1.0 - in[ALPHA]) * comp_alpha;
|
|
|
|
if (comp_alpha && new_alpha)
|
|
{
|
|
gfloat ratio = comp_alpha / new_alpha;
|
|
gint b;
|
|
|
|
for (b = RED; b < ALPHA; b++)
|
|
{
|
|
#if 0
|
|
/* softlight is now used for what GIMP formerly called
|
|
* OVERLAY. We fixed OVERLAY to use the right math
|
|
* (under the name NEW_OVERLAY), and redirect uses of
|
|
* the old OVERLAY blend mode here. This math was
|
|
* formerly used for OVERLAY and is exactly the same as
|
|
* the multiply, screen, comp math used below.
|
|
* See bug #673501.
|
|
*/
|
|
gfloat comp = in[b] * (in[b] + (2.0 * layer[b]) * (1.0 - in[b]));
|
|
#endif
|
|
|
|
gfloat multiply = in[b] * layer[b];
|
|
gfloat screen = 1.0 - (1.0 - in[b]) * (1.0 - layer[b]);
|
|
gfloat comp = (1.0 - in[b]) * multiply + in[b] * screen;
|
|
|
|
out[b] = comp * ratio + in[b] * (1.0 - ratio);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
gint b;
|
|
|
|
for (b = RED; b < ALPHA; b++)
|
|
{
|
|
out[b] = in[b];
|
|
}
|
|
}
|
|
|
|
out[ALPHA] = in[ALPHA];
|
|
|
|
in += 4;
|
|
layer += 4;
|
|
out += 4;
|
|
|
|
if (has_mask)
|
|
mask ++;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|