[gimp/soc-2013-n-point-deformation-tool: 1/23] app: add NPD tool basics



commit c5d0113f15125cfe5fa28706e8d8ad7190e74e0d
Author: Marek Dvoroznak <dvoromar gmail com>
Date:   Wed Jul 31 00:45:19 2013 +0200

    app: add NPD tool basics

 app/tools/Makefile.am                              |    4 +
 app/tools/gimp-tools.c                             |    2 +
 app/tools/gimpnpointdeformationoptions.c           |   94 ++++
 app/tools/gimpnpointdeformationoptions.h           |   54 ++
 app/tools/gimpnpointdeformationtool.c              |  530 ++++++++++++++++++++
 app/tools/gimpnpointdeformationtool.h              |   83 +++
 app/widgets/gimphelp-ids.h                         |    1 +
 libgimpwidgets/gimpstock.c                         |    3 +
 libgimpwidgets/gimpstock.h                         |    1 +
 menus/image-menu.xml.in                            |    1 +
 themes/Default/images/Makefile.am                  |    2 +
 .../tools/stock-tool-n-point-deformation-16.png    |  Bin 0 -> 1083 bytes
 .../tools/stock-tool-n-point-deformation-22.png    |  Bin 0 -> 1626 bytes
 13 files changed, 775 insertions(+), 0 deletions(-)
---
diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am
index d5fcd17..dcdacde 100644
--- a/app/tools/Makefile.am
+++ b/app/tools/Makefile.am
@@ -132,6 +132,10 @@ libapptools_a_sources = \
        gimpmoveoptions.h               \
        gimpmovetool.c                  \
        gimpmovetool.h                  \
+       gimpnpointdeformationoptions.c  \
+       gimpnpointdeformationoptions.h  \
+       gimpnpointdeformationtool.c     \
+       gimpnpointdeformationtool.h     \
        gimppaintbrushtool.c            \
        gimppaintbrushtool.h            \
        gimppaintoptions-gui.c          \
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
index fdea9f0..59ae520 100644
--- a/app/tools/gimp-tools.c
+++ b/app/tools/gimp-tools.c
@@ -70,6 +70,7 @@
 #include "gimpmagnifytool.h"
 #include "gimpmeasuretool.h"
 #include "gimpmovetool.h"
+#include "gimpnpointdeformationtool.h"
 #include "gimppaintbrushtool.h"
 #include "gimppenciltool.h"
 #include "gimpperspectiveclonetool.h"
@@ -154,6 +155,7 @@ gimp_tools_init (Gimp *gimp)
 
     /*  transform tools  */
 
+    gimp_n_point_deformation_tool_register,
     gimp_warp_tool_register,
     gimp_cage_tool_register,
     gimp_flip_tool_register,
diff --git a/app/tools/gimpnpointdeformationoptions.c b/app/tools/gimpnpointdeformationoptions.c
new file mode 100644
index 0000000..c7408c5
--- /dev/null
+++ b/app/tools/gimpnpointdeformationoptions.c
@@ -0,0 +1,94 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationoptions.h
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpconfig/gimpconfig.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "gimpnpointdeformationoptions.h"
+#include "gimptooloptions-gui.h"
+
+#include "gimp-intl.h"
+
+
+static void   gimp_n_point_deformation_options_set_property (GObject      *object,
+                                                             guint         property_id,
+                                                             const GValue *value,
+                                                             GParamSpec   *pspec);
+static void   gimp_n_point_deformation_options_get_property (GObject      *object,
+                                                             guint         property_id,
+                                                             GValue       *value,
+                                                             GParamSpec   *pspec);
+
+
+G_DEFINE_TYPE (GimpNPointDeformationOptions, gimp_n_point_deformation_options,
+               GIMP_TYPE_TOOL_OPTIONS)
+
+#define parent_class gimp_n_point_deformation_options_parent_class
+
+
+static void
+gimp_n_point_deformation_options_class_init (GimpNPointDeformationOptionsClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = gimp_n_point_deformation_options_set_property;
+  object_class->get_property = gimp_n_point_deformation_options_get_property;
+
+}
+
+static void
+gimp_n_point_deformation_options_init (GimpNPointDeformationOptions *options)
+{
+}
+
+static void
+gimp_n_point_deformation_options_set_property (GObject      *object,
+                                               guint         property_id,
+                                               const GValue *value,
+                                               GParamSpec   *pspec)
+{
+//  GimpNPointDeformationOptions *options = GIMP_N_POINT_DEFORMATION_OPTIONS (object);
+
+}
+
+static void
+gimp_n_point_deformation_options_get_property (GObject    *object,
+                                               guint       property_id,
+                                               GValue     *value,
+                                               GParamSpec *pspec)
+{
+//  GimpNPointDeformationOptions *options = GIMP_N_POINT_DEFORMATION_OPTIONS (object);
+}
+
+GtkWidget *
+gimp_n_point_deformation_options_gui (GimpToolOptions *tool_options)
+{
+//  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
+
+  return vbox;
+}
+
diff --git a/app/tools/gimpnpointdeformationoptions.h b/app/tools/gimpnpointdeformationoptions.h
new file mode 100644
index 0000000..3e7ef45
--- /dev/null
+++ b/app/tools/gimpnpointdeformationoptions.h
@@ -0,0 +1,54 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationoptions.h
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_N_POINT_DEFORMATION_OPTIONS_H__
+#define __GIMP_N_POINT_DEFORMATION_OPTIONS_H__
+
+
+#include "core/gimptooloptions.h"
+
+
+#define GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS            (gimp_n_point_deformation_options_get_type ())
+#define GIMP_N_POINT_DEFORMATION_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS, GimpNPointDeformationOptions))
+#define GIMP_N_POINT_DEFORMATION_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS, GimpNPointDeformationOptionsClass))
+#define GIMP_IS_N_POINT_DEFORMATION_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS))
+#define GIMP_IS_N_POINT_DEFORMATION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS))
+#define GIMP_N_POINT_DEFORMATION_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS, GimpNPointDeformationOptionsClass))
+
+
+typedef struct _GimpNPointDeformationOptions      GimpNPointDeformationOptions;
+typedef struct _GimpNPointDeformationOptionsClass GimpNPointDeformationOptionsClass;
+
+struct _GimpNPointDeformationOptions
+{
+  GimpToolOptions  parent_instance;
+};
+
+struct _GimpNPointDeformationOptionsClass
+{
+  GimpToolOptionsClass  parent_class;
+};
+
+
+GType       gimp_n_point_deformation_options_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_n_point_deformation_options_gui      (GimpToolOptions *tool_options);
+
+
+#endif  /*  __GIMP_N_POINT_DEFORMATION_OPTIONS_H__  */
diff --git a/app/tools/gimpnpointdeformationtool.c b/app/tools/gimpnpointdeformationtool.c
new file mode 100644
index 0000000..60c30ab
--- /dev/null
+++ b/app/tools/gimpnpointdeformationtool.c
@@ -0,0 +1,530 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationtool.c
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "tools-types.h"
+
+#include "display/gimpdisplay.h"
+
+#include "core/gimp.h"
+#include "core/gimpdrawable.h"
+#include "core/gimpdrawable-shadow.h"
+#include "core/gimpdrawable-private.h"
+#include "core/gimpimage.h"
+#include "core/core-types.h"
+#include "core/gimpimagemap.h"
+#include "core/gimpprojection.h"
+
+#include "widgets/gimphelp-ids.h"
+#include "widgets/gimpwidgets-utils.h"
+
+#include "gimptooloptions-gui.h"
+#include "gimptoolcontrol.h"
+
+#include "gimpnpointdeformationtool.h"
+#include "gimpnpointdeformationoptions.h"
+
+#include "gimp-intl.h"
+
+//#include <npd/npd_common.h>
+
+void            gimp_n_point_deformation_tool_start                   (GimpNPointDeformationTool *npd_tool,
+                                                                       GimpDisplay               *display);
+void            gimp_n_point_deformation_tool_halt                    (GimpNPointDeformationTool *npd_tool);
+static void     gimp_n_point_deformation_tool_options_notify          (GimpTool                  *tool,
+                                                                       GimpToolOptions           *options,
+                                                                       const GParamSpec          *pspec);
+static void     gimp_n_point_deformation_tool_button_press            (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       guint32                    time,
+                                                                       GdkModifierType            state,
+                                                                       GimpButtonPressType        press_type,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_button_release          (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       guint32                    time,
+                                                                       GdkModifierType            state,
+                                                                       GimpButtonReleaseType      
release_type,
+                                                                       GimpDisplay               *display);
+static gboolean gimp_n_point_deformation_tool_key_press               (GimpTool                  *tool,
+                                                                       GdkEventKey               *kevent,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_modifier_key            (GimpTool                  *tool,
+                                                                       GdkModifierType            key,
+                                                                       gboolean                   press,
+                                                                       GdkModifierType            state,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_cursor_update           (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       GdkModifierType            state,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_draw                    (GimpDrawTool              *draw_tool);
+
+//static void     gimp_n_point_deformation_add_handle                   (GimpNPointDeformationTool *npd_tool,
+//                                                                       NPDPoint                  *coords);
+static void     gimp_n_point_deformation_tool_control                 (GimpTool                  *tool,
+                                                                       GimpToolAction             action,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_oper_update             (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       GdkModifierType            state,
+                                                                       gboolean                   proximity,
+                                                                       GimpDisplay               *display);
+static void     gimp_n_point_deformation_tool_motion                  (GimpTool                  *tool,
+                                                                       const GimpCoords          *coords,
+                                                                       guint32                    time,
+                                                                       GdkModifierType            state,
+                                                                       GimpDisplay               *display);
+
+G_DEFINE_TYPE (GimpNPointDeformationTool, gimp_n_point_deformation_tool, GIMP_TYPE_DRAW_TOOL)
+
+#define parent_class gimp_n_point_deformation_tool_parent_class
+
+
+void
+gimp_n_point_deformation_tool_register (GimpToolRegisterCallback  callback,
+                                        gpointer                  data)
+{
+  (* callback) (GIMP_TYPE_N_POINT_DEFORMATION_TOOL,
+                GIMP_TYPE_N_POINT_DEFORMATION_OPTIONS,
+                gimp_n_point_deformation_options_gui,
+                0,
+                "gimp-n-point-deformation-tool",
+                _("N-Point Deformation"),
+                _("N-Point Deformation Tool: Deform image using points"),
+                N_("_N-Point Deformation"), "<shift>N",
+                NULL, GIMP_HELP_TOOL_N_POINT_DEFORMATION,
+                GIMP_STOCK_TOOL_N_POINT_DEFORMATION,
+                data);
+}
+
+static void
+gimp_n_point_deformation_tool_class_init (GimpNPointDeformationToolClass *klass)
+{
+  GimpToolClass     *tool_class      = GIMP_TOOL_CLASS (klass);
+  GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
+
+  tool_class->options_notify = gimp_n_point_deformation_tool_options_notify;
+  tool_class->button_press   = gimp_n_point_deformation_tool_button_press;
+  tool_class->button_release = gimp_n_point_deformation_tool_button_release;
+  tool_class->key_press      = gimp_n_point_deformation_tool_key_press;
+  tool_class->modifier_key   = gimp_n_point_deformation_tool_modifier_key;
+  tool_class->control        = gimp_n_point_deformation_tool_control;
+  tool_class->motion         = gimp_n_point_deformation_tool_motion;
+  tool_class->oper_update    = gimp_n_point_deformation_tool_oper_update;
+  tool_class->cursor_update  = gimp_n_point_deformation_tool_cursor_update;
+  
+  draw_tool_class->draw      = gimp_n_point_deformation_tool_draw;
+}
+
+static void
+gimp_n_point_deformation_tool_init (GimpNPointDeformationTool *npd_tool)
+{
+  GimpTool      *tool       = GIMP_TOOL (npd_tool);
+
+  gimp_tool_control_set_tool_cursor  (tool->control,
+                                      GIMP_TOOL_CURSOR_PERSPECTIVE);
+  gimp_tool_control_set_preserve     (tool->control, FALSE);
+  gimp_tool_control_set_wants_click  (tool->control, TRUE);
+  gimp_tool_control_set_wants_double_click  (tool->control, TRUE);
+  gimp_tool_control_set_scroll_lock  (tool->control, TRUE);
+  gimp_tool_control_set_handle_empty_image (tool->control, FALSE);
+  gimp_tool_control_set_dirty_mask   (tool->control,
+                                      GIMP_DIRTY_IMAGE           |
+                                      GIMP_DIRTY_IMAGE_STRUCTURE |
+                                      GIMP_DIRTY_DRAWABLE        |
+                                      GIMP_DIRTY_SELECTION       |
+                                      GIMP_DIRTY_ACTIVE_DRAWABLE);
+  
+  npd_tool->active = FALSE;
+//  npd_tool->selected_cp = NULL;
+//  npd_tool->hovering_cp = NULL;
+  npd_tool->selected_cps = NULL;
+  npd_tool->previous_cp_positions = NULL;
+}
+
+static void
+gimp_n_point_deformation_tool_control (GimpTool       *tool,
+                                       GimpToolAction  action,
+                                       GimpDisplay    *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+  
+  switch (action)
+    {
+    case GIMP_TOOL_ACTION_PAUSE:
+      break;
+    case GIMP_TOOL_ACTION_RESUME:
+      break;
+
+    case GIMP_TOOL_ACTION_HALT:
+      gimp_n_point_deformation_tool_halt (npd_tool);
+      break;
+    }
+
+  GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
+}
+
+void
+gimp_n_point_deformation_tool_start (GimpNPointDeformationTool *npd_tool,
+                                     GimpDisplay  *display)
+{
+  GimpTool      *tool       = GIMP_TOOL (npd_tool);
+  GimpDrawTool  *draw_tool  = GIMP_DRAW_TOOL (npd_tool);
+  GeglNode      *graph;
+  GeglNode      *node;
+  GeglNode      *source;
+  GeglNode      *sink;
+  GimpImage     *image;
+  GimpDrawable  *drawable;
+  GeglBuffer    *buf;
+  GeglBuffer    *shadow;
+//  NPDModel      *model;
+  
+  g_return_if_fail (GIMP_IS_N_POINT_DEFORMATION_TOOL (npd_tool));
+  
+  gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
+  
+  tool->display = display;
+  gimp_draw_tool_start (draw_tool, display);
+  
+  npd_tool->active = TRUE;  
+
+  image    = gimp_display_get_image (display);
+  drawable = gimp_image_get_active_drawable (image);
+  buf      = drawable->private->buffer;
+  
+  shadow   = gegl_buffer_new (gegl_buffer_get_extent (buf), gegl_buffer_get_format(buf));
+  
+  graph    = gegl_node_new ();
+
+  source   = gegl_node_new_child (graph, "operation", "gegl:buffer-source",
+                                       "buffer", buf,
+                                       NULL);
+  node     = gegl_node_new_child (graph, "operation", "gegl:npd", NULL);
+
+  sink     = gegl_node_new_child (graph, "operation", "gegl:write-buffer",
+                                      "buffer", shadow,
+                                      NULL);
+
+  gegl_node_link_many (source, node, sink, NULL);
+  
+  gegl_node_process (sink);
+  
+//  gegl_node_get (node, "model", &model, NULL);
+  gegl_node_set (node, "rigidity", 2000, NULL);
+  
+  npd_tool->buf = buf;
+  npd_tool->drawable = drawable;
+  npd_tool->graph = graph;
+//  npd_tool->model = model;
+  npd_tool->node = node;
+  npd_tool->shadow = shadow;
+  npd_tool->sink = sink;
+//  npd_tool->selected_cp = NULL;
+}
+
+void
+gimp_n_point_deformation_tool_halt (GimpNPointDeformationTool *npd_tool)
+{
+  GimpTool     *tool      = GIMP_TOOL (npd_tool);
+  GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (npd_tool);
+  
+  if (gimp_draw_tool_is_active (draw_tool))
+    gimp_draw_tool_stop (draw_tool);
+  
+  if (gimp_tool_control_is_active (tool->control))
+    gimp_tool_control_halt (tool->control);  
+  
+  tool->display = NULL;
+}
+
+static void
+gimp_n_point_deformation_tool_options_notify (GimpTool         *tool,
+                                              GimpToolOptions  *options,
+                                              const GParamSpec *pspec)
+{
+}
+
+static gboolean
+gimp_n_point_deformation_tool_key_press (GimpTool    *tool,
+                                         GdkEventKey *kevent,
+                                         GimpDisplay *display)
+{
+  switch (kevent->keyval)
+    {
+    case GDK_KEY_BackSpace:
+      return TRUE;
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
+    case GDK_KEY_ISO_Enter:
+    case GDK_KEY_Escape:
+      return TRUE;
+
+    default:
+      return FALSE;
+  }
+}
+
+static void
+gimp_n_point_deformation_tool_modifier_key (GimpTool        *tool,
+                                            GdkModifierType  key,
+                                            gboolean         press,
+                                            GdkModifierType  state,
+                                            GimpDisplay     *display)
+{
+}
+
+static void
+gimp_n_point_deformation_tool_cursor_update (GimpTool         *tool,
+                                             const GimpCoords *coords,
+                                             GdkModifierType   state,
+                                             GimpDisplay      *display)
+{
+}
+
+static void
+gimp_n_point_deformation_tool_button_press (GimpTool            *tool,
+                                            const GimpCoords    *coords,
+                                            guint32              time,
+                                            GdkModifierType      state,
+                                            GimpButtonPressType  press_type,
+                                            GimpDisplay         *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+//  NPDModel                  *model;
+//  NPDPoint                   p;
+//  NPDControlPoint           *cp;
+//  GSList                   **selected_cps = &npd_tool->selected_cps;
+//  GSList                   **previous_cp_positions = &npd_tool->previous_cp_positions;
+  
+  if (display != tool->display)
+    {
+      gimp_n_point_deformation_tool_start (npd_tool, display);
+    }
+  
+//  model = npd_tool->model;
+  
+  gimp_tool_control_activate (tool->control);
+  
+//  npd_tool->selected_cp = NULL;
+  
+  if (press_type == GIMP_BUTTON_PRESS_NORMAL)
+    {
+//      p.x = coords->x; p.y = coords->y;
+//      cp = npd_get_control_point_at (model, &p);
+      
+//      if (cp == NULL || (cp != NULL && !g_slist_find (*selected_cps, cp) && !(state & GDK_SHIFT_MASK)))
+//        {
+//          g_slist_free (*selected_cps);
+//          *selected_cps = NULL;
+//          g_slist_free_full (*previous_cp_positions, g_free);
+//          *previous_cp_positions = NULL;
+//        }
+//      
+//      
+//      if (cp != NULL)
+//        {
+//          NPDPoint *cp_point_copy = g_new (NPDPoint, 1);
+//          *cp_point_copy = cp->point;
+        
+//          npd_tool->selected_cp = cp;
+//          npd_tool->delta_x = cp->point.x - coords->x;
+//          npd_tool->delta_y = cp->point.y - coords->y;
+//          *selected_cps = g_slist_append (*selected_cps, cp);
+//          *previous_cp_positions = g_slist_append (*previous_cp_positions, cp_point_copy);
+//        }
+      
+      
+      npd_tool->movement_start_x = coords->x;
+      npd_tool->movement_start_y = coords->y;
+    }
+}
+
+static void
+gimp_n_point_deformation_tool_button_release (GimpTool             *tool,
+                                              const GimpCoords     *coords,
+                                              guint32               time,
+                                              GdkModifierType       state,
+                                              GimpButtonReleaseType release_type,
+                                              GimpDisplay           *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+//  NPDModel                  *model = npd_tool->model;
+//  NPDPoint                   p;
+//  NPDControlPoint           *cp;
+  GeglBuffer                *buffer;
+  
+  gimp_tool_control_halt (tool->control);
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (npd_tool));
+  
+  if (release_type == GIMP_BUTTON_RELEASE_CLICK)
+    {
+//      p.x = coords->x; p.y = coords->y;
+//      cp = npd_get_control_point_at (model, &p);
+//      if (cp != NULL)
+//        {
+//          gimp_n_point_deformation_add_handle (npd_tool, &p);
+//        }
+    }
+  else
+  if (release_type == GIMP_BUTTON_RELEASE_NORMAL)
+    {
+    }
+  else
+  if (release_type == GIMP_BUTTON_RELEASE_CANCEL)
+    {
+    }
+
+  buffer = npd_tool->drawable->private->buffer;
+  
+  gegl_node_invalidated (npd_tool->node, NULL, FALSE);
+
+  gegl_node_process (npd_tool->sink);  
+  gegl_buffer_copy (npd_tool->shadow, NULL,
+                    npd_tool->buf, NULL);
+  gimp_drawable_update (npd_tool->drawable,
+                        0,
+                        0,
+                        gegl_buffer_get_width (buffer),
+                        gegl_buffer_get_height (buffer));
+  gimp_image_flush (gimp_display_get_image (display));
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (npd_tool));  
+}
+
+static void
+gimp_n_point_deformation_tool_oper_update (GimpTool         *tool,
+                                           const GimpCoords *coords,
+                                           GdkModifierType   state,
+                                           gboolean          proximity,
+                                           GimpDisplay      *display)
+{
+  GimpNPointDeformationTool *npd_tool  = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+  GimpDrawTool              *draw_tool = GIMP_DRAW_TOOL (tool);
+  
+  if (npd_tool->active)
+    {
+//      NPDModel *model = npd_tool->model;
+//      NPDPoint p;
+//      p.x = coords->x; p.y = coords->y;
+//      npd_tool->hovering_cp = npd_get_control_point_at (model, &p);
+    }
+  
+  gimp_draw_tool_pause (draw_tool);
+
+  npd_tool->cursor_x = coords->x;
+  npd_tool->cursor_y = coords->y;
+
+  gimp_draw_tool_resume (draw_tool);  
+}
+
+//static void
+//gimp_n_point_deformation_add_handle (GimpNPointDeformationTool *npd_tool,
+//                                     NPDPoint *coords)
+//{
+//  NPDModel *model = npd_tool->model;
+//  npd_add_control_point (model, coords);
+//}
+
+static void
+gimp_n_point_deformation_tool_draw (GimpDrawTool *draw_tool)
+{
+//  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (draw_tool);
+//  NPDModel                  *model = npd_tool->model;
+//  gint                       i;
+//  NPDControlPoint           *cp;
+//  GimpHandleType             handle_type;
+
+//  g_return_if_fail (model != NULL);
+  
+//  for (i = 0; i < model->control_points->len; i++)
+//    {
+//      cp = &g_array_index (model->control_points, NPDControlPoint, i);
+//      
+//      if (cp == npd_tool->hovering_cp)
+//        handle_type = GIMP_HANDLE_FILLED_CIRCLE;
+//      else
+//        handle_type = GIMP_HANDLE_CIRCLE;
+//
+//      gimp_draw_tool_add_handle (draw_tool,
+//                                 handle_type,
+//                                 cp->point.x,
+//                                 cp->point.y,
+//                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+//                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+//                                 GIMP_HANDLE_ANCHOR_CENTER);
+//
+//      if (g_slist_find (npd_tool->selected_cps, cp) != NULL)
+//        {
+//          gimp_draw_tool_add_handle (draw_tool,
+//                                     GIMP_HANDLE_SQUARE,
+//                                     cp->point.x,
+//                                     cp->point.y,
+//                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+//                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+//                                     GIMP_HANDLE_ANCHOR_CENTER);
+//        }
+//    }
+
+}
+
+static void
+gimp_n_point_deformation_tool_motion (GimpTool         *tool,
+                                      const GimpCoords *coords,
+                                      guint32           time,
+                                      GdkModifierType   state,
+                                      GimpDisplay      *display)
+{
+  GimpNPointDeformationTool *npd_tool = GIMP_N_POINT_DEFORMATION_TOOL (tool);
+//  NPDControlPoint           *selected_cp = npd_tool->selected_cp;
+//  GSList                    *selected_cps = npd_tool->selected_cps;
+//  GSList                    *previous_cp_positions = npd_tool->previous_cp_positions;
+//  gdouble                    movement_x = coords->x - npd_tool->movement_start_x;
+//  gdouble                    movement_y = coords->y - npd_tool->movement_start_y;
+
+  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
+
+//  if (selected_cp != NULL)
+//    {
+//      while (selected_cps != NULL)
+//        {
+//          NPDControlPoint *cp = selected_cps->data;
+//          NPDPoint *p = &cp->point;
+//          NPDPoint *prev = previous_cp_positions->data;
+//          p->x = prev->x + movement_x;
+//          p->y = prev->y + movement_y;
+//          
+//          selected_cps = g_slist_next (selected_cps);
+//          previous_cp_positions = g_slist_next (previous_cp_positions);
+//        }
+//    }
+  
+  npd_tool->cursor_x = coords->x;
+  npd_tool->cursor_y = coords->y;
+
+  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
+}
diff --git a/app/tools/gimpnpointdeformationtool.h b/app/tools/gimpnpointdeformationtool.h
new file mode 100644
index 0000000..d01c239
--- /dev/null
+++ b/app/tools/gimpnpointdeformationtool.h
@@ -0,0 +1,83 @@
+/* GIMP - The GNU Image Manipulation Program
+ *
+ * gimpnpointdeformationtool.h
+ * Copyright (C) 2013 Marek Dvoroznak <dvoromar gmail com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_N_POINT_DEFORMATION_TOOL_H__
+#define __GIMP_N_POINT_DEFORMATION_TOOL_H__
+
+
+#include "gimpdrawtool.h"
+//#include <npd/npd_common.h>
+
+
+#define GIMP_TYPE_N_POINT_DEFORMATION_TOOL            (gimp_n_point_deformation_tool_get_type ())
+#define GIMP_N_POINT_DEFORMATION_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GIMP_TYPE_N_POINT_DEFORMATION_TOOL, GimpNPointDeformationTool))
+#define GIMP_N_POINT_DEFORMATION_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), 
GIMP_TYPE_N_POINT_DEFORMATION_TOOL, GimpNPointDeformationToolClass))
+#define GIMP_IS_N_POINT_DEFORMATION_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GIMP_TYPE_N_POINT_DEFORMATION_TOOL))
+#define GIMP_IS_N_POINT_DEFORMATION_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GIMP_TYPE_N_POINT_DEFORMATION_TOOL))
+#define GIMP_N_POINT_DEFORMATION_TOOL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GIMP_TYPE_N_POINT_DEFORMATION_TOOL, GimpNPointDeformationToolClass))
+
+#define GIMP_N_POINT_DEFORMATION_TOOL_GET_OPTIONS(t)  (GIMP_N_POINT_DEFORMATION_OPTIONS 
(gimp_tool_get_options (GIMP_TOOL (t))))
+
+
+typedef struct _GimpNPointDeformationTool      GimpNPointDeformationTool;
+typedef struct _GimpNPointDeformationToolClass GimpNPointDeformationToolClass;
+
+struct _GimpNPointDeformationTool
+{
+  GimpDrawTool     parent_instance;
+  
+  GeglNode        *graph;
+  GeglNode        *node;
+  GeglNode        *sink;
+  
+  GeglBuffer      *shadow, *buf;
+  
+  GimpDrawable    *drawable;
+  
+//  NPDModel        *model;
+//  NPDControlPoint *selected_cp; /* last selected control point */
+  GSList          *selected_cps;   /* list of selected control points */
+//  NPDControlPoint *hovering_cp;
+  GSList          *previous_cp_positions; /* list of NPDPoints holding previous control points positions */
+
+  gdouble          movement_start_x;
+  gdouble          movement_start_y;
+  
+  gdouble          cursor_x;
+  gdouble          cursor_y;
+  
+//  gdouble        delta_x;
+//  gdouble        delta_y;
+  
+  gboolean         active;
+};
+
+struct _GimpNPointDeformationToolClass
+{
+  GimpDrawToolClass parent_class;
+};
+
+
+void    gimp_n_point_deformation_tool_register (GimpToolRegisterCallback  callback,
+                                                gpointer                  data);
+
+GType   gimp_n_point_deformation_tool_get_type (void) G_GNUC_CONST;
+
+
+#endif  /*  __GIMP_N_POINT_DEFORMATION_TOOL_H__  */
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index e3cd977..021d337 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -283,6 +283,7 @@
 #define GIMP_HELP_TOOL_LEVELS                     "gimp-tool-levels"
 #define GIMP_HELP_TOOL_MEASURE                    "gimp-tool-measure"
 #define GIMP_HELP_TOOL_MOVE                       "gimp-tool-move"
+#define GIMP_HELP_TOOL_N_POINT_DEFORMATION        "gimp-tool-n-point-deformation"
 #define GIMP_HELP_TOOL_PATH                       "gimp-tool-path"
 #define GIMP_HELP_TOOL_PAINTBRUSH                 "gimp-tool-paintbrush"
 #define GIMP_HELP_TOOL_PENCIL                     "gimp-tool-pencil"
diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c
index 53b335e..3b324ef 100644
--- a/libgimpwidgets/gimpstock.c
+++ b/libgimpwidgets/gimpstock.c
@@ -329,6 +329,7 @@ static const GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_TOOL_LEVELS,              NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_MEASURE,             NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_MOVE,                NULL,        0, 0, LIBGIMP_DOMAIN },
+  { GIMP_STOCK_TOOL_N_POINT_DEFORMATION, NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_PAINTBRUSH,          NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_PATH,                NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_TOOL_PENCIL,              NULL,        0, 0, LIBGIMP_DOMAIN },
@@ -487,6 +488,7 @@ gimp_stock_button_pixbufs[] =
   { GIMP_STOCK_TOOL_LEVELS,              stock_tool_levels_22              },
   { GIMP_STOCK_TOOL_MEASURE,             stock_tool_measure_22             },
   { GIMP_STOCK_TOOL_MOVE,                stock_tool_move_22                },
+  { GIMP_STOCK_TOOL_N_POINT_DEFORMATION, stock_tool_n_point_deformation_22 },
   { GIMP_STOCK_TOOL_PAINTBRUSH,          stock_tool_paintbrush_22          },
   { GIMP_STOCK_TOOL_PATH,                stock_tool_path_22                },
   { GIMP_STOCK_TOOL_PENCIL,              stock_tool_pencil_22              },
@@ -657,6 +659,7 @@ gimp_stock_menu_pixbufs[] =
   { GIMP_STOCK_TOOL_LEVELS,              stock_tool_levels_16              },
   { GIMP_STOCK_TOOL_MEASURE,             stock_tool_measure_16             },
   { GIMP_STOCK_TOOL_MOVE,                stock_tool_move_16                },
+  { GIMP_STOCK_TOOL_N_POINT_DEFORMATION, stock_tool_n_point_deformation_16 },
   { GIMP_STOCK_TOOL_PAINTBRUSH,          stock_tool_paintbrush_16          },
   { GIMP_STOCK_TOOL_PATH,                stock_tool_path_16                },
   { GIMP_STOCK_TOOL_PENCIL,              stock_tool_pencil_16              },
diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h
index 2f0d6d1..308acc5 100644
--- a/libgimpwidgets/gimpstock.h
+++ b/libgimpwidgets/gimpstock.h
@@ -129,6 +129,7 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_TOOL_LEVELS              "gimp-tool-levels"
 #define GIMP_STOCK_TOOL_MEASURE             "gimp-tool-measure"
 #define GIMP_STOCK_TOOL_MOVE                "gimp-tool-move"
+#define GIMP_STOCK_TOOL_N_POINT_DEFORMATION "gimp-tool-n-point-deformation"
 #define GIMP_STOCK_TOOL_PAINTBRUSH          "gimp-tool-paintbrush"
 #define GIMP_STOCK_TOOL_PATH                "gimp-tool-path"
 #define GIMP_STOCK_TOOL_PENCIL              "gimp-tool-pencil"
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 6b2e846..1b2bdc3 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -596,6 +596,7 @@
         <menuitem action="tools-flip" />
         <menuitem action="tools-cage" />
         <menuitem action="tools-warp" />
+        <menuitem action="tools-n-point-deformation" />
       </menu>
       <menu action="tools-color-menu" name="Color Tools">
         <menuitem action="tools-color-balance" />
diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am
index e6a06b1..9290343 100644
--- a/themes/Default/images/Makefile.am
+++ b/themes/Default/images/Makefile.am
@@ -321,6 +321,8 @@ STOCK_TOOL_IMAGES = \
        tools/stock-tool-measure-22.png                 \
        tools/stock-tool-move-16.png                    \
        tools/stock-tool-move-22.png                    \
+       tools/stock-tool-n-point-deformation-16.png     \
+       tools/stock-tool-n-point-deformation-22.png     \
        tools/stock-tool-paintbrush-16.png              \
        tools/stock-tool-paintbrush-22.png              \
        tools/stock-tool-path-16.png                    \
diff --git a/themes/Default/images/tools/stock-tool-n-point-deformation-16.png 
b/themes/Default/images/tools/stock-tool-n-point-deformation-16.png
new file mode 100644
index 0000000..6f78f88
Binary files /dev/null and b/themes/Default/images/tools/stock-tool-n-point-deformation-16.png differ
diff --git a/themes/Default/images/tools/stock-tool-n-point-deformation-22.png 
b/themes/Default/images/tools/stock-tool-n-point-deformation-22.png
new file mode 100644
index 0000000..0f3014d
Binary files /dev/null and b/themes/Default/images/tools/stock-tool-n-point-deformation-22.png differ



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]