1997-11-25 06:05:25 +08:00
|
|
|
/* The GIMP -- an image manipulation program
|
|
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
|
|
*
|
|
|
|
* 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 2 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, write to the Free Software
|
1998-04-13 13:44:11 +08:00
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
1997-11-25 06:05:25 +08:00
|
|
|
*/
|
2000-12-17 05:37:03 +08:00
|
|
|
|
2000-04-28 01:27:28 +08:00
|
|
|
#include "config.h"
|
1999-10-27 02:27:27 +08:00
|
|
|
|
2000-12-17 05:37:03 +08:00
|
|
|
#include <gtk/gtk.h>
|
|
|
|
|
|
|
|
#include "apptypes.h"
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "appenv.h"
|
1999-10-27 02:27:27 +08:00
|
|
|
#include "airbrush.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "drawable.h"
|
|
|
|
#include "gdisplay.h"
|
1999-10-27 02:27:27 +08:00
|
|
|
#include "gradient.h"
|
2000-12-30 08:16:50 +08:00
|
|
|
#include "gimpimage.h"
|
2000-12-29 23:22:01 +08:00
|
|
|
#include "gimpbrush.h"
|
|
|
|
#include "gimpcontext.h"
|
1999-10-27 02:27:27 +08:00
|
|
|
#include "gimpui.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "paint_funcs.h"
|
|
|
|
#include "paint_core.h"
|
1999-04-22 22:34:00 +08:00
|
|
|
#include "paint_options.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "selection.h"
|
2000-12-29 23:22:01 +08:00
|
|
|
#include "temp_buf.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "tools.h"
|
|
|
|
|
Lots of ii8n stuff here and some additions to the de.po. Applied
Wed Oct 14 17:46:15 EDT 1998 Adrian Likins <adrian@gimp.org>
* app/*, po/de.po, de/POTFILES.in, libgimp/gimpintl.h:
Lots of ii8n stuff here and some additions to the de.po.
Applied gimp-egger-981005-1 ,gimp-egger-981006-1,
gimp-egger-981007-1, gimp-egger-981008-1,
gimp-egger-981009-1.patch, gimp-egger-981010-1.patch
* plug-in/guillotine/guillotine.c: added the coordinates
of the split images from the original image to the title.
ie foo.jpg (0,0) for the image in the topleft.
* plug-in/script-fu/scripts/neon-logo.scm,
perspective-shadow.scm, predator.scm,rendermap.scm,
ripply-anim.scm, select_to_image.scm,swirltile.scm,
xach-effect.scm: updated scripts to use new script-fu stuff
wooo boy! a big un!
in testing this, it looks like some of the po files are busted.
but the code stuff seems okay.
-adrian
1998-10-15 07:23:52 +08:00
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
2000-04-28 01:27:28 +08:00
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
/* The maximum amount of pressure that can be exerted */
|
1999-06-26 19:16:47 +08:00
|
|
|
#define MAX_PRESSURE 0.075
|
1999-04-09 06:25:54 +08:00
|
|
|
|
1999-07-20 06:42:49 +08:00
|
|
|
/* Default pressure setting */
|
1999-08-20 03:53:30 +08:00
|
|
|
#define AIRBRUSH_PRESSURE_DEFAULT 10.0
|
1999-08-14 04:50:30 +08:00
|
|
|
#define AIRBRUSH_INCREMENTAL_DEFAULT FALSE
|
1999-07-20 06:42:49 +08:00
|
|
|
|
1999-06-26 19:16:47 +08:00
|
|
|
#define OFF 0
|
|
|
|
#define ON 1
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
/* the airbrush structures */
|
|
|
|
|
|
|
|
typedef struct _AirbrushTimeout AirbrushTimeout;
|
1999-10-27 02:27:27 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
struct _AirbrushTimeout
|
|
|
|
{
|
1999-08-20 03:53:30 +08:00
|
|
|
PaintCore *paint_core;
|
1998-01-22 15:02:57 +08:00
|
|
|
GimpDrawable *drawable;
|
1997-11-25 06:05:25 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct _AirbrushOptions AirbrushOptions;
|
1999-10-27 02:27:27 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
struct _AirbrushOptions
|
|
|
|
{
|
1999-04-22 22:34:00 +08:00
|
|
|
PaintOptions paint_options;
|
1999-04-09 06:25:54 +08:00
|
|
|
|
1999-10-27 02:27:27 +08:00
|
|
|
gdouble rate;
|
|
|
|
gdouble rate_d;
|
1999-04-13 01:55:06 +08:00
|
|
|
GtkObject *rate_w;
|
|
|
|
|
1999-10-27 02:27:27 +08:00
|
|
|
gdouble pressure;
|
|
|
|
gdouble pressure_d;
|
1999-04-13 01:55:06 +08:00
|
|
|
GtkObject *pressure_w;
|
1997-11-25 06:05:25 +08:00
|
|
|
};
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
|
|
|
|
/* the airbrush tool options */
|
1999-08-14 04:50:30 +08:00
|
|
|
static AirbrushOptions *airbrush_options = NULL;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* local variables */
|
1999-04-09 06:25:54 +08:00
|
|
|
static gint timer; /* timer for successive paint applications */
|
1999-10-27 02:27:27 +08:00
|
|
|
static gint timer_state = OFF; /* state of airbrush tool */
|
1997-11-25 06:05:25 +08:00
|
|
|
static AirbrushTimeout airbrush_timeout;
|
1999-04-09 06:25:54 +08:00
|
|
|
|
1999-10-27 02:27:27 +08:00
|
|
|
static gdouble non_gui_pressure;
|
1999-08-14 04:50:30 +08:00
|
|
|
static gboolean non_gui_incremental;
|
1999-04-09 06:25:54 +08:00
|
|
|
|
|
|
|
/* forward function declarations */
|
1999-10-27 02:27:27 +08:00
|
|
|
static void airbrush_motion (PaintCore *, GimpDrawable *,
|
|
|
|
PaintPressureOptions *,
|
|
|
|
gdouble, PaintApplicationMode);
|
|
|
|
static gint airbrush_time_out (gpointer);
|
1999-04-09 06:25:54 +08:00
|
|
|
|
|
|
|
|
|
|
|
/* functions */
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
static void
|
1999-04-13 01:55:06 +08:00
|
|
|
airbrush_options_reset (void)
|
1999-04-09 06:25:54 +08:00
|
|
|
{
|
|
|
|
AirbrushOptions *options = airbrush_options;
|
|
|
|
|
1999-04-22 22:34:00 +08:00
|
|
|
paint_options_reset ((PaintOptions *) options);
|
|
|
|
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->rate_w),
|
|
|
|
options->rate_d);
|
|
|
|
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->pressure_w),
|
|
|
|
options->pressure_d);
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static AirbrushOptions *
|
1999-04-13 01:55:06 +08:00
|
|
|
airbrush_options_new (void)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
AirbrushOptions *options;
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
GtkWidget *vbox;
|
|
|
|
GtkWidget *table;
|
|
|
|
GtkWidget *scale;
|
|
|
|
|
|
|
|
/* the new airbrush tool options structure */
|
2000-01-14 20:41:00 +08:00
|
|
|
options = g_new (AirbrushOptions, 1);
|
1999-04-22 22:34:00 +08:00
|
|
|
paint_options_init ((PaintOptions *) options,
|
|
|
|
AIRBRUSH,
|
|
|
|
airbrush_options_reset);
|
1999-04-09 06:25:54 +08:00
|
|
|
options->rate = options->rate_d = 80.0;
|
1999-07-20 06:42:49 +08:00
|
|
|
options->pressure = options->pressure_d = AIRBRUSH_PRESSURE_DEFAULT;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* the main vbox */
|
1999-04-22 22:34:00 +08:00
|
|
|
vbox = ((ToolOptions *) options)->main_vbox;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* the rate scale */
|
1999-04-09 06:25:54 +08:00
|
|
|
table = gtk_table_new (2, 2, FALSE);
|
1999-04-22 22:34:00 +08:00
|
|
|
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
|
1999-04-09 06:25:54 +08:00
|
|
|
gtk_table_set_row_spacings (GTK_TABLE (table), 1);
|
|
|
|
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
|
|
|
|
|
|
|
|
options->rate_w =
|
|
|
|
gtk_adjustment_new (options->rate_d, 0.0, 150.0, 1.0, 1.0, 0.0);
|
|
|
|
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->rate_w));
|
|
|
|
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
|
|
|
|
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
|
|
|
|
gtk_signal_connect (GTK_OBJECT (options->rate_w), "value_changed",
|
2000-01-14 20:41:00 +08:00
|
|
|
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
|
1999-04-13 01:55:06 +08:00
|
|
|
&options->rate);
|
2000-01-31 11:13:02 +08:00
|
|
|
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
|
1999-10-27 02:27:27 +08:00
|
|
|
_("Rate:"), 1.0, 1.0,
|
2000-01-31 11:13:02 +08:00
|
|
|
scale, 1, FALSE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* the pressure scale */
|
1999-04-09 06:25:54 +08:00
|
|
|
options->pressure_w =
|
|
|
|
gtk_adjustment_new (options->pressure_d, 0.0, 100.0, 1.0, 1.0, 0.0);
|
|
|
|
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->pressure_w));
|
|
|
|
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
|
|
|
|
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
|
|
|
|
gtk_signal_connect (GTK_OBJECT (options->pressure_w), "value_changed",
|
2000-01-14 20:41:00 +08:00
|
|
|
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
|
1999-04-13 01:55:06 +08:00
|
|
|
&options->pressure);
|
2000-01-31 11:13:02 +08:00
|
|
|
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
|
1999-10-27 02:27:27 +08:00
|
|
|
_("Pressure:"), 1.0, 1.0,
|
2000-01-31 11:13:02 +08:00
|
|
|
scale, 1, FALSE);
|
1999-04-09 06:25:54 +08:00
|
|
|
|
|
|
|
gtk_widget_show (table);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
return options;
|
|
|
|
}
|
|
|
|
|
1999-04-13 01:55:06 +08:00
|
|
|
Tool *
|
1999-09-02 09:41:18 +08:00
|
|
|
tools_new_airbrush (void)
|
1999-04-13 01:55:06 +08:00
|
|
|
{
|
|
|
|
Tool * tool;
|
|
|
|
PaintCore * private;
|
|
|
|
|
|
|
|
/* The tool options */
|
|
|
|
if (! airbrush_options)
|
|
|
|
{
|
|
|
|
airbrush_options = airbrush_options_new ();
|
|
|
|
tools_register (AIRBRUSH, (ToolOptions *) airbrush_options);
|
|
|
|
}
|
|
|
|
|
|
|
|
tool = paint_core_new (AIRBRUSH);
|
|
|
|
|
|
|
|
private = (PaintCore *) tool->private;
|
|
|
|
private->paint_func = airbrush_paint_func;
|
1999-05-13 19:12:32 +08:00
|
|
|
private->pick_colors = TRUE;
|
1999-08-27 05:33:58 +08:00
|
|
|
private->flags |= TOOL_CAN_HANDLE_CHANGING_BRUSH;
|
1999-04-13 01:55:06 +08:00
|
|
|
|
|
|
|
return tool;
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
void *
|
1999-08-20 03:53:30 +08:00
|
|
|
airbrush_paint_func (PaintCore *paint_core,
|
1998-01-22 15:02:57 +08:00
|
|
|
GimpDrawable *drawable,
|
1999-08-20 03:53:30 +08:00
|
|
|
int state)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-11-14 18:50:19 +08:00
|
|
|
GimpBrush *brush;
|
1999-11-13 09:02:27 +08:00
|
|
|
gdouble rate;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1998-01-22 15:02:57 +08:00
|
|
|
if (!drawable)
|
|
|
|
return NULL;
|
|
|
|
|
1999-10-27 02:27:27 +08:00
|
|
|
brush = gimp_context_get_brush (NULL);
|
1997-11-25 06:05:25 +08:00
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case INIT_PAINT :
|
1998-08-20 08:35:40 +08:00
|
|
|
/* timer_state = OFF; */
|
1998-08-16 06:03:32 +08:00
|
|
|
if (timer_state == ON)
|
2000-01-14 20:41:00 +08:00
|
|
|
{
|
|
|
|
g_warning ("killing stray timer, please report to lewing@gimp.org");
|
|
|
|
gtk_timeout_remove (timer);
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
timer_state = OFF;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MOTION_PAINT :
|
|
|
|
if (timer_state == ON)
|
|
|
|
gtk_timeout_remove (timer);
|
|
|
|
timer_state = OFF;
|
|
|
|
|
1999-09-09 09:47:54 +08:00
|
|
|
airbrush_motion (paint_core, drawable,
|
|
|
|
airbrush_options->paint_options.pressure_options,
|
|
|
|
airbrush_options->pressure,
|
1999-08-20 03:53:30 +08:00
|
|
|
airbrush_options->paint_options.incremental ?
|
|
|
|
INCREMENTAL : CONSTANT);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
if (airbrush_options->rate != 0.0)
|
1999-08-20 03:53:30 +08:00
|
|
|
{
|
|
|
|
airbrush_timeout.paint_core = paint_core;
|
|
|
|
airbrush_timeout.drawable = drawable;
|
1999-11-13 09:02:27 +08:00
|
|
|
rate = airbrush_options->paint_options.pressure_options->rate ?
|
|
|
|
(10000 / (airbrush_options->rate * 2.0 * paint_core->curpressure)) :
|
|
|
|
(10000 / airbrush_options->rate);
|
|
|
|
timer = gtk_timeout_add (rate, airbrush_time_out, NULL);
|
1999-08-20 03:53:30 +08:00
|
|
|
timer_state = ON;
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case FINISH_PAINT :
|
|
|
|
if (timer_state == ON)
|
|
|
|
gtk_timeout_remove (timer);
|
|
|
|
timer_state = OFF;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default :
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
tools_free_airbrush (Tool *tool)
|
|
|
|
{
|
|
|
|
if (timer_state == ON)
|
|
|
|
gtk_timeout_remove (timer);
|
|
|
|
timer_state = OFF;
|
1998-08-16 06:03:32 +08:00
|
|
|
|
|
|
|
paint_core_free (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static gint
|
|
|
|
airbrush_time_out (gpointer client_data)
|
|
|
|
{
|
|
|
|
/* service the timer */
|
|
|
|
airbrush_motion (airbrush_timeout.paint_core,
|
1998-01-22 15:02:57 +08:00
|
|
|
airbrush_timeout.drawable,
|
1999-09-09 09:47:54 +08:00
|
|
|
airbrush_options->paint_options.pressure_options,
|
1999-08-14 04:50:30 +08:00
|
|
|
airbrush_options->pressure,
|
1999-08-20 03:53:30 +08:00
|
|
|
airbrush_options->paint_options.incremental ?
|
|
|
|
INCREMENTAL : CONSTANT);
|
1997-11-25 06:05:25 +08:00
|
|
|
gdisplays_flush ();
|
|
|
|
|
|
|
|
/* restart the timer */
|
|
|
|
if (airbrush_options->rate != 0.0)
|
1999-11-13 09:02:27 +08:00
|
|
|
{
|
|
|
|
if (airbrush_options->paint_options.pressure_options->rate)
|
|
|
|
{
|
|
|
|
/* set a new timer */
|
|
|
|
timer = gtk_timeout_add ((10000 / (airbrush_options->rate * 2.0 * airbrush_timeout.paint_core->curpressure)),
|
|
|
|
airbrush_time_out, NULL);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return TRUE;
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
1999-09-09 09:47:54 +08:00
|
|
|
airbrush_motion (PaintCore *paint_core,
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
PaintPressureOptions *pressure_options,
|
|
|
|
double pressure,
|
|
|
|
PaintApplicationMode mode)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-12-29 23:22:01 +08:00
|
|
|
GImage *gimage;
|
|
|
|
TempBuf *area;
|
|
|
|
guchar col[MAX_CHANNELS];
|
|
|
|
gdouble scale;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1998-01-22 15:02:57 +08:00
|
|
|
if (!drawable)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (! (gimage = drawable_gimage (drawable)))
|
1997-11-25 06:05:25 +08:00
|
|
|
return;
|
|
|
|
|
1999-09-09 09:47:54 +08:00
|
|
|
if (pressure_options->size)
|
|
|
|
scale = paint_core->curpressure;
|
|
|
|
else
|
|
|
|
scale = 1.0;
|
|
|
|
|
|
|
|
if (! (area = paint_core_get_paint_area (paint_core, drawable, scale)))
|
1997-11-25 06:05:25 +08:00
|
|
|
return;
|
|
|
|
|
1999-11-13 09:02:27 +08:00
|
|
|
/* color the pixels */
|
|
|
|
if (pressure_options->color)
|
|
|
|
{
|
|
|
|
gdouble r, g, b, a;
|
|
|
|
|
|
|
|
gradient_get_color_at (gimp_context_get_gradient (NULL),
|
|
|
|
paint_core->curpressure, &r, &g, &b, &a);
|
|
|
|
col[0] = r * 255.0;
|
|
|
|
col[1] = g * 255.0;
|
|
|
|
col[2] = b * 255.0;
|
|
|
|
col[3] = a * 255.0;
|
|
|
|
mode = INCREMENTAL;
|
|
|
|
color_pixels (temp_buf_data (area), col,
|
|
|
|
area->width * area->height, area->bytes);
|
|
|
|
}
|
Jens Lautenbacher <jtl@gimp.org>
2000-12-18 Sven Neumann <sven@gimp.org>
Jens Lautenbacher <jtl@gimp.org>
* app/Makefile.am
* app/gimpbrushlistP.h
* app/gimpbrushpipeP.h
* app/gimpobjectP.h: removed these three files
* app/parasitelistP.h
* app/channels_dialog.c
* app/docindex.c
* app/gimpdrawable.c
* app/gimpdrawableP.h
* app/gimpimage.c
* app/gimpimageP.h
* app/gimplist.[ch]
* app/gimpobject.c
* app/gimpobject.h
* app/gimpsetP.h: changed according to header removal
* app/airbrush.c
* app/brush_select.[ch]
* app/brushes_cmds.c
* app/gimpbrush.[ch]
* app/gimpbrushgenerated.[ch]
* app/gimpbrushlist.[ch]
* app/gimpbrushpipe.[ch]
* app/gimpcontextpreview.c
* app/paint_core.c
* app/paintbrush.c
* app/pencil.c
* tools/pdbgen/pdb/brushes.pdb: Big Brushes Cleanup.
The GimpBrush* object hierarchy and the file formats were broken by
"design". This made it overly difficult to read and write pixmap
brushes and brush pipes, leading to the situation that The GIMP was
not able to read it's very own file formats. Since the GimpBrush
format did support arbitrary color depths, the introduction of a
file format for pixmap brushes was unnecessary.
The GimpBrushPixmap object is dead. GimpBrush has an additional
pixmap temp_buf and handles pixmap brushes transparently. The file
format of pixmap brushes is not any longer a grayscale brush plus
a pattern, but a simple brush with RGBA data. The old brushes can
still be loaded, but the .gpb format is deprecated.
GimpBrushPipe derives from GimpBrush. The fileformat is still a text
header, followed by a number of brushes, but those brushes are stored
in the new GimpBrush format (no pattern anymore). The pipe does not
care about the depth of the contained GimpBrushes, so we get
grayscale BrushPipes for free. Since the brush loader still loads the
old format, old .gih files can also still be loaded.
Since the brushes in the GimpBrushPipe do not any longer contain a
pointer to the pipe object, we do only temporarily switch brushes
in the paint_core routines. This is not very elegant, but the best
we can do without a major redesign.
* app/patterns.[ch]: changed the loader to work with a filedescriptor
instead of a filehandle to make it work with the new brush loading
code.
* plug-ins/common/.cvsignore
* plug-ins/common/Makefile.am
* plug-ins/common/plugin-defs.pl
* plug-ins/common/gih.c: new plug-in that saves GIH files in the
new format (loader will follow soon)
* plug-ins/common/gpb.c: removed since Pixmap Brushes are no longer
supported as a special file format.
* plug-ins/common/gbr.c: load and save brushes in the new brush format
which allows RGBA brushes too.
* plug-ins/common/pat.c: load and save grayscale patterns too
2000-12-18 23:14:08 +08:00
|
|
|
else if (paint_core->brush && paint_core->brush->pixmap)
|
1999-08-14 04:50:30 +08:00
|
|
|
{
|
|
|
|
mode = INCREMENTAL;
|
1999-09-10 03:11:38 +08:00
|
|
|
paint_core_color_area_with_pixmap (paint_core, gimage, drawable, area,
|
|
|
|
scale, SOFT);
|
1999-08-14 04:50:30 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2000-12-30 08:16:50 +08:00
|
|
|
gimp_image_get_foreground (gimage, drawable, col);
|
1999-11-13 09:02:27 +08:00
|
|
|
col[area->bytes - 1] = OPAQUE_OPACITY;
|
1999-08-14 04:50:30 +08:00
|
|
|
color_pixels (temp_buf_data (area), col,
|
|
|
|
area->width * area->height, area->bytes);
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-09-09 09:47:54 +08:00
|
|
|
if (pressure_options->pressure)
|
|
|
|
pressure = pressure * 2.0 * paint_core->curpressure;
|
1998-06-09 10:06:33 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
/* paste the newly painted area to the image */
|
1998-01-22 15:02:57 +08:00
|
|
|
paint_core_paste_canvas (paint_core, drawable,
|
1999-09-09 09:47:54 +08:00
|
|
|
MIN (pressure, 255),
|
1999-07-06 23:18:25 +08:00
|
|
|
(gint) (gimp_context_get_opacity (NULL) * 255),
|
|
|
|
gimp_context_get_paint_mode (NULL),
|
1999-09-09 09:47:54 +08:00
|
|
|
SOFT, scale, mode);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void *
|
1999-07-06 23:18:25 +08:00
|
|
|
airbrush_non_gui_paint_func (PaintCore *paint_core,
|
1998-01-22 15:02:57 +08:00
|
|
|
GimpDrawable *drawable,
|
1999-07-06 23:18:25 +08:00
|
|
|
int state)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-09-09 09:47:54 +08:00
|
|
|
airbrush_motion (paint_core, drawable, &non_gui_pressure_options,
|
|
|
|
non_gui_pressure, non_gui_incremental);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1999-07-20 06:42:49 +08:00
|
|
|
gboolean
|
|
|
|
airbrush_non_gui_default (GimpDrawable *drawable,
|
|
|
|
int num_strokes,
|
|
|
|
double *stroke_array)
|
|
|
|
{
|
|
|
|
AirbrushOptions *options = airbrush_options;
|
|
|
|
gdouble pressure = AIRBRUSH_PRESSURE_DEFAULT;
|
|
|
|
|
|
|
|
if(options)
|
|
|
|
pressure = options->pressure;
|
|
|
|
|
1999-09-09 09:47:54 +08:00
|
|
|
return airbrush_non_gui (drawable, pressure, num_strokes, stroke_array);
|
1999-07-20 06:42:49 +08:00
|
|
|
}
|
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
gboolean
|
|
|
|
airbrush_non_gui (GimpDrawable *drawable,
|
|
|
|
double pressure,
|
|
|
|
int num_strokes,
|
|
|
|
double *stroke_array)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
if (paint_core_init (&non_gui_paint_core, drawable,
|
|
|
|
stroke_array[0], stroke_array[1]))
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-04-19 05:22:41 +08:00
|
|
|
/* Set the paint core's paint func */
|
1997-11-25 06:05:25 +08:00
|
|
|
non_gui_paint_core.paint_func = airbrush_non_gui_paint_func;
|
|
|
|
|
1999-07-20 06:42:49 +08:00
|
|
|
non_gui_pressure = pressure;
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
non_gui_paint_core.startx = non_gui_paint_core.lastx = stroke_array[0];
|
|
|
|
non_gui_paint_core.starty = non_gui_paint_core.lasty = stroke_array[1];
|
|
|
|
|
1999-07-23 07:11:46 +08:00
|
|
|
airbrush_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
for (i = 1; i < num_strokes; i++)
|
|
|
|
{
|
|
|
|
non_gui_paint_core.curx = stroke_array[i * 2 + 0];
|
|
|
|
non_gui_paint_core.cury = stroke_array[i * 2 + 1];
|
|
|
|
|
1998-01-22 15:02:57 +08:00
|
|
|
paint_core_interpolate (&non_gui_paint_core, drawable);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
non_gui_paint_core.lastx = non_gui_paint_core.curx;
|
|
|
|
non_gui_paint_core.lasty = non_gui_paint_core.cury;
|
|
|
|
}
|
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
/* Finish the painting */
|
1998-01-22 15:02:57 +08:00
|
|
|
paint_core_finish (&non_gui_paint_core, drawable, -1);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
/* Cleanup */
|
1997-11-25 06:05:25 +08:00
|
|
|
paint_core_cleanup ();
|
1999-04-19 05:22:41 +08:00
|
|
|
return TRUE;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
1999-04-19 05:22:41 +08:00
|
|
|
else
|
|
|
|
return FALSE;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|