dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use GimpCoords structs for cur_coords, last_coords and start_coords and 

2001-11-13  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimppainttool.[ch]: use GimpCoords structs for
	cur_coords, last_coords and start_coords and the undo struct
	instead of storing separate gdouble values.

	* app/undo.c
	* app/tools/gimpairbrushtool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpconvolvetool.c
	* app/tools/gimpdodgeburntool.c
	* app/tools/gimperasertool.c
	* app/tools/gimppaintbrushtool.c
	* app/tools/gimppenciltool.c
	* app/tools/gimpsmudgetool.c: changed accordingly.
This commit is contained in:
Michael Natterer 2001-11-13 16:21:34 +00:00 committed by Michael Natterer
parent 95bc70d933
commit 6ed7523052
27 changed files with 672 additions and 665 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2001-11-13 Michael Natterer <mitch@gimp.org>
* app/tools/gimppainttool.[ch]: use GimpCoords structs for
cur_coords, last_coords and start_coords and the undo struct
instead of storing separate gdouble values.
* app/undo.c
* app/tools/gimpairbrushtool.c
* app/tools/gimpclonetool.c
* app/tools/gimpconvolvetool.c
* app/tools/gimpdodgeburntool.c
* app/tools/gimperasertool.c
* app/tools/gimppaintbrushtool.c
* app/tools/gimppenciltool.c
* app/tools/gimpsmudgetool.c: changed accordingly.
2001-11-13 Michael Natterer <mitch@gimp.org>
* app/base/temp-buf.c: allow passing NULL to temp_buf_resize() again.

24
app/core/gimpimage-undo-push.c
View File

@ -1411,7 +1411,7 @@ undo_pop_paint (GimpImage *gimage,
GimpTool *active_tool;
GimpPaintTool *pt;
PaintUndo *pu;
gdouble tmp;
GimpCoords tmp_coords;
active_tool = tool_manager_get_active (gimage->gimp);
@ -1427,25 +1427,9 @@ undo_pop_paint (GimpImage *gimage,
return TRUE;
/* swap the paint core information */
tmp = pt->lastx;
pt->lastx = pu->lastx;
pu->lastx = tmp;
tmp = pt->lasty;
pt->lasty = pu->lasty;
pu->lasty = tmp;
tmp = pt->lastpressure;
pt->lastpressure = pu->lastpressure;
pu->lastpressure = tmp;
tmp = pt->lastxtilt;
pt->lastxtilt = pu->lastxtilt;
pu->lastxtilt = tmp;
tmp = pt->lastytilt;
pt->lastytilt = pu->lastytilt;
pu->lastytilt = tmp;
tmp_coords = pt->last_coords;
pt->last_coords = pu->last_coords;
pu->last_coords = tmp_coords;
return TRUE;
}

22
app/paint/gimpairbrush.c
View File

@ -278,7 +278,7 @@ gimp_airbrush_tool_paint (GimpPaintTool *paint_tool,
airbrush_timeout.drawable = drawable;
timeout = (pressure_options->rate ?
(10000 / (rate * 2.0 * paint_tool->curpressure)) :
(10000 / (rate * 2.0 * paint_tool->cur_coords.pressure)) :
(10000 / rate));
timer = gtk_timeout_add (timeout, airbrush_time_out, NULL);
@ -335,7 +335,7 @@ airbrush_time_out (gpointer client_data)
if (pressure_options->rate)
{
/* set a new timer */
timer = gtk_timeout_add ((10000 / (rate * 2.0 * airbrush_timeout.paint_tool->curpressure)),
timer = gtk_timeout_add ((10000 / (rate * 2.0 * airbrush_timeout.paint_tool->cur_coords.pressure)),
airbrush_time_out, NULL);
return FALSE;
}
@ -369,7 +369,7 @@ gimp_airbrush_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -382,7 +382,7 @@ gimp_airbrush_tool_motion (GimpPaintTool *paint_tool,
GimpRGB color;
gimp_gradient_get_color_at (gimp_context_get_gradient (context),
paint_tool->curpressure, &color);
paint_tool->cur_coords.pressure, &color);
gimp_rgba_get_uchar (&color,
&col[RED_PIX],
@ -412,7 +412,7 @@ gimp_airbrush_tool_motion (GimpPaintTool *paint_tool,
}
if (pressure_options->pressure)
pressure = pressure * 2.0 * paint_tool->curpressure;
pressure = pressure * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted area to the image */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -463,20 +463,20 @@ airbrush_non_gui (GimpDrawable *drawable,
non_gui_pressure = pressure;
non_gui_incremental = AIRBRUSH_DEFAULT_INCREMENTAL;
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_airbrush_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

28
app/paint/gimpclone.c
View File

@ -299,10 +299,10 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
break;
case MOTION_PAINT:
x1 = paint_tool->curx;
y1 = paint_tool->cury;
x2 = paint_tool->lastx;
y2 = paint_tool->lasty;
x1 = paint_tool->cur_coords.x;
y1 = paint_tool->cur_coords.y;
x2 = paint_tool->last_coords.x;
y2 = paint_tool->last_coords.y;
/* If the control key is down, move the src target and return */
if (paint_tool->state & GDK_CONTROL_MASK)
@ -344,8 +344,8 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
{
the_src_gdisp = gdisp;
clone_set_src_drawable(drawable);
src_x = paint_tool->curx;
src_y = paint_tool->cury;
src_x = paint_tool->cur_coords.x;
src_y = paint_tool->cur_coords.y;
first = TRUE;
}
else if (clone_options->aligned == ALIGN_NO)
@ -508,7 +508,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -626,7 +626,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
opacity = 255.0 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being worked on */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -774,20 +774,20 @@ gimp_clone_tool_non_gui (GimpDrawable *drawable,
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];
non_gui_offset_x = (int) (src_x - non_gui_paint_core.startx);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.starty);
non_gui_offset_x = (int) (src_x - non_gui_paint_core.start_coords.x);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.start_coords.y);
clone_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
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];
non_gui_paint_core.cur_coords.x = stroke_array[i * 2 + 0];
non_gui_paint_core.cur_coords.y = stroke_array[i * 2 + 1];
paint_core_interpolate (&non_gui_paint_core, drawable);
non_gui_paint_core.lastx = non_gui_paint_core.curx;
non_gui_paint_core.lasty = non_gui_paint_core.cury;
non_gui_paint_core.last_coords.x = non_gui_paint_core.cur_coords.x;
non_gui_paint_core.last_coords.y = non_gui_paint_core.cur_coords.y;
}
/* Finish the painting */

22
app/paint/gimpconvolve.c
View File

@ -342,7 +342,7 @@ gimp_convolve_tool_motion (GimpPaintTool *paint_tool,
return;
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -366,19 +366,19 @@ gimp_convolve_tool_motion (GimpPaintTool *paint_tool,
destPR.data = temp_buf_data (area);
if (pressure_options->rate)
rate = rate * 2.0 * paint_tool->curpressure;
rate = rate * 2.0 * paint_tool->cur_coords.pressure;
calculate_matrix (type, rate);
/* Image region near edges? If so, paint area will be clipped */
/* with respect to brush mask + 1 pixel border (# 19285) */
if ((marginx = (gint) paint_tool->curx - paint_tool->brush->mask->width / 2 - 1) != area->x)
if ((marginx = (gint) paint_tool->cur_coords.x - paint_tool->brush->mask->width / 2 - 1) != area->x)
area_hclip = CONVOLVE_NCLIP;
else if ((marginx = area->width - paint_tool->brush->mask->width - 2) != 0)
area_hclip = CONVOLVE_PCLIP;
if ((marginy = (gint) paint_tool->cury - paint_tool->brush->mask->height / 2 - 1) != area->y)
if ((marginy = (gint) paint_tool->cur_coords.y - paint_tool->brush->mask->height / 2 - 1) != area->y)
area_vclip = CONVOLVE_NCLIP;
else if ((marginy = area->height - paint_tool->brush->mask->height - 2) != 0)
area_vclip = CONVOLVE_PCLIP;
@ -453,8 +453,10 @@ gimp_convolve_tool_motion (GimpPaintTool *paint_tool,
fillcolor = gimp_drawable_get_color_at
(drawable,
CLAMP ((gint) paint_tool->curx, 0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cury, 0, gimp_drawable_height (drawable) - 1));
CLAMP ((gint) paint_tool->cur_coords.x,
0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cur_coords.y,
0, gimp_drawable_height (drawable) - 1));
marginx *= (marginx < 0) ? -1 : 0;
marginy *= (marginy < 0) ? -1 : 0;
@ -657,13 +659,13 @@ convolve_non_gui (GimpDrawable *drawable,
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];
non_gui_paint_core.cur_coords.x = stroke_array[i * 2 + 0];
non_gui_paint_core.cur_coords.y = stroke_array[i * 2 + 1];
paint_core_interpolate (&non_gui_paint_core, drawable);
non_gui_paint_core.lastx = non_gui_paint_core.curx;
non_gui_paint_core.lasty = non_gui_paint_core.cury;
non_gui_paint_core.last_coords.x = non_gui_paint_core.cur_coords.x;
non_gui_paint_core.last_coords.y = non_gui_paint_core.cur_coords.y;
}
paint_core_finish (&non_gui_paint_core, drawable, -1);

16
app/paint/gimpdodgeburn.c
View File

@ -377,7 +377,7 @@ gimp_dodgeburn_tool_motion (GimpPaintTool *paint_tool,
return;
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -442,7 +442,7 @@ gimp_dodgeburn_tool_motion (GimpPaintTool *paint_tool,
255 * gimp_context_get_opacity (gimp_get_current_context (gimage->gimp));
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* Replace the newly dodgedburned area (canvas_buf) to the gimage*/
gimp_paint_tool_replace_canvas (paint_tool, drawable,
@ -582,20 +582,20 @@ gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
non_gui_lut,
drawable);
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_dodgeburn_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

18
app/paint/gimperaser.c
View File

@ -291,7 +291,7 @@ gimp_eraser_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -311,7 +311,7 @@ gimp_eraser_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being
* worked on */
@ -400,7 +400,7 @@ gimp_eraser_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is
* being worked on */
@ -470,20 +470,20 @@ eraser_non_gui (GimpDrawable *drawable,
non_gui_anti_erase = anti_erase;
non_gui_color_erase = color_erase;
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_paint_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

30
app/paint/gimppaintbrush.c
View File

@ -273,7 +273,7 @@ gimp_paintbrush_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -307,7 +307,7 @@ gimp_paintbrush_tool_motion (GimpPaintTool *paint_tool,
if (pressure_options->color)
gimp_gradient_get_color_at (gradient,
paint_tool->curpressure,
paint_tool->cur_coords.pressure,
&color);
else
gimp_paint_tool_get_color_from_gradient (paint_tool,
@ -351,7 +351,7 @@ gimp_paintbrush_tool_motion (GimpPaintTool *paint_tool,
opacity = (gdouble) temp_blend;
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
gimp_paint_tool_paste_canvas (paint_tool, drawable,
MIN (opacity, 255),
@ -389,20 +389,20 @@ gimp_paintbrush_tool_non_gui_default (GimpDrawable *drawable,
stroke_array[0],
stroke_array[1]))
{
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_paint_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);
@ -441,20 +441,20 @@ gimp_paintbrush_tool_non_gui (GimpDrawable *drawable,
non_gui_gradient_options.gradient_type = LOOP_TRIANGLE;
non_gui_incremental = method;
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_paint_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

253
app/paint/gimppaintcore.c
View File

@ -347,10 +347,18 @@ gimp_paint_tool_button_press (GimpTool *tool,
draw_line = FALSE;
paint_tool->curpressure = coords->pressure;
paint_tool->curxtilt = coords->xtilt;
paint_tool->curytilt = coords->ytilt;
paint_tool->state = state;
{
gdouble save_x, save_y;
save_x = paint_tool->cur_coords.x;
save_y = paint_tool->cur_coords.y;
paint_tool->cur_coords = *coords;
paint_tool->state = state;
paint_tool->cur_coords.x = save_x;
paint_tool->cur_coords.y = save_y;
}
if (gdisp != tool->gdisp || paint_tool->context_id < 1)
{
@ -363,11 +371,11 @@ gimp_paint_tool_button_press (GimpTool *tool,
if ((gdisp != tool->gdisp) || ! (state & GDK_SHIFT_MASK))
{
/* initialize some values */
paint_tool->startx = paint_tool->lastx = paint_tool->curx = x;
paint_tool->starty = paint_tool->lasty = paint_tool->cury = y;
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->cur_coords.x = x;
paint_tool->cur_coords.y = y;
paint_tool->start_coords = paint_tool->cur_coords;
paint_tool->last_coords = paint_tool->cur_coords;
}
/* If shift is down and this is not the first paint
@ -376,11 +384,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
else if (state & GDK_SHIFT_MASK)
{
draw_line = TRUE;
paint_tool->startx = paint_tool->lastx;
paint_tool->starty = paint_tool->lasty;
paint_tool->startpressure = paint_tool->lastpressure;
paint_tool->startxtilt = paint_tool->lastxtilt;
paint_tool->startytilt = paint_tool->lastytilt;
paint_tool->start_coords =paint_tool->last_coords;
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (state & GDK_CONTROL_MASK)
@ -389,8 +394,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
gint cosinus[7] = { 256, 247, 222, 181, 128, 66, 0 };
gint dx, dy, i, radius, frac;
dx = paint_tool->curx - paint_tool->lastx;
dy = paint_tool->cury - paint_tool->lasty;
dx = paint_tool->cur_coords.x - paint_tool->last_coords.x;
dy = paint_tool->cur_coords.y - paint_tool->last_coords.y;
if (dy)
{
@ -404,8 +409,9 @@ gimp_paint_tool_button_press (GimpTool *tool,
dx = dx > 0 ? (cosinus[6-i] * radius) >> 8 : - ((cosinus[6-i] * radius) >> 8);
dy = dy > 0 ? (cosinus[i] * radius) >> 8 : - ((cosinus[i] * radius) >> 8);
}
paint_tool->curx = paint_tool->lastx + dx;
paint_tool->cury = paint_tool->lasty + dy;
paint_tool->cur_coords.x = paint_tool->last_coords.x + dx;
paint_tool->cur_coords.y = paint_tool->last_coords.y + dy;
}
}
@ -459,11 +465,7 @@ gimp_paint_tool_button_press (GimpTool *tool,
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->last_coords = paint_tool->cur_coords;
}
else
{
@ -472,8 +474,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
* pixmap brush pipes don't, as they don't know which
* pixmap to select.)
*/
if (paint_tool->lastx != paint_tool->curx
|| paint_tool->lasty != paint_tool->cury
if (paint_tool->last_coords.x != paint_tool->cur_coords.x ||
paint_tool->last_coords.y != paint_tool->cur_coords.y
#ifdef __GNUC__
#warning FIXME: GIMP_BRUSH_GET_CLASS (paint_tool->brush)->want_null_motion
#endif
@ -560,43 +562,41 @@ gimp_paint_tool_motion (GimpTool *tool,
gimp_drawable_offsets (gimp_image_active_drawable (gdisp->gimage),
&off_x, &off_y);
paint_tool->curx = coords->x - off_x;
paint_tool->cury = coords->y - off_y;
paint_tool->cur_coords = *coords;
paint_tool->state = state;
paint_tool->cur_coords.x -= off_x;
paint_tool->cur_coords.y -= off_y;
if (paint_tool->pick_state)
{
gimp_paint_tool_sample_color (gimp_image_active_drawable (gdisp->gimage),
paint_tool->curx,
paint_tool->cury,
paint_tool->cur_coords.x,
paint_tool->cur_coords.y,
state);
return;
}
paint_tool->curpressure = coords->pressure;
paint_tool->curxtilt = coords->xtilt;
paint_tool->curytilt = coords->ytilt;
paint_tool->state = state;
gimp_paint_tool_interpolate (paint_tool,
gimp_image_active_drawable (gdisp->gimage));
if (paint_tool->flags & TOOL_TRACES_ON_WINDOW)
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
PRETRACE_PAINT);
{
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
PRETRACE_PAINT);
}
gimp_display_flush_now (gdisp);
if (paint_tool->flags & TOOL_TRACES_ON_WINDOW)
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
POSTTRACE_PAINT);
{
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
POSTTRACE_PAINT);
}
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->last_coords = paint_tool->cur_coords;
}
@ -661,17 +661,21 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
if ((layer = gimp_image_get_active_layer (gdisp->gimage)))
{
gint off_x, off_y;
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
/* If shift is down and this is not the first paint stroke, draw a line */
if (gdisp == tool->gdisp && (state & GDK_SHIFT_MASK))
{
gdouble dx, dy, d;
/* Get the current coordinates */
paint_tool->curx = coords->x;
paint_tool->cury = coords->y;
paint_tool->cur_coords.x = coords->x - off_x;
paint_tool->cur_coords.y = coords->y - off_y;
dx = paint_tool->curx - paint_tool->lastx;
dy = paint_tool->cury - paint_tool->lasty;
dx = paint_tool->cur_coords.x - paint_tool->last_coords.x;
dy = paint_tool->cur_coords.y - paint_tool->last_coords.y;
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (state & GDK_CONTROL_MASK)
@ -696,8 +700,8 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
dy = idy > 0 ? (cosinus[i] * radius) >> 8 : - ((cosinus[i] * radius) >> 8);
}
paint_tool->curx = paint_tool->lastx + dx;
paint_tool->cury = paint_tool->lasty + dy;
paint_tool->cur_coords.x = paint_tool->last_coords.x + dx;
paint_tool->cur_coords.y = paint_tool->last_coords.y + dy;
}
/* show distance in statusbar */
@ -745,10 +749,6 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
/* Normal operation -- no modifier pressed or first stroke */
else
{
gint off_x, off_y;
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
if (coords->x >= off_x &&
coords->y >= off_y &&
coords->x < (off_x + gimp_drawable_width (GIMP_DRAWABLE (layer))) &&
@ -789,24 +789,24 @@ gimp_paint_tool_draw (GimpDrawTool *draw_tool)
/* Draw start target */
gimp_draw_tool_draw_cross (draw_tool,
floor (paint_tool->lastx) + 0.5,
floor (paint_tool->lasty) + 0.5,
floor (paint_tool->last_coords.x) + 0.5,
floor (paint_tool->last_coords.y) + 0.5,
TARGET_SIZE,
TRUE);
/* Draw end target */
gimp_draw_tool_draw_cross (draw_tool,
floor (paint_tool->curx) + 0.5,
floor (paint_tool->cury) + 0.5,
floor (paint_tool->cur_coords.x) + 0.5,
floor (paint_tool->cur_coords.y) + 0.5,
TARGET_SIZE,
TRUE);
/* Draw the line between the start and end coords */
gimp_draw_tool_draw_line (draw_tool,
floor (paint_tool->lastx) + 0.5,
floor (paint_tool->lasty) + 0.5,
floor (paint_tool->curx) + 0.5,
floor (paint_tool->cury) + 0.5,
floor (paint_tool->last_coords.x) + 0.5,
floor (paint_tool->last_coords.y) + 0.5,
floor (paint_tool->cur_coords.x) + 0.5,
floor (paint_tool->cur_coords.y) + 0.5,
TRUE);
}
@ -867,8 +867,8 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimp_drawable_gimage (drawable)->gimp);
paint_tool->curx = x;
paint_tool->cury = y;
paint_tool->cur_coords.x = x;
paint_tool->cur_coords.y = y;
#ifdef __GNUC__
#warning (FIX non-gui paint tools)
@ -877,9 +877,13 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
/* Set up some defaults for non-gui use */
if (paint_tool == &non_gui_paint_tool)
{
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure = 0.5;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt = 0;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt = 0;
paint_tool->cur_coords.pressure = 1.0;
paint_tool->cur_coords.xtilt = 0.5;
paint_tool->cur_coords.ytilt = 0.5;
paint_tool->cur_coords.wheel = 0.5;
paint_tool->start_coords = paint_tool->cur_coords;
paint_tool->last_coords = paint_tool->cur_coords;
}
#endif
@ -922,8 +926,8 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
gimp_drawable_height (drawable), 1);
/* Get the initial undo extents */
paint_tool->x1 = paint_tool->x2 = paint_tool->curx;
paint_tool->y1 = paint_tool->y2 = paint_tool->cury;
paint_tool->x1 = paint_tool->x2 = paint_tool->cur_coords.x;
paint_tool->y1 = paint_tool->y2 = paint_tool->cur_coords.y;
paint_tool->distance = 0.0;
paint_tool->pixel_dist = 0.0;
@ -935,8 +939,7 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
GimpDrawable *drawable)
{
GimpBrush *current_brush;
GimpVector2 delta;
gdouble dpressure, dxtilt, dytilt;
GimpCoords delta;
/* double spacing; */
/* double lastscale, curscale; */
gdouble n;
@ -950,30 +953,36 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
gdouble xd, yd;
gdouble mag;
delta.x = paint_tool->curx - paint_tool->lastx;
delta.y = paint_tool->cury - paint_tool->lasty;
dpressure = paint_tool->curpressure - paint_tool->lastpressure;
dxtilt = paint_tool->curxtilt - paint_tool->lastxtilt;
dytilt = paint_tool->curytilt - paint_tool->lastytilt;
delta.x = paint_tool->cur_coords.x - paint_tool->last_coords.x;
delta.y = paint_tool->cur_coords.y - paint_tool->last_coords.y;
delta.pressure = paint_tool->cur_coords.pressure - paint_tool->last_coords.pressure;
delta.xtilt = paint_tool->cur_coords.xtilt - paint_tool->last_coords.xtilt;
delta.ytilt = paint_tool->cur_coords.ytilt - paint_tool->last_coords.ytilt;
delta.wheel = paint_tool->cur_coords.wheel - paint_tool->last_coords.wheel;
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
if (! delta.x &&
! delta.y &&
! delta.pressure &&
! delta.xtilt &&
! delta.ytilt &&
! delta.wheel)
return;
/* calculate the distance traveled in the coordinate space of the brush */
mag = gimp_vector2_length (&(paint_tool->brush->x_axis));
xd = gimp_vector2_inner_product (&delta,
xd = gimp_vector2_inner_product ((GimpVector2 *) &delta,
&(paint_tool->brush->x_axis)) / (mag*mag);
mag = gimp_vector2_length (&(paint_tool->brush->y_axis));
yd = gimp_vector2_inner_product (&delta,
yd = gimp_vector2_inner_product ((GimpVector2 *) &delta,
&(paint_tool->brush->y_axis)) / (mag*mag);
dist = 0.5 * sqrt (xd*xd + yd*yd);
total = dist + paint_tool->distance;
initial = paint_tool->distance;
pixel_dist = gimp_vector2_length (&delta);
pixel_dist = gimp_vector2_length ((GimpVector2 *) &delta);
pixel_initial = paint_tool->pixel_dist;
/* FIXME: need to adapt the spacing to the size */
@ -988,16 +997,24 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->distance += left;
if (paint_tool->distance <= (total+EPSILON))
if (paint_tool->distance <= (total + EPSILON))
{
t = (paint_tool->distance - initial) / dist;
paint_tool->curx = paint_tool->lastx + delta.x * t;
paint_tool->cury = paint_tool->lasty + delta.y * t;
paint_tool->pixel_dist = pixel_initial + pixel_dist * t;
paint_tool->curpressure = paint_tool->lastpressure + dpressure * t;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt * t;
paint_tool->curytilt = paint_tool->lastytilt + dytilt * t;
paint_tool->cur_coords.x = (paint_tool->last_coords.x +
delta.x * t);
paint_tool->cur_coords.y = (paint_tool->last_coords.y +
delta.y * t);
paint_tool->cur_coords.pressure = (paint_tool->last_coords.pressure +
delta.pressure * t);
paint_tool->cur_coords.xtilt = (paint_tool->last_coords.xtilt +
delta.xtilt * t);
paint_tool->cur_coords.ytilt = (paint_tool->last_coords.ytilt +
delta.ytilt * t);
paint_tool->cur_coords.wheel = (paint_tool->last_coords.wheel +
delta.ytilt * t);
paint_tool->pixel_dist = pixel_initial + pixel_dist * t;
/* save the current brush */
current_brush = paint_tool->brush;
@ -1019,13 +1036,21 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
}
}
paint_tool->distance = total;
paint_tool->pixel_dist = pixel_initial + pixel_dist;
paint_tool->curx = paint_tool->lastx + delta.x;
paint_tool->cury = paint_tool->lasty + delta.y;
paint_tool->curpressure = paint_tool->lastpressure + dpressure;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt;
paint_tool->curytilt = paint_tool->lastytilt + dytilt;
paint_tool->cur_coords.x = (paint_tool->last_coords.x +
delta.x);
paint_tool->cur_coords.y = (paint_tool->last_coords.y +
delta.y);
paint_tool->cur_coords.pressure = (paint_tool->last_coords.pressure +
delta.pressure);
paint_tool->cur_coords.xtilt = (paint_tool->last_coords.xtilt +
delta.xtilt);
paint_tool->cur_coords.ytilt = (paint_tool->last_coords.ytilt +
delta.ytilt);
paint_tool->cur_coords.wheel = (paint_tool->last_coords.wheel +
delta.wheel);
paint_tool->distance = total;
paint_tool->pixel_dist = pixel_initial + pixel_dist;
}
void
@ -1051,11 +1076,7 @@ gimp_paint_tool_finish (GimpPaintTool *paint_tool,
pu = g_new0 (PaintUndo, 1);
pu->tool_ID = GIMP_TOOL (paint_tool)->ID;
pu->tool_type = G_TYPE_FROM_CLASS (G_OBJECT_GET_CLASS (paint_tool));
pu->lastx = paint_tool->startx;
pu->lasty = paint_tool->starty;
pu->lastpressure = paint_tool->startpressure;
pu->lastxtilt = paint_tool->startxtilt;
pu->lastytilt = paint_tool->startytilt;
pu->last_coords = paint_tool->start_coords;
/* Push a paint undo */
undo_push_paint (gimage, pu);
@ -1144,8 +1165,8 @@ gimp_paint_tool_get_paint_area (GimpPaintTool *paint_tool,
&bwidth, &bheight);
/* adjust the x and y coordinates to the upper left corner of the brush */
x = (gint) floor (paint_tool->curx) - (bwidth >> 1);
y = (gint) floor (paint_tool->cury) - (bheight >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (bwidth >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (bheight >> 1);
dwidth = gimp_drawable_width (drawable);
dheight = gimp_drawable_height (drawable);
@ -1640,15 +1661,17 @@ gimp_paint_tool_get_brush_mask (GimpPaintTool *paint_tool,
{
case SOFT:
mask = gimp_paint_tool_subsample_mask (mask,
paint_tool->curx, paint_tool->cury);
paint_tool->cur_coords.x,
paint_tool->cur_coords.y);
break;
case HARD:
mask = gimp_paint_tool_solidify_mask (mask);
break;
case PRESSURE:
mask = gimp_paint_tool_pressurize_mask (mask,
paint_tool->curx, paint_tool->cury,
paint_tool->curpressure);
paint_tool->cur_coords.x,
paint_tool->cur_coords.y,
paint_tool->cur_coords.pressure);
break;
default:
break;
@ -1874,8 +1897,8 @@ brush_to_canvas_tiles (GimpPaintTool *paint_tool,
canvas_buf->x, canvas_buf->y,
canvas_buf->width, canvas_buf->height, TRUE);
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1903,8 +1926,8 @@ brush_to_canvas_buf (GimpPaintTool *paint_tool,
gint xoff;
gint yoff;
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1947,8 +1970,8 @@ paint_to_canvas_tiles (GimpPaintTool *paint_tool,
canvas_buf->x, canvas_buf->y,
canvas_buf->width, canvas_buf->height, TRUE);
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1992,8 +2015,8 @@ paint_to_canvas_buf (GimpPaintTool *paint_tool,
gint xoff;
gint yoff;
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -2146,8 +2169,8 @@ gimp_paint_tool_color_area_with_pixmap (GimpPaintTool *paint_tool,
* gimp_paint_tool_get_paint_area. Ugly to have to do this here, too.
*/
ulx = (gint) floor (paint_tool->curx) - (pixmap_mask->width >> 1);
uly = (gint) floor (paint_tool->cury) - (pixmap_mask->height >> 1);
ulx = (gint) floor (paint_tool->cur_coords.x) - (pixmap_mask->width >> 1);
uly = (gint) floor (paint_tool->cur_coords.y) - (pixmap_mask->height >> 1);
offsetx = area->x - ulx;
offsety = area->y - uly;

30
app/paint/gimppaintcore.h
View File

@ -65,23 +65,9 @@ struct _GimpPaintTool
{
GimpDrawTool parent_instance;
gdouble startx; /* starting x coord */
gdouble starty; /* starting y coord */
gdouble startpressure; /* starting pressure */
gdouble startxtilt; /* starting xtilt */
gdouble startytilt; /* starting ytilt */
gdouble curx; /* current x coord */
gdouble cury; /* current y coord */
gdouble curpressure; /* current pressure */
gdouble curxtilt; /* current xtilt */
gdouble curytilt; /* current ytilt */
gdouble lastx; /* last x coord */
gdouble lasty; /* last y coord */
gdouble lastpressure; /* last pressure */
gdouble lastxtilt; /* last xtilt */
gdouble lastytilt; /* last ytilt */
GimpCoords start_coords; /* starting coords */
GimpCoords cur_coords; /* current coords */
GimpCoords last_coords; /* last coords */
gint state; /* state of buttons and keys */
@ -116,14 +102,10 @@ typedef struct _PaintUndo PaintUndo;
struct _PaintUndo
{
gint tool_ID;
GType tool_type;
gint tool_ID;
GType tool_type;
gdouble lastx;
gdouble lasty;
gdouble lastpressure;
gdouble lastxtilt;
gdouble lastytilt;
GimpCoords last_coords;
};

18
app/paint/gimppencil.c
View File

@ -205,7 +205,7 @@ gimp_pencil_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -219,7 +219,7 @@ gimp_pencil_tool_motion (GimpPaintTool *paint_tool,
GimpRGB color;
gimp_gradient_get_color_at (gimp_context_get_gradient (context),
paint_tool->curpressure, &color);
paint_tool->cur_coords.pressure, &color);
gimp_rgba_get_uchar (&color,
&col[RED_PIX],
@ -248,7 +248,7 @@ gimp_pencil_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being worked on */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -282,20 +282,20 @@ pencil_non_gui (GimpDrawable *drawable,
stroke_array[0],
stroke_array[1]))
{
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_pencil_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

30
app/paint/gimpsmudge.c
View File

@ -234,8 +234,8 @@ gimp_smudge_tool_nonclipped_painthit_coords (GimpPaintTool *paint_tool,
gint *h)
{
/* Note: these are the brush mask size plus a border of 1 pixel */
*x = (gint) paint_tool->curx - paint_tool->brush->mask->width/2 - 1;
*y = (gint) paint_tool->cury - paint_tool->brush->mask->height/2 - 1;
*x = (gint) paint_tool->cur_coords.x - paint_tool->brush->mask->width/2 - 1;
*y = (gint) paint_tool->cur_coords.y - paint_tool->brush->mask->height/2 - 1;
*w = paint_tool->brush->mask->width + 2;
*h = paint_tool->brush->mask->height + 2;
}
@ -282,8 +282,10 @@ gimp_smudge_tool_start (GimpPaintTool *paint_tool,
if (was_clipped)
do_fill = gimp_drawable_get_color_at (drawable,
CLAMP ((gint) paint_tool->curx, 0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cury, 0, gimp_drawable_height (drawable) - 1));
CLAMP ((gint) paint_tool->cur_coords.x,
0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cur_coords.y,
0, gimp_drawable_height (drawable) - 1));
gimp_smudge_tool_allocate_accum_buffer (w, h,
gimp_drawable_bytes (drawable),
@ -380,7 +382,7 @@ gimp_smudge_tool_motion (GimpPaintTool *paint_tool,
/* Enable pressure sensitive rate */
if (pressure_options->rate)
rate = MIN (smudge_rate / 100.0 * paint_tool->curpressure * 2.0, 1.0);
rate = MIN (smudge_rate / 100.0 * paint_tool->cur_coords.pressure * 2.0, 1.0);
else
rate = smudge_rate / 100.0;
@ -433,7 +435,7 @@ gimp_smudge_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/*Replace the newly made paint area to the gimage*/
gimp_paint_tool_replace_canvas (paint_tool, drawable,
@ -483,22 +485,22 @@ gimp_smudge_tool_non_gui (GimpDrawable *drawable,
non_gui_rate = rate;
paint_tool->curx = paint_tool->startx =
paint_tool->lastx = stroke_array[0];
paint_tool->cury = paint_tool->starty =
paint_tool->lasty = stroke_array[1];
paint_tool->cur_coords.x = paint_tool->start_coords.x =
paint_tool->last_coords.x = stroke_array[0];
paint_tool->cur_coords.y = paint_tool->start_coords.y =
paint_tool->last_coords.y = stroke_array[1];
gimp_smudge_tool_paint (paint_tool, drawable, 0);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

28
app/paint/gimpsourcecore.c
View File

@ -299,10 +299,10 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
break;
case MOTION_PAINT:
x1 = paint_tool->curx;
y1 = paint_tool->cury;
x2 = paint_tool->lastx;
y2 = paint_tool->lasty;
x1 = paint_tool->cur_coords.x;
y1 = paint_tool->cur_coords.y;
x2 = paint_tool->last_coords.x;
y2 = paint_tool->last_coords.y;
/* If the control key is down, move the src target and return */
if (paint_tool->state & GDK_CONTROL_MASK)
@ -344,8 +344,8 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
{
the_src_gdisp = gdisp;
clone_set_src_drawable(drawable);
src_x = paint_tool->curx;
src_y = paint_tool->cury;
src_x = paint_tool->cur_coords.x;
src_y = paint_tool->cur_coords.y;
first = TRUE;
}
else if (clone_options->aligned == ALIGN_NO)
@ -508,7 +508,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -626,7 +626,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
opacity = 255.0 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being worked on */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -774,20 +774,20 @@ gimp_clone_tool_non_gui (GimpDrawable *drawable,
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];
non_gui_offset_x = (int) (src_x - non_gui_paint_core.startx);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.starty);
non_gui_offset_x = (int) (src_x - non_gui_paint_core.start_coords.x);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.start_coords.y);
clone_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
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];
non_gui_paint_core.cur_coords.x = stroke_array[i * 2 + 0];
non_gui_paint_core.cur_coords.y = stroke_array[i * 2 + 1];
paint_core_interpolate (&non_gui_paint_core, drawable);
non_gui_paint_core.lastx = non_gui_paint_core.curx;
non_gui_paint_core.lasty = non_gui_paint_core.cury;
non_gui_paint_core.last_coords.x = non_gui_paint_core.cur_coords.x;
non_gui_paint_core.last_coords.y = non_gui_paint_core.cur_coords.y;
}
/* Finish the painting */

22
app/tools/gimpairbrushtool.c
View File

@ -278,7 +278,7 @@ gimp_airbrush_tool_paint (GimpPaintTool *paint_tool,
airbrush_timeout.drawable = drawable;
timeout = (pressure_options->rate ?
(10000 / (rate * 2.0 * paint_tool->curpressure)) :
(10000 / (rate * 2.0 * paint_tool->cur_coords.pressure)) :
(10000 / rate));
timer = gtk_timeout_add (timeout, airbrush_time_out, NULL);
@ -335,7 +335,7 @@ airbrush_time_out (gpointer client_data)
if (pressure_options->rate)
{
/* set a new timer */
timer = gtk_timeout_add ((10000 / (rate * 2.0 * airbrush_timeout.paint_tool->curpressure)),
timer = gtk_timeout_add ((10000 / (rate * 2.0 * airbrush_timeout.paint_tool->cur_coords.pressure)),
airbrush_time_out, NULL);
return FALSE;
}
@ -369,7 +369,7 @@ gimp_airbrush_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -382,7 +382,7 @@ gimp_airbrush_tool_motion (GimpPaintTool *paint_tool,
GimpRGB color;
gimp_gradient_get_color_at (gimp_context_get_gradient (context),
paint_tool->curpressure, &color);
paint_tool->cur_coords.pressure, &color);
gimp_rgba_get_uchar (&color,
&col[RED_PIX],
@ -412,7 +412,7 @@ gimp_airbrush_tool_motion (GimpPaintTool *paint_tool,
}
if (pressure_options->pressure)
pressure = pressure * 2.0 * paint_tool->curpressure;
pressure = pressure * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted area to the image */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -463,20 +463,20 @@ airbrush_non_gui (GimpDrawable *drawable,
non_gui_pressure = pressure;
non_gui_incremental = AIRBRUSH_DEFAULT_INCREMENTAL;
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_airbrush_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

253
app/tools/gimpbrushtool.c
View File

@ -347,10 +347,18 @@ gimp_paint_tool_button_press (GimpTool *tool,
draw_line = FALSE;
paint_tool->curpressure = coords->pressure;
paint_tool->curxtilt = coords->xtilt;
paint_tool->curytilt = coords->ytilt;
paint_tool->state = state;
{
gdouble save_x, save_y;
save_x = paint_tool->cur_coords.x;
save_y = paint_tool->cur_coords.y;
paint_tool->cur_coords = *coords;
paint_tool->state = state;
paint_tool->cur_coords.x = save_x;
paint_tool->cur_coords.y = save_y;
}
if (gdisp != tool->gdisp || paint_tool->context_id < 1)
{
@ -363,11 +371,11 @@ gimp_paint_tool_button_press (GimpTool *tool,
if ((gdisp != tool->gdisp) || ! (state & GDK_SHIFT_MASK))
{
/* initialize some values */
paint_tool->startx = paint_tool->lastx = paint_tool->curx = x;
paint_tool->starty = paint_tool->lasty = paint_tool->cury = y;
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->cur_coords.x = x;
paint_tool->cur_coords.y = y;
paint_tool->start_coords = paint_tool->cur_coords;
paint_tool->last_coords = paint_tool->cur_coords;
}
/* If shift is down and this is not the first paint
@ -376,11 +384,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
else if (state & GDK_SHIFT_MASK)
{
draw_line = TRUE;
paint_tool->startx = paint_tool->lastx;
paint_tool->starty = paint_tool->lasty;
paint_tool->startpressure = paint_tool->lastpressure;
paint_tool->startxtilt = paint_tool->lastxtilt;
paint_tool->startytilt = paint_tool->lastytilt;
paint_tool->start_coords =paint_tool->last_coords;
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (state & GDK_CONTROL_MASK)
@ -389,8 +394,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
gint cosinus[7] = { 256, 247, 222, 181, 128, 66, 0 };
gint dx, dy, i, radius, frac;
dx = paint_tool->curx - paint_tool->lastx;
dy = paint_tool->cury - paint_tool->lasty;
dx = paint_tool->cur_coords.x - paint_tool->last_coords.x;
dy = paint_tool->cur_coords.y - paint_tool->last_coords.y;
if (dy)
{
@ -404,8 +409,9 @@ gimp_paint_tool_button_press (GimpTool *tool,
dx = dx > 0 ? (cosinus[6-i] * radius) >> 8 : - ((cosinus[6-i] * radius) >> 8);
dy = dy > 0 ? (cosinus[i] * radius) >> 8 : - ((cosinus[i] * radius) >> 8);
}
paint_tool->curx = paint_tool->lastx + dx;
paint_tool->cury = paint_tool->lasty + dy;
paint_tool->cur_coords.x = paint_tool->last_coords.x + dx;
paint_tool->cur_coords.y = paint_tool->last_coords.y + dy;
}
}
@ -459,11 +465,7 @@ gimp_paint_tool_button_press (GimpTool *tool,
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->last_coords = paint_tool->cur_coords;
}
else
{
@ -472,8 +474,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
* pixmap brush pipes don't, as they don't know which
* pixmap to select.)
*/
if (paint_tool->lastx != paint_tool->curx
|| paint_tool->lasty != paint_tool->cury
if (paint_tool->last_coords.x != paint_tool->cur_coords.x ||
paint_tool->last_coords.y != paint_tool->cur_coords.y
#ifdef __GNUC__
#warning FIXME: GIMP_BRUSH_GET_CLASS (paint_tool->brush)->want_null_motion
#endif
@ -560,43 +562,41 @@ gimp_paint_tool_motion (GimpTool *tool,
gimp_drawable_offsets (gimp_image_active_drawable (gdisp->gimage),
&off_x, &off_y);
paint_tool->curx = coords->x - off_x;
paint_tool->cury = coords->y - off_y;
paint_tool->cur_coords = *coords;
paint_tool->state = state;
paint_tool->cur_coords.x -= off_x;
paint_tool->cur_coords.y -= off_y;
if (paint_tool->pick_state)
{
gimp_paint_tool_sample_color (gimp_image_active_drawable (gdisp->gimage),
paint_tool->curx,
paint_tool->cury,
paint_tool->cur_coords.x,
paint_tool->cur_coords.y,
state);
return;
}
paint_tool->curpressure = coords->pressure;
paint_tool->curxtilt = coords->xtilt;
paint_tool->curytilt = coords->ytilt;
paint_tool->state = state;
gimp_paint_tool_interpolate (paint_tool,
gimp_image_active_drawable (gdisp->gimage));
if (paint_tool->flags & TOOL_TRACES_ON_WINDOW)
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
PRETRACE_PAINT);
{
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
PRETRACE_PAINT);
}
gimp_display_flush_now (gdisp);
if (paint_tool->flags & TOOL_TRACES_ON_WINDOW)
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
POSTTRACE_PAINT);
{
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
POSTTRACE_PAINT);
}
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->last_coords = paint_tool->cur_coords;
}
@ -661,17 +661,21 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
if ((layer = gimp_image_get_active_layer (gdisp->gimage)))
{
gint off_x, off_y;
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
/* If shift is down and this is not the first paint stroke, draw a line */
if (gdisp == tool->gdisp && (state & GDK_SHIFT_MASK))
{
gdouble dx, dy, d;
/* Get the current coordinates */
paint_tool->curx = coords->x;
paint_tool->cury = coords->y;
paint_tool->cur_coords.x = coords->x - off_x;
paint_tool->cur_coords.y = coords->y - off_y;
dx = paint_tool->curx - paint_tool->lastx;
dy = paint_tool->cury - paint_tool->lasty;
dx = paint_tool->cur_coords.x - paint_tool->last_coords.x;
dy = paint_tool->cur_coords.y - paint_tool->last_coords.y;
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (state & GDK_CONTROL_MASK)
@ -696,8 +700,8 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
dy = idy > 0 ? (cosinus[i] * radius) >> 8 : - ((cosinus[i] * radius) >> 8);
}
paint_tool->curx = paint_tool->lastx + dx;
paint_tool->cury = paint_tool->lasty + dy;
paint_tool->cur_coords.x = paint_tool->last_coords.x + dx;
paint_tool->cur_coords.y = paint_tool->last_coords.y + dy;
}
/* show distance in statusbar */
@ -745,10 +749,6 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
/* Normal operation -- no modifier pressed or first stroke */
else
{
gint off_x, off_y;
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
if (coords->x >= off_x &&
coords->y >= off_y &&
coords->x < (off_x + gimp_drawable_width (GIMP_DRAWABLE (layer))) &&
@ -789,24 +789,24 @@ gimp_paint_tool_draw (GimpDrawTool *draw_tool)
/* Draw start target */
gimp_draw_tool_draw_cross (draw_tool,
floor (paint_tool->lastx) + 0.5,
floor (paint_tool->lasty) + 0.5,
floor (paint_tool->last_coords.x) + 0.5,
floor (paint_tool->last_coords.y) + 0.5,
TARGET_SIZE,
TRUE);
/* Draw end target */
gimp_draw_tool_draw_cross (draw_tool,
floor (paint_tool->curx) + 0.5,
floor (paint_tool->cury) + 0.5,
floor (paint_tool->cur_coords.x) + 0.5,
floor (paint_tool->cur_coords.y) + 0.5,
TARGET_SIZE,
TRUE);
/* Draw the line between the start and end coords */
gimp_draw_tool_draw_line (draw_tool,
floor (paint_tool->lastx) + 0.5,
floor (paint_tool->lasty) + 0.5,
floor (paint_tool->curx) + 0.5,
floor (paint_tool->cury) + 0.5,
floor (paint_tool->last_coords.x) + 0.5,
floor (paint_tool->last_coords.y) + 0.5,
floor (paint_tool->cur_coords.x) + 0.5,
floor (paint_tool->cur_coords.y) + 0.5,
TRUE);
}
@ -867,8 +867,8 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimp_drawable_gimage (drawable)->gimp);
paint_tool->curx = x;
paint_tool->cury = y;
paint_tool->cur_coords.x = x;
paint_tool->cur_coords.y = y;
#ifdef __GNUC__
#warning (FIX non-gui paint tools)
@ -877,9 +877,13 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
/* Set up some defaults for non-gui use */
if (paint_tool == &non_gui_paint_tool)
{
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure = 0.5;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt = 0;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt = 0;
paint_tool->cur_coords.pressure = 1.0;
paint_tool->cur_coords.xtilt = 0.5;
paint_tool->cur_coords.ytilt = 0.5;
paint_tool->cur_coords.wheel = 0.5;
paint_tool->start_coords = paint_tool->cur_coords;
paint_tool->last_coords = paint_tool->cur_coords;
}
#endif
@ -922,8 +926,8 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
gimp_drawable_height (drawable), 1);
/* Get the initial undo extents */
paint_tool->x1 = paint_tool->x2 = paint_tool->curx;
paint_tool->y1 = paint_tool->y2 = paint_tool->cury;
paint_tool->x1 = paint_tool->x2 = paint_tool->cur_coords.x;
paint_tool->y1 = paint_tool->y2 = paint_tool->cur_coords.y;
paint_tool->distance = 0.0;
paint_tool->pixel_dist = 0.0;
@ -935,8 +939,7 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
GimpDrawable *drawable)
{
GimpBrush *current_brush;
GimpVector2 delta;
gdouble dpressure, dxtilt, dytilt;
GimpCoords delta;
/* double spacing; */
/* double lastscale, curscale; */
gdouble n;
@ -950,30 +953,36 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
gdouble xd, yd;
gdouble mag;
delta.x = paint_tool->curx - paint_tool->lastx;
delta.y = paint_tool->cury - paint_tool->lasty;
dpressure = paint_tool->curpressure - paint_tool->lastpressure;
dxtilt = paint_tool->curxtilt - paint_tool->lastxtilt;
dytilt = paint_tool->curytilt - paint_tool->lastytilt;
delta.x = paint_tool->cur_coords.x - paint_tool->last_coords.x;
delta.y = paint_tool->cur_coords.y - paint_tool->last_coords.y;
delta.pressure = paint_tool->cur_coords.pressure - paint_tool->last_coords.pressure;
delta.xtilt = paint_tool->cur_coords.xtilt - paint_tool->last_coords.xtilt;
delta.ytilt = paint_tool->cur_coords.ytilt - paint_tool->last_coords.ytilt;
delta.wheel = paint_tool->cur_coords.wheel - paint_tool->last_coords.wheel;
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
if (! delta.x &&
! delta.y &&
! delta.pressure &&
! delta.xtilt &&
! delta.ytilt &&
! delta.wheel)
return;
/* calculate the distance traveled in the coordinate space of the brush */
mag = gimp_vector2_length (&(paint_tool->brush->x_axis));
xd = gimp_vector2_inner_product (&delta,
xd = gimp_vector2_inner_product ((GimpVector2 *) &delta,
&(paint_tool->brush->x_axis)) / (mag*mag);
mag = gimp_vector2_length (&(paint_tool->brush->y_axis));
yd = gimp_vector2_inner_product (&delta,
yd = gimp_vector2_inner_product ((GimpVector2 *) &delta,
&(paint_tool->brush->y_axis)) / (mag*mag);
dist = 0.5 * sqrt (xd*xd + yd*yd);
total = dist + paint_tool->distance;
initial = paint_tool->distance;
pixel_dist = gimp_vector2_length (&delta);
pixel_dist = gimp_vector2_length ((GimpVector2 *) &delta);
pixel_initial = paint_tool->pixel_dist;
/* FIXME: need to adapt the spacing to the size */
@ -988,16 +997,24 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->distance += left;
if (paint_tool->distance <= (total+EPSILON))
if (paint_tool->distance <= (total + EPSILON))
{
t = (paint_tool->distance - initial) / dist;
paint_tool->curx = paint_tool->lastx + delta.x * t;
paint_tool->cury = paint_tool->lasty + delta.y * t;
paint_tool->pixel_dist = pixel_initial + pixel_dist * t;
paint_tool->curpressure = paint_tool->lastpressure + dpressure * t;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt * t;
paint_tool->curytilt = paint_tool->lastytilt + dytilt * t;
paint_tool->cur_coords.x = (paint_tool->last_coords.x +
delta.x * t);
paint_tool->cur_coords.y = (paint_tool->last_coords.y +
delta.y * t);
paint_tool->cur_coords.pressure = (paint_tool->last_coords.pressure +
delta.pressure * t);
paint_tool->cur_coords.xtilt = (paint_tool->last_coords.xtilt +
delta.xtilt * t);
paint_tool->cur_coords.ytilt = (paint_tool->last_coords.ytilt +
delta.ytilt * t);
paint_tool->cur_coords.wheel = (paint_tool->last_coords.wheel +
delta.ytilt * t);
paint_tool->pixel_dist = pixel_initial + pixel_dist * t;
/* save the current brush */
current_brush = paint_tool->brush;
@ -1019,13 +1036,21 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
}
}
paint_tool->distance = total;
paint_tool->pixel_dist = pixel_initial + pixel_dist;
paint_tool->curx = paint_tool->lastx + delta.x;
paint_tool->cury = paint_tool->lasty + delta.y;
paint_tool->curpressure = paint_tool->lastpressure + dpressure;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt;
paint_tool->curytilt = paint_tool->lastytilt + dytilt;
paint_tool->cur_coords.x = (paint_tool->last_coords.x +
delta.x);
paint_tool->cur_coords.y = (paint_tool->last_coords.y +
delta.y);
paint_tool->cur_coords.pressure = (paint_tool->last_coords.pressure +
delta.pressure);
paint_tool->cur_coords.xtilt = (paint_tool->last_coords.xtilt +
delta.xtilt);
paint_tool->cur_coords.ytilt = (paint_tool->last_coords.ytilt +
delta.ytilt);
paint_tool->cur_coords.wheel = (paint_tool->last_coords.wheel +
delta.wheel);
paint_tool->distance = total;
paint_tool->pixel_dist = pixel_initial + pixel_dist;
}
void
@ -1051,11 +1076,7 @@ gimp_paint_tool_finish (GimpPaintTool *paint_tool,
pu = g_new0 (PaintUndo, 1);
pu->tool_ID = GIMP_TOOL (paint_tool)->ID;
pu->tool_type = G_TYPE_FROM_CLASS (G_OBJECT_GET_CLASS (paint_tool));
pu->lastx = paint_tool->startx;
pu->lasty = paint_tool->starty;
pu->lastpressure = paint_tool->startpressure;
pu->lastxtilt = paint_tool->startxtilt;
pu->lastytilt = paint_tool->startytilt;
pu->last_coords = paint_tool->start_coords;
/* Push a paint undo */
undo_push_paint (gimage, pu);
@ -1144,8 +1165,8 @@ gimp_paint_tool_get_paint_area (GimpPaintTool *paint_tool,
&bwidth, &bheight);
/* adjust the x and y coordinates to the upper left corner of the brush */
x = (gint) floor (paint_tool->curx) - (bwidth >> 1);
y = (gint) floor (paint_tool->cury) - (bheight >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (bwidth >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (bheight >> 1);
dwidth = gimp_drawable_width (drawable);
dheight = gimp_drawable_height (drawable);
@ -1640,15 +1661,17 @@ gimp_paint_tool_get_brush_mask (GimpPaintTool *paint_tool,
{
case SOFT:
mask = gimp_paint_tool_subsample_mask (mask,
paint_tool->curx, paint_tool->cury);
paint_tool->cur_coords.x,
paint_tool->cur_coords.y);
break;
case HARD:
mask = gimp_paint_tool_solidify_mask (mask);
break;
case PRESSURE:
mask = gimp_paint_tool_pressurize_mask (mask,
paint_tool->curx, paint_tool->cury,
paint_tool->curpressure);
paint_tool->cur_coords.x,
paint_tool->cur_coords.y,
paint_tool->cur_coords.pressure);
break;
default:
break;
@ -1874,8 +1897,8 @@ brush_to_canvas_tiles (GimpPaintTool *paint_tool,
canvas_buf->x, canvas_buf->y,
canvas_buf->width, canvas_buf->height, TRUE);
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1903,8 +1926,8 @@ brush_to_canvas_buf (GimpPaintTool *paint_tool,
gint xoff;
gint yoff;
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1947,8 +1970,8 @@ paint_to_canvas_tiles (GimpPaintTool *paint_tool,
canvas_buf->x, canvas_buf->y,
canvas_buf->width, canvas_buf->height, TRUE);
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1992,8 +2015,8 @@ paint_to_canvas_buf (GimpPaintTool *paint_tool,
gint xoff;
gint yoff;
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -2146,8 +2169,8 @@ gimp_paint_tool_color_area_with_pixmap (GimpPaintTool *paint_tool,
* gimp_paint_tool_get_paint_area. Ugly to have to do this here, too.
*/
ulx = (gint) floor (paint_tool->curx) - (pixmap_mask->width >> 1);
uly = (gint) floor (paint_tool->cury) - (pixmap_mask->height >> 1);
ulx = (gint) floor (paint_tool->cur_coords.x) - (pixmap_mask->width >> 1);
uly = (gint) floor (paint_tool->cur_coords.y) - (pixmap_mask->height >> 1);
offsetx = area->x - ulx;
offsety = area->y - uly;

30
app/tools/gimpbrushtool.h
View File

@ -65,23 +65,9 @@ struct _GimpPaintTool
{
GimpDrawTool parent_instance;
gdouble startx; /* starting x coord */
gdouble starty; /* starting y coord */
gdouble startpressure; /* starting pressure */
gdouble startxtilt; /* starting xtilt */
gdouble startytilt; /* starting ytilt */
gdouble curx; /* current x coord */
gdouble cury; /* current y coord */
gdouble curpressure; /* current pressure */
gdouble curxtilt; /* current xtilt */
gdouble curytilt; /* current ytilt */
gdouble lastx; /* last x coord */
gdouble lasty; /* last y coord */
gdouble lastpressure; /* last pressure */
gdouble lastxtilt; /* last xtilt */
gdouble lastytilt; /* last ytilt */
GimpCoords start_coords; /* starting coords */
GimpCoords cur_coords; /* current coords */
GimpCoords last_coords; /* last coords */
gint state; /* state of buttons and keys */
@ -116,14 +102,10 @@ typedef struct _PaintUndo PaintUndo;
struct _PaintUndo
{
gint tool_ID;
GType tool_type;
gint tool_ID;
GType tool_type;
gdouble lastx;
gdouble lasty;
gdouble lastpressure;
gdouble lastxtilt;
gdouble lastytilt;
GimpCoords last_coords;
};

28
app/tools/gimpclonetool.c
View File

@ -299,10 +299,10 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
break;
case MOTION_PAINT:
x1 = paint_tool->curx;
y1 = paint_tool->cury;
x2 = paint_tool->lastx;
y2 = paint_tool->lasty;
x1 = paint_tool->cur_coords.x;
y1 = paint_tool->cur_coords.y;
x2 = paint_tool->last_coords.x;
y2 = paint_tool->last_coords.y;
/* If the control key is down, move the src target and return */
if (paint_tool->state & GDK_CONTROL_MASK)
@ -344,8 +344,8 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
{
the_src_gdisp = gdisp;
clone_set_src_drawable(drawable);
src_x = paint_tool->curx;
src_y = paint_tool->cury;
src_x = paint_tool->cur_coords.x;
src_y = paint_tool->cur_coords.y;
first = TRUE;
}
else if (clone_options->aligned == ALIGN_NO)
@ -508,7 +508,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -626,7 +626,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
opacity = 255.0 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being worked on */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -774,20 +774,20 @@ gimp_clone_tool_non_gui (GimpDrawable *drawable,
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];
non_gui_offset_x = (int) (src_x - non_gui_paint_core.startx);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.starty);
non_gui_offset_x = (int) (src_x - non_gui_paint_core.start_coords.x);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.start_coords.y);
clone_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
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];
non_gui_paint_core.cur_coords.x = stroke_array[i * 2 + 0];
non_gui_paint_core.cur_coords.y = stroke_array[i * 2 + 1];
paint_core_interpolate (&non_gui_paint_core, drawable);
non_gui_paint_core.lastx = non_gui_paint_core.curx;
non_gui_paint_core.lasty = non_gui_paint_core.cury;
non_gui_paint_core.last_coords.x = non_gui_paint_core.cur_coords.x;
non_gui_paint_core.last_coords.y = non_gui_paint_core.cur_coords.y;
}
/* Finish the painting */

22
app/tools/gimpconvolvetool.c
View File

@ -342,7 +342,7 @@ gimp_convolve_tool_motion (GimpPaintTool *paint_tool,
return;
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -366,19 +366,19 @@ gimp_convolve_tool_motion (GimpPaintTool *paint_tool,
destPR.data = temp_buf_data (area);
if (pressure_options->rate)
rate = rate * 2.0 * paint_tool->curpressure;
rate = rate * 2.0 * paint_tool->cur_coords.pressure;
calculate_matrix (type, rate);
/* Image region near edges? If so, paint area will be clipped */
/* with respect to brush mask + 1 pixel border (# 19285) */
if ((marginx = (gint) paint_tool->curx - paint_tool->brush->mask->width / 2 - 1) != area->x)
if ((marginx = (gint) paint_tool->cur_coords.x - paint_tool->brush->mask->width / 2 - 1) != area->x)
area_hclip = CONVOLVE_NCLIP;
else if ((marginx = area->width - paint_tool->brush->mask->width - 2) != 0)
area_hclip = CONVOLVE_PCLIP;
if ((marginy = (gint) paint_tool->cury - paint_tool->brush->mask->height / 2 - 1) != area->y)
if ((marginy = (gint) paint_tool->cur_coords.y - paint_tool->brush->mask->height / 2 - 1) != area->y)
area_vclip = CONVOLVE_NCLIP;
else if ((marginy = area->height - paint_tool->brush->mask->height - 2) != 0)
area_vclip = CONVOLVE_PCLIP;
@ -453,8 +453,10 @@ gimp_convolve_tool_motion (GimpPaintTool *paint_tool,
fillcolor = gimp_drawable_get_color_at
(drawable,
CLAMP ((gint) paint_tool->curx, 0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cury, 0, gimp_drawable_height (drawable) - 1));
CLAMP ((gint) paint_tool->cur_coords.x,
0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cur_coords.y,
0, gimp_drawable_height (drawable) - 1));
marginx *= (marginx < 0) ? -1 : 0;
marginy *= (marginy < 0) ? -1 : 0;
@ -657,13 +659,13 @@ convolve_non_gui (GimpDrawable *drawable,
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];
non_gui_paint_core.cur_coords.x = stroke_array[i * 2 + 0];
non_gui_paint_core.cur_coords.y = stroke_array[i * 2 + 1];
paint_core_interpolate (&non_gui_paint_core, drawable);
non_gui_paint_core.lastx = non_gui_paint_core.curx;
non_gui_paint_core.lasty = non_gui_paint_core.cury;
non_gui_paint_core.last_coords.x = non_gui_paint_core.cur_coords.x;
non_gui_paint_core.last_coords.y = non_gui_paint_core.cur_coords.y;
}
paint_core_finish (&non_gui_paint_core, drawable, -1);

16
app/tools/gimpdodgeburntool.c
View File

@ -377,7 +377,7 @@ gimp_dodgeburn_tool_motion (GimpPaintTool *paint_tool,
return;
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -442,7 +442,7 @@ gimp_dodgeburn_tool_motion (GimpPaintTool *paint_tool,
255 * gimp_context_get_opacity (gimp_get_current_context (gimage->gimp));
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* Replace the newly dodgedburned area (canvas_buf) to the gimage*/
gimp_paint_tool_replace_canvas (paint_tool, drawable,
@ -582,20 +582,20 @@ gimp_dodgeburn_tool_non_gui (GimpDrawable *drawable,
non_gui_lut,
drawable);
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_dodgeburn_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

18
app/tools/gimperasertool.c
View File

@ -291,7 +291,7 @@ gimp_eraser_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -311,7 +311,7 @@ gimp_eraser_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being
* worked on */
@ -400,7 +400,7 @@ gimp_eraser_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is
* being worked on */
@ -470,20 +470,20 @@ eraser_non_gui (GimpDrawable *drawable,
non_gui_anti_erase = anti_erase;
non_gui_color_erase = color_erase;
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_paint_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

30
app/tools/gimppaintbrushtool.c
View File

@ -273,7 +273,7 @@ gimp_paintbrush_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -307,7 +307,7 @@ gimp_paintbrush_tool_motion (GimpPaintTool *paint_tool,
if (pressure_options->color)
gimp_gradient_get_color_at (gradient,
paint_tool->curpressure,
paint_tool->cur_coords.pressure,
&color);
else
gimp_paint_tool_get_color_from_gradient (paint_tool,
@ -351,7 +351,7 @@ gimp_paintbrush_tool_motion (GimpPaintTool *paint_tool,
opacity = (gdouble) temp_blend;
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
gimp_paint_tool_paste_canvas (paint_tool, drawable,
MIN (opacity, 255),
@ -389,20 +389,20 @@ gimp_paintbrush_tool_non_gui_default (GimpDrawable *drawable,
stroke_array[0],
stroke_array[1]))
{
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_paint_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);
@ -441,20 +441,20 @@ gimp_paintbrush_tool_non_gui (GimpDrawable *drawable,
non_gui_gradient_options.gradient_type = LOOP_TRIANGLE;
non_gui_incremental = method;
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_paint_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

253
app/tools/gimppainttool.c
View File

@ -347,10 +347,18 @@ gimp_paint_tool_button_press (GimpTool *tool,
draw_line = FALSE;
paint_tool->curpressure = coords->pressure;
paint_tool->curxtilt = coords->xtilt;
paint_tool->curytilt = coords->ytilt;
paint_tool->state = state;
{
gdouble save_x, save_y;
save_x = paint_tool->cur_coords.x;
save_y = paint_tool->cur_coords.y;
paint_tool->cur_coords = *coords;
paint_tool->state = state;
paint_tool->cur_coords.x = save_x;
paint_tool->cur_coords.y = save_y;
}
if (gdisp != tool->gdisp || paint_tool->context_id < 1)
{
@ -363,11 +371,11 @@ gimp_paint_tool_button_press (GimpTool *tool,
if ((gdisp != tool->gdisp) || ! (state & GDK_SHIFT_MASK))
{
/* initialize some values */
paint_tool->startx = paint_tool->lastx = paint_tool->curx = x;
paint_tool->starty = paint_tool->lasty = paint_tool->cury = y;
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->cur_coords.x = x;
paint_tool->cur_coords.y = y;
paint_tool->start_coords = paint_tool->cur_coords;
paint_tool->last_coords = paint_tool->cur_coords;
}
/* If shift is down and this is not the first paint
@ -376,11 +384,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
else if (state & GDK_SHIFT_MASK)
{
draw_line = TRUE;
paint_tool->startx = paint_tool->lastx;
paint_tool->starty = paint_tool->lasty;
paint_tool->startpressure = paint_tool->lastpressure;
paint_tool->startxtilt = paint_tool->lastxtilt;
paint_tool->startytilt = paint_tool->lastytilt;
paint_tool->start_coords =paint_tool->last_coords;
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (state & GDK_CONTROL_MASK)
@ -389,8 +394,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
gint cosinus[7] = { 256, 247, 222, 181, 128, 66, 0 };
gint dx, dy, i, radius, frac;
dx = paint_tool->curx - paint_tool->lastx;
dy = paint_tool->cury - paint_tool->lasty;
dx = paint_tool->cur_coords.x - paint_tool->last_coords.x;
dy = paint_tool->cur_coords.y - paint_tool->last_coords.y;
if (dy)
{
@ -404,8 +409,9 @@ gimp_paint_tool_button_press (GimpTool *tool,
dx = dx > 0 ? (cosinus[6-i] * radius) >> 8 : - ((cosinus[6-i] * radius) >> 8);
dy = dy > 0 ? (cosinus[i] * radius) >> 8 : - ((cosinus[i] * radius) >> 8);
}
paint_tool->curx = paint_tool->lastx + dx;
paint_tool->cury = paint_tool->lasty + dy;
paint_tool->cur_coords.x = paint_tool->last_coords.x + dx;
paint_tool->cur_coords.y = paint_tool->last_coords.y + dy;
}
}
@ -459,11 +465,7 @@ gimp_paint_tool_button_press (GimpTool *tool,
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->last_coords = paint_tool->cur_coords;
}
else
{
@ -472,8 +474,8 @@ gimp_paint_tool_button_press (GimpTool *tool,
* pixmap brush pipes don't, as they don't know which
* pixmap to select.)
*/
if (paint_tool->lastx != paint_tool->curx
|| paint_tool->lasty != paint_tool->cury
if (paint_tool->last_coords.x != paint_tool->cur_coords.x ||
paint_tool->last_coords.y != paint_tool->cur_coords.y
#ifdef __GNUC__
#warning FIXME: GIMP_BRUSH_GET_CLASS (paint_tool->brush)->want_null_motion
#endif
@ -560,43 +562,41 @@ gimp_paint_tool_motion (GimpTool *tool,
gimp_drawable_offsets (gimp_image_active_drawable (gdisp->gimage),
&off_x, &off_y);
paint_tool->curx = coords->x - off_x;
paint_tool->cury = coords->y - off_y;
paint_tool->cur_coords = *coords;
paint_tool->state = state;
paint_tool->cur_coords.x -= off_x;
paint_tool->cur_coords.y -= off_y;
if (paint_tool->pick_state)
{
gimp_paint_tool_sample_color (gimp_image_active_drawable (gdisp->gimage),
paint_tool->curx,
paint_tool->cury,
paint_tool->cur_coords.x,
paint_tool->cur_coords.y,
state);
return;
}
paint_tool->curpressure = coords->pressure;
paint_tool->curxtilt = coords->xtilt;
paint_tool->curytilt = coords->ytilt;
paint_tool->state = state;
gimp_paint_tool_interpolate (paint_tool,
gimp_image_active_drawable (gdisp->gimage));
if (paint_tool->flags & TOOL_TRACES_ON_WINDOW)
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
PRETRACE_PAINT);
{
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
PRETRACE_PAINT);
}
gimp_display_flush_now (gdisp);
if (paint_tool->flags & TOOL_TRACES_ON_WINDOW)
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
POSTTRACE_PAINT);
{
gimp_paint_tool_paint (paint_tool,
gimp_image_active_drawable (gdisp->gimage),
POSTTRACE_PAINT);
}
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->lastpressure = paint_tool->curpressure;
paint_tool->lastxtilt = paint_tool->curxtilt;
paint_tool->lastytilt = paint_tool->curytilt;
paint_tool->last_coords = paint_tool->cur_coords;
}
@ -661,17 +661,21 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
if ((layer = gimp_image_get_active_layer (gdisp->gimage)))
{
gint off_x, off_y;
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
/* If shift is down and this is not the first paint stroke, draw a line */
if (gdisp == tool->gdisp && (state & GDK_SHIFT_MASK))
{
gdouble dx, dy, d;
/* Get the current coordinates */
paint_tool->curx = coords->x;
paint_tool->cury = coords->y;
paint_tool->cur_coords.x = coords->x - off_x;
paint_tool->cur_coords.y = coords->y - off_y;
dx = paint_tool->curx - paint_tool->lastx;
dy = paint_tool->cury - paint_tool->lasty;
dx = paint_tool->cur_coords.x - paint_tool->last_coords.x;
dy = paint_tool->cur_coords.y - paint_tool->last_coords.y;
/* Restrict to multiples of 15 degrees if ctrl is pressed */
if (state & GDK_CONTROL_MASK)
@ -696,8 +700,8 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
dy = idy > 0 ? (cosinus[i] * radius) >> 8 : - ((cosinus[i] * radius) >> 8);
}
paint_tool->curx = paint_tool->lastx + dx;
paint_tool->cury = paint_tool->lasty + dy;
paint_tool->cur_coords.x = paint_tool->last_coords.x + dx;
paint_tool->cur_coords.y = paint_tool->last_coords.y + dy;
}
/* show distance in statusbar */
@ -745,10 +749,6 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
/* Normal operation -- no modifier pressed or first stroke */
else
{
gint off_x, off_y;
gimp_drawable_offsets (GIMP_DRAWABLE (layer), &off_x, &off_y);
if (coords->x >= off_x &&
coords->y >= off_y &&
coords->x < (off_x + gimp_drawable_width (GIMP_DRAWABLE (layer))) &&
@ -789,24 +789,24 @@ gimp_paint_tool_draw (GimpDrawTool *draw_tool)
/* Draw start target */
gimp_draw_tool_draw_cross (draw_tool,
floor (paint_tool->lastx) + 0.5,
floor (paint_tool->lasty) + 0.5,
floor (paint_tool->last_coords.x) + 0.5,
floor (paint_tool->last_coords.y) + 0.5,
TARGET_SIZE,
TRUE);
/* Draw end target */
gimp_draw_tool_draw_cross (draw_tool,
floor (paint_tool->curx) + 0.5,
floor (paint_tool->cury) + 0.5,
floor (paint_tool->cur_coords.x) + 0.5,
floor (paint_tool->cur_coords.y) + 0.5,
TARGET_SIZE,
TRUE);
/* Draw the line between the start and end coords */
gimp_draw_tool_draw_line (draw_tool,
floor (paint_tool->lastx) + 0.5,
floor (paint_tool->lasty) + 0.5,
floor (paint_tool->curx) + 0.5,
floor (paint_tool->cury) + 0.5,
floor (paint_tool->last_coords.x) + 0.5,
floor (paint_tool->last_coords.y) + 0.5,
floor (paint_tool->cur_coords.x) + 0.5,
floor (paint_tool->cur_coords.y) + 0.5,
TRUE);
}
@ -867,8 +867,8 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimp_drawable_gimage (drawable)->gimp);
paint_tool->curx = x;
paint_tool->cury = y;
paint_tool->cur_coords.x = x;
paint_tool->cur_coords.y = y;
#ifdef __GNUC__
#warning (FIX non-gui paint tools)
@ -877,9 +877,13 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
/* Set up some defaults for non-gui use */
if (paint_tool == &non_gui_paint_tool)
{
paint_tool->startpressure = paint_tool->lastpressure = paint_tool->curpressure = 0.5;
paint_tool->startxtilt = paint_tool->lastxtilt = paint_tool->curxtilt = 0;
paint_tool->startytilt = paint_tool->lastytilt = paint_tool->curytilt = 0;
paint_tool->cur_coords.pressure = 1.0;
paint_tool->cur_coords.xtilt = 0.5;
paint_tool->cur_coords.ytilt = 0.5;
paint_tool->cur_coords.wheel = 0.5;
paint_tool->start_coords = paint_tool->cur_coords;
paint_tool->last_coords = paint_tool->cur_coords;
}
#endif
@ -922,8 +926,8 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
gimp_drawable_height (drawable), 1);
/* Get the initial undo extents */
paint_tool->x1 = paint_tool->x2 = paint_tool->curx;
paint_tool->y1 = paint_tool->y2 = paint_tool->cury;
paint_tool->x1 = paint_tool->x2 = paint_tool->cur_coords.x;
paint_tool->y1 = paint_tool->y2 = paint_tool->cur_coords.y;
paint_tool->distance = 0.0;
paint_tool->pixel_dist = 0.0;
@ -935,8 +939,7 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
GimpDrawable *drawable)
{
GimpBrush *current_brush;
GimpVector2 delta;
gdouble dpressure, dxtilt, dytilt;
GimpCoords delta;
/* double spacing; */
/* double lastscale, curscale; */
gdouble n;
@ -950,30 +953,36 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
gdouble xd, yd;
gdouble mag;
delta.x = paint_tool->curx - paint_tool->lastx;
delta.y = paint_tool->cury - paint_tool->lasty;
dpressure = paint_tool->curpressure - paint_tool->lastpressure;
dxtilt = paint_tool->curxtilt - paint_tool->lastxtilt;
dytilt = paint_tool->curytilt - paint_tool->lastytilt;
delta.x = paint_tool->cur_coords.x - paint_tool->last_coords.x;
delta.y = paint_tool->cur_coords.y - paint_tool->last_coords.y;
delta.pressure = paint_tool->cur_coords.pressure - paint_tool->last_coords.pressure;
delta.xtilt = paint_tool->cur_coords.xtilt - paint_tool->last_coords.xtilt;
delta.ytilt = paint_tool->cur_coords.ytilt - paint_tool->last_coords.ytilt;
delta.wheel = paint_tool->cur_coords.wheel - paint_tool->last_coords.wheel;
/* return if there has been no motion */
if (!delta.x && !delta.y && !dpressure && !dxtilt && !dytilt)
if (! delta.x &&
! delta.y &&
! delta.pressure &&
! delta.xtilt &&
! delta.ytilt &&
! delta.wheel)
return;
/* calculate the distance traveled in the coordinate space of the brush */
mag = gimp_vector2_length (&(paint_tool->brush->x_axis));
xd = gimp_vector2_inner_product (&delta,
xd = gimp_vector2_inner_product ((GimpVector2 *) &delta,
&(paint_tool->brush->x_axis)) / (mag*mag);
mag = gimp_vector2_length (&(paint_tool->brush->y_axis));
yd = gimp_vector2_inner_product (&delta,
yd = gimp_vector2_inner_product ((GimpVector2 *) &delta,
&(paint_tool->brush->y_axis)) / (mag*mag);
dist = 0.5 * sqrt (xd*xd + yd*yd);
total = dist + paint_tool->distance;
initial = paint_tool->distance;
pixel_dist = gimp_vector2_length (&delta);
pixel_dist = gimp_vector2_length ((GimpVector2 *) &delta);
pixel_initial = paint_tool->pixel_dist;
/* FIXME: need to adapt the spacing to the size */
@ -988,16 +997,24 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
paint_tool->distance += left;
if (paint_tool->distance <= (total+EPSILON))
if (paint_tool->distance <= (total + EPSILON))
{
t = (paint_tool->distance - initial) / dist;
paint_tool->curx = paint_tool->lastx + delta.x * t;
paint_tool->cury = paint_tool->lasty + delta.y * t;
paint_tool->pixel_dist = pixel_initial + pixel_dist * t;
paint_tool->curpressure = paint_tool->lastpressure + dpressure * t;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt * t;
paint_tool->curytilt = paint_tool->lastytilt + dytilt * t;
paint_tool->cur_coords.x = (paint_tool->last_coords.x +
delta.x * t);
paint_tool->cur_coords.y = (paint_tool->last_coords.y +
delta.y * t);
paint_tool->cur_coords.pressure = (paint_tool->last_coords.pressure +
delta.pressure * t);
paint_tool->cur_coords.xtilt = (paint_tool->last_coords.xtilt +
delta.xtilt * t);
paint_tool->cur_coords.ytilt = (paint_tool->last_coords.ytilt +
delta.ytilt * t);
paint_tool->cur_coords.wheel = (paint_tool->last_coords.wheel +
delta.ytilt * t);
paint_tool->pixel_dist = pixel_initial + pixel_dist * t;
/* save the current brush */
current_brush = paint_tool->brush;
@ -1019,13 +1036,21 @@ gimp_paint_tool_interpolate (GimpPaintTool *paint_tool,
}
}
paint_tool->distance = total;
paint_tool->pixel_dist = pixel_initial + pixel_dist;
paint_tool->curx = paint_tool->lastx + delta.x;
paint_tool->cury = paint_tool->lasty + delta.y;
paint_tool->curpressure = paint_tool->lastpressure + dpressure;
paint_tool->curxtilt = paint_tool->lastxtilt + dxtilt;
paint_tool->curytilt = paint_tool->lastytilt + dytilt;
paint_tool->cur_coords.x = (paint_tool->last_coords.x +
delta.x);
paint_tool->cur_coords.y = (paint_tool->last_coords.y +
delta.y);
paint_tool->cur_coords.pressure = (paint_tool->last_coords.pressure +
delta.pressure);
paint_tool->cur_coords.xtilt = (paint_tool->last_coords.xtilt +
delta.xtilt);
paint_tool->cur_coords.ytilt = (paint_tool->last_coords.ytilt +
delta.ytilt);
paint_tool->cur_coords.wheel = (paint_tool->last_coords.wheel +
delta.wheel);
paint_tool->distance = total;
paint_tool->pixel_dist = pixel_initial + pixel_dist;
}
void
@ -1051,11 +1076,7 @@ gimp_paint_tool_finish (GimpPaintTool *paint_tool,
pu = g_new0 (PaintUndo, 1);
pu->tool_ID = GIMP_TOOL (paint_tool)->ID;
pu->tool_type = G_TYPE_FROM_CLASS (G_OBJECT_GET_CLASS (paint_tool));
pu->lastx = paint_tool->startx;
pu->lasty = paint_tool->starty;
pu->lastpressure = paint_tool->startpressure;
pu->lastxtilt = paint_tool->startxtilt;
pu->lastytilt = paint_tool->startytilt;
pu->last_coords = paint_tool->start_coords;
/* Push a paint undo */
undo_push_paint (gimage, pu);
@ -1144,8 +1165,8 @@ gimp_paint_tool_get_paint_area (GimpPaintTool *paint_tool,
&bwidth, &bheight);
/* adjust the x and y coordinates to the upper left corner of the brush */
x = (gint) floor (paint_tool->curx) - (bwidth >> 1);
y = (gint) floor (paint_tool->cury) - (bheight >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (bwidth >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (bheight >> 1);
dwidth = gimp_drawable_width (drawable);
dheight = gimp_drawable_height (drawable);
@ -1640,15 +1661,17 @@ gimp_paint_tool_get_brush_mask (GimpPaintTool *paint_tool,
{
case SOFT:
mask = gimp_paint_tool_subsample_mask (mask,
paint_tool->curx, paint_tool->cury);
paint_tool->cur_coords.x,
paint_tool->cur_coords.y);
break;
case HARD:
mask = gimp_paint_tool_solidify_mask (mask);
break;
case PRESSURE:
mask = gimp_paint_tool_pressurize_mask (mask,
paint_tool->curx, paint_tool->cury,
paint_tool->curpressure);
paint_tool->cur_coords.x,
paint_tool->cur_coords.y,
paint_tool->cur_coords.pressure);
break;
default:
break;
@ -1874,8 +1897,8 @@ brush_to_canvas_tiles (GimpPaintTool *paint_tool,
canvas_buf->x, canvas_buf->y,
canvas_buf->width, canvas_buf->height, TRUE);
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1903,8 +1926,8 @@ brush_to_canvas_buf (GimpPaintTool *paint_tool,
gint xoff;
gint yoff;
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1947,8 +1970,8 @@ paint_to_canvas_tiles (GimpPaintTool *paint_tool,
canvas_buf->x, canvas_buf->y,
canvas_buf->width, canvas_buf->height, TRUE);
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -1992,8 +2015,8 @@ paint_to_canvas_buf (GimpPaintTool *paint_tool,
gint xoff;
gint yoff;
x = (gint) floor (paint_tool->curx) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cury) - (brush_mask->height >> 1);
x = (gint) floor (paint_tool->cur_coords.x) - (brush_mask->width >> 1);
y = (gint) floor (paint_tool->cur_coords.y) - (brush_mask->height >> 1);
xoff = (x < 0) ? -x : 0;
yoff = (y < 0) ? -y : 0;
@ -2146,8 +2169,8 @@ gimp_paint_tool_color_area_with_pixmap (GimpPaintTool *paint_tool,
* gimp_paint_tool_get_paint_area. Ugly to have to do this here, too.
*/
ulx = (gint) floor (paint_tool->curx) - (pixmap_mask->width >> 1);
uly = (gint) floor (paint_tool->cury) - (pixmap_mask->height >> 1);
ulx = (gint) floor (paint_tool->cur_coords.x) - (pixmap_mask->width >> 1);
uly = (gint) floor (paint_tool->cur_coords.y) - (pixmap_mask->height >> 1);
offsetx = area->x - ulx;
offsety = area->y - uly;

30
app/tools/gimppainttool.h
View File

@ -65,23 +65,9 @@ struct _GimpPaintTool
{
GimpDrawTool parent_instance;
gdouble startx; /* starting x coord */
gdouble starty; /* starting y coord */
gdouble startpressure; /* starting pressure */
gdouble startxtilt; /* starting xtilt */
gdouble startytilt; /* starting ytilt */
gdouble curx; /* current x coord */
gdouble cury; /* current y coord */
gdouble curpressure; /* current pressure */
gdouble curxtilt; /* current xtilt */
gdouble curytilt; /* current ytilt */
gdouble lastx; /* last x coord */
gdouble lasty; /* last y coord */
gdouble lastpressure; /* last pressure */
gdouble lastxtilt; /* last xtilt */
gdouble lastytilt; /* last ytilt */
GimpCoords start_coords; /* starting coords */
GimpCoords cur_coords; /* current coords */
GimpCoords last_coords; /* last coords */
gint state; /* state of buttons and keys */
@ -116,14 +102,10 @@ typedef struct _PaintUndo PaintUndo;
struct _PaintUndo
{
gint tool_ID;
GType tool_type;
gint tool_ID;
GType tool_type;
gdouble lastx;
gdouble lasty;
gdouble lastpressure;
gdouble lastxtilt;
gdouble lastytilt;
GimpCoords last_coords;
};

18
app/tools/gimppenciltool.c
View File

@ -205,7 +205,7 @@ gimp_pencil_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -219,7 +219,7 @@ gimp_pencil_tool_motion (GimpPaintTool *paint_tool,
GimpRGB color;
gimp_gradient_get_color_at (gimp_context_get_gradient (context),
paint_tool->curpressure, &color);
paint_tool->cur_coords.pressure, &color);
gimp_rgba_get_uchar (&color,
&col[RED_PIX],
@ -248,7 +248,7 @@ gimp_pencil_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being worked on */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -282,20 +282,20 @@ pencil_non_gui (GimpDrawable *drawable,
stroke_array[0],
stroke_array[1]))
{
paint_tool->startx = paint_tool->lastx = stroke_array[0];
paint_tool->starty = paint_tool->lasty = stroke_array[1];
paint_tool->start_coords.x = paint_tool->last_coords.x = stroke_array[0];
paint_tool->start_coords.y = paint_tool->last_coords.y = stroke_array[1];
gimp_pencil_tool_paint (paint_tool, drawable, MOTION_PAINT);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

30
app/tools/gimpsmudgetool.c
View File

@ -234,8 +234,8 @@ gimp_smudge_tool_nonclipped_painthit_coords (GimpPaintTool *paint_tool,
gint *h)
{
/* Note: these are the brush mask size plus a border of 1 pixel */
*x = (gint) paint_tool->curx - paint_tool->brush->mask->width/2 - 1;
*y = (gint) paint_tool->cury - paint_tool->brush->mask->height/2 - 1;
*x = (gint) paint_tool->cur_coords.x - paint_tool->brush->mask->width/2 - 1;
*y = (gint) paint_tool->cur_coords.y - paint_tool->brush->mask->height/2 - 1;
*w = paint_tool->brush->mask->width + 2;
*h = paint_tool->brush->mask->height + 2;
}
@ -282,8 +282,10 @@ gimp_smudge_tool_start (GimpPaintTool *paint_tool,
if (was_clipped)
do_fill = gimp_drawable_get_color_at (drawable,
CLAMP ((gint) paint_tool->curx, 0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cury, 0, gimp_drawable_height (drawable) - 1));
CLAMP ((gint) paint_tool->cur_coords.x,
0, gimp_drawable_width (drawable) - 1),
CLAMP ((gint) paint_tool->cur_coords.y,
0, gimp_drawable_height (drawable) - 1));
gimp_smudge_tool_allocate_accum_buffer (w, h,
gimp_drawable_bytes (drawable),
@ -380,7 +382,7 @@ gimp_smudge_tool_motion (GimpPaintTool *paint_tool,
/* Enable pressure sensitive rate */
if (pressure_options->rate)
rate = MIN (smudge_rate / 100.0 * paint_tool->curpressure * 2.0, 1.0);
rate = MIN (smudge_rate / 100.0 * paint_tool->cur_coords.pressure * 2.0, 1.0);
else
rate = smudge_rate / 100.0;
@ -433,7 +435,7 @@ gimp_smudge_tool_motion (GimpPaintTool *paint_tool,
opacity = 255 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/*Replace the newly made paint area to the gimage*/
gimp_paint_tool_replace_canvas (paint_tool, drawable,
@ -483,22 +485,22 @@ gimp_smudge_tool_non_gui (GimpDrawable *drawable,
non_gui_rate = rate;
paint_tool->curx = paint_tool->startx =
paint_tool->lastx = stroke_array[0];
paint_tool->cury = paint_tool->starty =
paint_tool->lasty = stroke_array[1];
paint_tool->cur_coords.x = paint_tool->start_coords.x =
paint_tool->last_coords.x = stroke_array[0];
paint_tool->cur_coords.y = paint_tool->start_coords.y =
paint_tool->last_coords.y = stroke_array[1];
gimp_smudge_tool_paint (paint_tool, drawable, 0);
for (i = 1; i < num_strokes; i++)
{
paint_tool->curx = stroke_array[i * 2 + 0];
paint_tool->cury = stroke_array[i * 2 + 1];
paint_tool->cur_coords.x = stroke_array[i * 2 + 0];
paint_tool->cur_coords.y = stroke_array[i * 2 + 1];
gimp_paint_tool_interpolate (paint_tool, drawable);
paint_tool->lastx = paint_tool->curx;
paint_tool->lasty = paint_tool->cury;
paint_tool->last_coords.x = paint_tool->cur_coords.x;
paint_tool->last_coords.y = paint_tool->cur_coords.y;
}
gimp_paint_tool_finish (paint_tool, drawable);

28
app/tools/gimpsourcetool.c
View File

@ -299,10 +299,10 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
break;
case MOTION_PAINT:
x1 = paint_tool->curx;
y1 = paint_tool->cury;
x2 = paint_tool->lastx;
y2 = paint_tool->lasty;
x1 = paint_tool->cur_coords.x;
y1 = paint_tool->cur_coords.y;
x2 = paint_tool->last_coords.x;
y2 = paint_tool->last_coords.y;
/* If the control key is down, move the src target and return */
if (paint_tool->state & GDK_CONTROL_MASK)
@ -344,8 +344,8 @@ gimp_clone_tool_paint (GimpPaintTool *paint_tool,
{
the_src_gdisp = gdisp;
clone_set_src_drawable(drawable);
src_x = paint_tool->curx;
src_y = paint_tool->cury;
src_x = paint_tool->cur_coords.x;
src_y = paint_tool->cur_coords.y;
first = TRUE;
}
else if (clone_options->aligned == ALIGN_NO)
@ -508,7 +508,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
context = gimp_get_current_context (gimage->gimp);
if (pressure_options->size)
scale = paint_tool->curpressure;
scale = paint_tool->cur_coords.pressure;
else
scale = 1.0;
@ -626,7 +626,7 @@ gimp_clone_tool_motion (GimpPaintTool *paint_tool,
opacity = 255.0 * gimp_context_get_opacity (context);
if (pressure_options->opacity)
opacity = opacity * 2.0 * paint_tool->curpressure;
opacity = opacity * 2.0 * paint_tool->cur_coords.pressure;
/* paste the newly painted canvas to the gimage which is being worked on */
gimp_paint_tool_paste_canvas (paint_tool, drawable,
@ -774,20 +774,20 @@ gimp_clone_tool_non_gui (GimpDrawable *drawable,
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];
non_gui_offset_x = (int) (src_x - non_gui_paint_core.startx);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.starty);
non_gui_offset_x = (int) (src_x - non_gui_paint_core.start_coords.x);
non_gui_offset_y = (int) (src_y - non_gui_paint_core.start_coords.y);
clone_non_gui_paint_func (&non_gui_paint_core, drawable, 0);
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];
non_gui_paint_core.cur_coords.x = stroke_array[i * 2 + 0];
non_gui_paint_core.cur_coords.y = stroke_array[i * 2 + 1];
paint_core_interpolate (&non_gui_paint_core, drawable);
non_gui_paint_core.lastx = non_gui_paint_core.curx;
non_gui_paint_core.lasty = non_gui_paint_core.cury;
non_gui_paint_core.last_coords.x = non_gui_paint_core.cur_coords.x;
non_gui_paint_core.last_coords.y = non_gui_paint_core.cur_coords.y;
}
/* Finish the painting */

24
app/undo.c
View File

@ -1411,7 +1411,7 @@ undo_pop_paint (GimpImage *gimage,
GimpTool *active_tool;
GimpPaintTool *pt;
PaintUndo *pu;
gdouble tmp;
GimpCoords tmp_coords;
active_tool = tool_manager_get_active (gimage->gimp);
@ -1427,25 +1427,9 @@ undo_pop_paint (GimpImage *gimage,
return TRUE;
/* swap the paint core information */
tmp = pt->lastx;
pt->lastx = pu->lastx;
pu->lastx = tmp;
tmp = pt->lasty;
pt->lasty = pu->lasty;
pu->lasty = tmp;
tmp = pt->lastpressure;
pt->lastpressure = pu->lastpressure;
pu->lastpressure = tmp;
tmp = pt->lastxtilt;
pt->lastxtilt = pu->lastxtilt;
pu->lastxtilt = tmp;
tmp = pt->lastytilt;
pt->lastytilt = pu->lastytilt;
pu->lastytilt = tmp;
tmp_coords = pt->last_coords;
pt->last_coords = pu->last_coords;
pu->last_coords = tmp_coords;
return TRUE;
}