1997-11-25 06:05:25 +08:00
|
|
|
/* The GIMP -- an image manipulation program
|
|
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
1998-04-13 13:44:11 +08:00
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
1997-11-25 06:05:25 +08:00
|
|
|
*/
|
2000-12-17 05:37:03 +08:00
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
#include <gtk/gtk.h>
|
2000-12-17 05:37:03 +08:00
|
|
|
|
|
|
|
#include "apptypes.h"
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "appenv.h"
|
|
|
|
#include "drawable.h"
|
|
|
|
#include "gdisplay.h"
|
|
|
|
#include "gimage_mask.h"
|
2000-12-29 23:22:01 +08:00
|
|
|
#include "gimpimage.h"
|
|
|
|
#include "gimpprogress.h"
|
|
|
|
#include "gimpui.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "info_dialog.h"
|
|
|
|
#include "selection.h"
|
2001-01-23 21:01:48 +08:00
|
|
|
#include "tile_manager.h"
|
|
|
|
#include "undo.h"
|
|
|
|
|
|
|
|
#include "perspective_tool.h"
|
2000-12-29 23:22:01 +08:00
|
|
|
#include "tools.h"
|
|
|
|
#include "transform_core.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "transform_tool.h"
|
|
|
|
|
1998-12-16 08:37:09 +08:00
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-12-31 12:07:42 +08:00
|
|
|
/* forward function declarations */
|
|
|
|
static TileManager * perspective_tool_transform (Tool *tool,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
TransformState state);
|
|
|
|
static void perspective_tool_recalc (Tool *tool,
|
|
|
|
GDisplay *gdisp);
|
|
|
|
static void perspective_tool_motion (Tool *tool,
|
|
|
|
GDisplay *gdisp);
|
|
|
|
static void perspective_info_update (Tool *tool);
|
|
|
|
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
/* storage for information dialog fields */
|
2000-01-05 19:18:38 +08:00
|
|
|
static gchar matrix_row_buf [3][MAX_INFO_BUF];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
|
2000-12-31 12:07:42 +08:00
|
|
|
static TileManager *
|
2000-01-05 19:18:38 +08:00
|
|
|
perspective_tool_transform (Tool *tool,
|
2000-12-31 12:07:42 +08:00
|
|
|
GDisplay *gdisp,
|
2000-01-05 19:18:38 +08:00
|
|
|
TransformState state)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
TransformCore *transform_core;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
|
|
|
switch (state)
|
|
|
|
{
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_INIT:
|
1998-08-14 04:19:09 +08:00
|
|
|
if (!transform_info)
|
|
|
|
{
|
1999-04-03 03:46:59 +08:00
|
|
|
transform_info =
|
1999-09-28 01:58:10 +08:00
|
|
|
info_dialog_new (_("Perspective Transform Information"),
|
2000-01-05 19:18:38 +08:00
|
|
|
gimp_standard_help_func,
|
|
|
|
"tools/transform_perspective.html");
|
1999-12-17 09:02:29 +08:00
|
|
|
info_dialog_add_label (transform_info, _("Matrix:"),
|
1999-04-03 03:46:59 +08:00
|
|
|
matrix_row_buf[0]);
|
|
|
|
info_dialog_add_label (transform_info, "", matrix_row_buf[1]);
|
|
|
|
info_dialog_add_label (transform_info, "", matrix_row_buf[2]);
|
1998-08-14 04:19:09 +08:00
|
|
|
}
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
transform_core->trans_info [X0] = (double) transform_core->x1;
|
|
|
|
transform_core->trans_info [Y0] = (double) transform_core->y1;
|
|
|
|
transform_core->trans_info [X1] = (double) transform_core->x2;
|
|
|
|
transform_core->trans_info [Y1] = (double) transform_core->y1;
|
|
|
|
transform_core->trans_info [X2] = (double) transform_core->x1;
|
|
|
|
transform_core->trans_info [Y2] = (double) transform_core->y2;
|
|
|
|
transform_core->trans_info [X3] = (double) transform_core->x2;
|
|
|
|
transform_core->trans_info [Y3] = (double) transform_core->y2;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_MOTION:
|
2000-12-31 12:07:42 +08:00
|
|
|
perspective_tool_motion (tool, gdisp);
|
|
|
|
perspective_tool_recalc (tool, gdisp);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_RECALC:
|
2000-12-31 12:07:42 +08:00
|
|
|
perspective_tool_recalc (tool, gdisp);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_FINISH:
|
1997-11-25 06:05:25 +08:00
|
|
|
/* Let the transform core handle the inverse mapping */
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), FALSE);
|
1999-04-03 03:46:59 +08:00
|
|
|
return
|
|
|
|
perspective_tool_perspective (gdisp->gimage,
|
2000-12-29 23:22:01 +08:00
|
|
|
gimp_image_active_drawable (gdisp->gimage),
|
1999-04-03 03:46:59 +08:00
|
|
|
gdisp,
|
|
|
|
transform_core->original,
|
|
|
|
transform_tool_smoothing (),
|
|
|
|
transform_core->transform);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Tool *
|
2000-01-05 19:18:38 +08:00
|
|
|
tools_new_perspective_tool (void)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
Tool *tool;
|
|
|
|
TransformCore *private;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
tool = transform_core_new (PERSPECTIVE, TRUE);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
private = tool->private;
|
|
|
|
|
|
|
|
/* set the rotation specific transformation attributes */
|
|
|
|
private->trans_func = perspective_tool_transform;
|
|
|
|
private->trans_info[X0] = 0;
|
|
|
|
private->trans_info[Y0] = 0;
|
|
|
|
private->trans_info[X1] = 0;
|
|
|
|
private->trans_info[Y1] = 0;
|
|
|
|
private->trans_info[X2] = 0;
|
|
|
|
private->trans_info[Y2] = 0;
|
|
|
|
private->trans_info[X3] = 0;
|
|
|
|
private->trans_info[Y3] = 0;
|
|
|
|
|
|
|
|
/* assemble the transformation matrix */
|
2000-02-15 00:29:41 +08:00
|
|
|
gimp_matrix3_identity (private->transform);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
return tool;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1999-04-03 03:46:59 +08:00
|
|
|
tools_free_perspective_tool (Tool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
transform_core_free (tool);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1999-04-03 03:46:59 +08:00
|
|
|
perspective_info_update (Tool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
TransformCore *transform_core;
|
|
|
|
gint i;
|
1998-08-14 04:19:09 +08:00
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++)
|
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
gchar *p = matrix_row_buf[i];
|
|
|
|
gint j;
|
1998-08-14 04:19:09 +08:00
|
|
|
|
|
|
|
for (j = 0; j < 3; j++)
|
|
|
|
{
|
1999-04-05 20:48:48 +08:00
|
|
|
p += g_snprintf (p, MAX_INFO_BUF - (p - matrix_row_buf[i]),
|
|
|
|
"%10.3g", transform_core->transform[i][j]);
|
1998-08-14 04:19:09 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
info_dialog_update (transform_info);
|
|
|
|
info_dialog_popup (transform_info);
|
2000-01-05 19:18:38 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-03-19 06:35:31 +08:00
|
|
|
static void
|
2000-12-31 12:07:42 +08:00
|
|
|
perspective_tool_motion (Tool *tool,
|
|
|
|
GDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
TransformCore *transform_core;
|
|
|
|
gint diff_x, diff_y;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
|
|
|
diff_x = transform_core->curx - transform_core->lastx;
|
|
|
|
diff_y = transform_core->cury - transform_core->lasty;
|
|
|
|
|
|
|
|
switch (transform_core->function)
|
|
|
|
{
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_HANDLE_1:
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info [X0] += diff_x;
|
|
|
|
transform_core->trans_info [Y0] += diff_y;
|
|
|
|
break;
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_HANDLE_2:
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info [X1] += diff_x;
|
|
|
|
transform_core->trans_info [Y1] += diff_y;
|
|
|
|
break;
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_HANDLE_3:
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info [X2] += diff_x;
|
|
|
|
transform_core->trans_info [Y2] += diff_y;
|
|
|
|
break;
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_HANDLE_4:
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info [X3] += diff_x;
|
|
|
|
transform_core->trans_info [Y3] += diff_y;
|
|
|
|
break;
|
2000-01-05 19:18:38 +08:00
|
|
|
default:
|
|
|
|
break;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
static void
|
2000-12-31 12:07:42 +08:00
|
|
|
perspective_tool_recalc (Tool *tool,
|
|
|
|
GDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
TransformCore *transform_core;
|
2000-02-15 00:29:41 +08:00
|
|
|
GimpMatrix3 m;
|
2000-01-05 19:18:38 +08:00
|
|
|
gdouble cx, cy;
|
|
|
|
gdouble scalex, scaley;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
|
|
|
/* determine the perspective transform that maps from
|
|
|
|
* the unit cube to the trans_info coordinates
|
|
|
|
*/
|
|
|
|
perspective_find_transform (transform_core->trans_info, m);
|
|
|
|
|
|
|
|
cx = transform_core->x1;
|
|
|
|
cy = transform_core->y1;
|
|
|
|
scalex = 1.0;
|
|
|
|
scaley = 1.0;
|
2000-01-05 19:18:38 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
if (transform_core->x2 - transform_core->x1)
|
|
|
|
scalex = 1.0 / (transform_core->x2 - transform_core->x1);
|
|
|
|
if (transform_core->y2 - transform_core->y1)
|
|
|
|
scaley = 1.0 / (transform_core->y2 - transform_core->y1);
|
|
|
|
|
|
|
|
/* assemble the transformation matrix */
|
2000-02-15 00:29:41 +08:00
|
|
|
gimp_matrix3_identity (transform_core->transform);
|
|
|
|
gimp_matrix3_translate (transform_core->transform, -cx, -cy);
|
|
|
|
gimp_matrix3_scale (transform_core->transform, scalex, scaley);
|
|
|
|
gimp_matrix3_mult (m, transform_core->transform);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* transform the bounding box */
|
2000-01-05 19:18:38 +08:00
|
|
|
transform_core_transform_bounding_box (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* update the information dialog */
|
|
|
|
perspective_info_update (tool);
|
|
|
|
}
|
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
void
|
2000-02-15 00:29:41 +08:00
|
|
|
perspective_find_transform (gdouble *coords,
|
|
|
|
GimpMatrix3 matrix)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
gdouble dx1, dx2, dx3, dy1, dy2, dy3;
|
|
|
|
gdouble det1, det2;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
dx1 = coords[X1] - coords[X3];
|
|
|
|
dx2 = coords[X2] - coords[X3];
|
|
|
|
dx3 = coords[X0] - coords[X1] + coords[X3] - coords[X2];
|
|
|
|
|
|
|
|
dy1 = coords[Y1] - coords[Y3];
|
|
|
|
dy2 = coords[Y2] - coords[Y3];
|
|
|
|
dy3 = coords[Y0] - coords[Y1] + coords[Y3] - coords[Y2];
|
|
|
|
|
|
|
|
/* Is the mapping affine? */
|
|
|
|
if ((dx3 == 0.0) && (dy3 == 0.0))
|
|
|
|
{
|
2000-01-05 19:18:38 +08:00
|
|
|
matrix[0][0] = coords[X1] - coords[X0];
|
|
|
|
matrix[0][1] = coords[X3] - coords[X1];
|
|
|
|
matrix[0][2] = coords[X0];
|
|
|
|
matrix[1][0] = coords[Y1] - coords[Y0];
|
|
|
|
matrix[1][1] = coords[Y3] - coords[Y1];
|
|
|
|
matrix[1][2] = coords[Y0];
|
|
|
|
matrix[2][0] = 0.0;
|
|
|
|
matrix[2][1] = 0.0;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
det1 = dx3 * dy2 - dy3 * dx2;
|
|
|
|
det2 = dx1 * dy2 - dy1 * dx2;
|
2000-01-05 19:18:38 +08:00
|
|
|
matrix[2][0] = det1 / det2;
|
1997-11-25 06:05:25 +08:00
|
|
|
det1 = dx1 * dy3 - dy1 * dx3;
|
|
|
|
det2 = dx1 * dy2 - dy1 * dx2;
|
2000-01-05 19:18:38 +08:00
|
|
|
matrix[2][1] = det1 / det2;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
matrix[0][0] = coords[X1] - coords[X0] + matrix[2][0] * coords[X1];
|
|
|
|
matrix[0][1] = coords[X2] - coords[X0] + matrix[2][1] * coords[X2];
|
|
|
|
matrix[0][2] = coords[X0];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
matrix[1][0] = coords[Y1] - coords[Y0] + matrix[2][0] * coords[Y1];
|
|
|
|
matrix[1][1] = coords[Y2] - coords[Y0] + matrix[2][1] * coords[Y2];
|
|
|
|
matrix[1][2] = coords[Y0];
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
matrix[2][2] = 1.0;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
TileManager *
|
1999-04-03 03:46:59 +08:00
|
|
|
perspective_tool_perspective (GImage *gimage,
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
TileManager *float_tiles,
|
2000-01-05 19:18:38 +08:00
|
|
|
gboolean interpolation,
|
2000-02-15 00:29:41 +08:00
|
|
|
GimpMatrix3 matrix)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2000-12-31 13:31:43 +08:00
|
|
|
GimpProgress *progress;
|
|
|
|
TileManager *ret;
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
|
|
|
|
progress = progress_start (gdisp, _("Perspective..."), FALSE, NULL, NULL);
|
|
|
|
|
|
|
|
ret = transform_core_do (gimage, drawable, float_tiles,
|
|
|
|
interpolation, matrix,
|
2000-02-21 19:54:33 +08:00
|
|
|
progress ? progress_update_and_flush :
|
2000-12-31 13:31:43 +08:00
|
|
|
(GimpProgressFunc) NULL,
|
2000-01-05 19:18:38 +08:00
|
|
|
progress);
|
|
|
|
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk>
Bit of a large checkin this - it's basically three things:
1 - GimpModules using gmodules to dynamically load and
initialise modules at gimp start of day.
2 - Color selectors now register themselves with a color
notebook.
3 - progress bars have been cleaned up a bit, so now have
progress indictations on all transform tool and gradient
fill operations. Not done bucket fill, but that seems to
be the next candidate.
New directories:
* modules/: new directory for dynamically loadable modules.
New files:
* modules/.cvsignore
* modules/Makefile.am
* modules/colorsel_gtk.c: GTK color selector wrapped up as a
color selector the gimp can use.
* app/gimpprogress.[ch]: progress bars within gimp core, either as
popups, or in the status bar. This is mainly code moved out
of plug-in.c
* app/color_notebook.[ch]: color selector notebook, implementing
very similar interface to color_select.h so it can be used as
a drop-in replacement for it.
* libgimp/color_selector.h: API color selectors need to implement
to become a page in the color_notebook.
* libgimp/gimpmodule.h: API gimp modules need to implement to be
initialised by gimp at start of day.
Modified files:
* Makefile.am: add modules/ to SUBDIRS
* libgimp/Makefile.am: install gimpmodule.h and color_selector.h
* app/gimprc.[ch]: recognise module-path variable.
* gimprc.in: set module-path variable to something sensible
(currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules").
* app/Makefile.am: build color notebook and gimpprogress
* app/app_procs.c: register internal GIMP color selector with
color notebook.
* app/asupsample.c: call progress function less frequently for
better performance.
* app/asupsample.h: progress_func_t typedef moved to gimpprogress.h
* app/blend.c: make callbacks to a progress function
* app/color_area.c: use a color notebook rather than a color selector
* app/color_panel.c: ditto
* app/color_select.c: export color selector interface for notebook
* app/color_select.h: color_select_init() prototype
* app/flip_tool.c: flip the image every time, rather than every
second click.
* app/interface.c: move progress bar stuff out to
gimpprogress.c. Make the code actually work while we're at it.
* app/interface.h: move prototypes for progress functions out to
gimpprogress.h
* app/plug_in.c: load and initialise modules (if possible). Move
progress bar handling code out to gimpprogress.c
* app/plug_in.h: keep only a gimp_progress * for each plugin, not
a whole bunch of GtkWidgets.
* app/scale_tool.c
* app/rotate_tool.c
* app/shear_tool.c
* app/perspective_tool.c: progress bar during operation.
De-sensitise the dialog to discourage the user from running
two transforms in parallel.
* app/transform_core.c: recalculate grid coords when bounding box
changes. Only initialise the action area of the dialog once,
to avoid multiple "ok" / "reset" buttons appearing. Undraw
transform tool with correct matrix to get rid of handle
remains on screen. Call a progress function as we apply the
transform matrix. A few new i18n markups. Invalidate
floating selection marching ants after applying matrix.
* app/transform_core.h: transform_core_do() takes an optional
progress callback argument (and data).
* plug-ins/oilify/oilify.c: send progress bar updates after every
pixel region, not only if they processed a multiple of 5
pixels (which was quite unlikely, and therefore gave a jerky
progress indication).
1999-01-11 08:57:33 +08:00
|
|
|
if (progress)
|
|
|
|
progress_end (progress);
|
|
|
|
|
|
|
|
return ret;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|