gimp r24624 - in trunk: . app/display
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r24624 - in trunk: . app/display
- Date: Wed, 16 Jan 2008 10:42:49 +0000 (GMT)
Author: neo
Date: Wed Jan 16 10:42:49 2008
New Revision: 24624
URL: http://svn.gnome.org/viewvc/gimp?rev=24624&view=rev
Log:
2008-01-16 Sven Neumann <sven gimp org>
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpdisplayshell-coords.c: applied parts of a change
from Alexia Death. This improves the event smoothing (bug #508639).
Modified:
trunk/ChangeLog
trunk/app/display/gimpdisplayshell-callbacks.c
trunk/app/display/gimpdisplayshell-coords.c
Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c (original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c Wed Jan 16 10:42:49 2008
@@ -80,6 +80,9 @@
#include "gimp-intl.h"
+#define DEFAULT_EVENT_SMOOTHING 0.7
+
+
/* local function prototypes */
static void gimp_display_shell_vscrollbar_update (GtkAdjustment *adjustment,
@@ -597,18 +600,18 @@
GdkEvent *event,
GimpDisplayShell *shell)
{
- GimpDisplay *display;
- GimpImage *image;
- Gimp *gimp;
- GdkDisplay *gdk_display;
- GimpTool *active_tool;
- GimpCoords display_coords;
- GimpCoords image_coords;
- GdkModifierType state;
- guint32 time;
- gboolean device_changed = FALSE;
- gboolean return_val = FALSE;
- gboolean update_sw_cursor = FALSE;
+ GimpDisplay *display;
+ GimpImage *image;
+ Gimp *gimp;
+ GdkDisplay *gdk_display;
+ GimpTool *active_tool;
+ GimpCoords display_coords;
+ GimpCoords image_coords;
+ GdkModifierType state;
+ guint32 time;
+ gboolean device_changed = FALSE;
+ gboolean return_val = FALSE;
+ gboolean update_sw_cursor = FALSE;
g_return_val_if_fail (GTK_WIDGET_REALIZED (canvas), FALSE);
@@ -1241,10 +1244,10 @@
}
/* Early removal of useless events saves CPU time.
- * Defaulting smoothing to 0.4.
*/
if (gimp_display_shell_eval_event (shell,
- &image_coords, 0.4,
+ &image_coords,
+ DEFAULT_EVENT_SMOOTHING,
history_events[i]->time))
{
tool_manager_motion_active (gimp,
@@ -1252,12 +1255,9 @@
history_events[i]->time,
state,
display);
-
- shell->last_coords = image_coords;
- shell->last_disp_motion_time = history_events[i]->time;
}
- shell->last_read_motion_time=history_events[i]->time;
+ shell->last_read_motion_time = history_events[i]->time;
}
gdk_device_free_history (history_events, n_history_events);
@@ -1265,10 +1265,10 @@
else
{
/* Early removal of useless events saves CPU time.
- * Defaulting smoothing to 0.4.
*/
if (gimp_display_shell_eval_event (shell,
- &image_coords, 0.4,
+ &image_coords,
+ DEFAULT_EVENT_SMOOTHING,
time))
{
tool_manager_motion_active (gimp,
@@ -1276,12 +1276,9 @@
time,
state,
display);
-
- shell->last_coords = image_coords;
- shell->last_disp_motion_time = time;
}
- shell->last_read_motion_time=time;
+ shell->last_read_motion_time = time;
}
}
}
@@ -1290,18 +1287,14 @@
(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)))
{
/* Early removal of useless events saves CPU time.
- * Smoothing coasting to avoid unpredicted jumps when making contact.
- * This may need a different solution but cant properly test it without
- * adjustment.
+ * Smoothing is 0.0 here for coasting.
*/
- if (gimp_display_shell_eval_event (shell, &image_coords, 0.4, time))
+ if (gimp_display_shell_eval_event (shell, &image_coords, 0.0, time))
{
tool_manager_oper_update_active (gimp,
&image_coords, state,
shell->proximity,
display);
- shell->last_coords = image_coords;
- shell->last_disp_motion_time = time;
}
shell->last_read_motion_time = time;
Modified: trunk/app/display/gimpdisplayshell-coords.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-coords.c (original)
+++ trunk/app/display/gimpdisplayshell-coords.c Wed Jan 16 10:42:49 2008
@@ -212,10 +212,9 @@
gdouble inertia_factor,
guint32 time)
{
+ const gdouble smooth_factor = 0.3;
guint32 thistime = time;
gdouble dist;
- gdouble xy_sfactor = 0;
- const gdouble smooth_factor = 0.3;
if (shell->last_disp_motion_time == 0)
{
@@ -224,9 +223,7 @@
*/
coords->velocity = 100;
coords->delta_time = 0.001;
- coords->distance = 0;
-
- shell->last_coords = *coords;
+ coords->distance = 1;
}
else
{
@@ -253,41 +250,68 @@
}
else
{
-
- coords->velocity = (coords->distance / (gdouble) coords->delta_time) / 10;
+ coords->velocity =
+ (coords->distance / (gdouble) coords->delta_time) / 10;
/* A little smooth on this too, feels better in tools this way. */
coords->velocity = (shell->last_coords.velocity * (1 - smooth_factor)
- + coords->velocity * smooth_factor);
- /* Speed needs upper limit */
- coords->velocity=MIN(coords->velocity,1.0);
+ + coords->velocity * smooth_factor);
+ /* Speed needs upper limit */
+ coords->velocity = MIN (coords->velocity, 1.0);
}
if (inertia_factor > 0)
{
- /* Apply smoothing to X and Y.
- *
- * The very high velocity values (yes, thats around 25
- * according to tests) happen at great zoom outs and scream
- * for heavyhanded smooth so I made it automatic. This
- * should be bound to zoom level once theres a GUI foob to
- * adjust smooth or disabled completely.
- */
-
- /*Apply smoothing to X and Y.
- Smooth is dampened for high speeds to minimize the whip effect.*/
- xy_sfactor = inertia_factor - inertia_factor * fabs (coords->velocity);
- coords->x = shell->last_coords.x - (shell->last_coords.delta_x * xy_sfactor
- + coords->delta_x * (1 - xy_sfactor));
- coords->y = shell->last_coords.y - (shell->last_coords.delta_y * xy_sfactor
- + coords->delta_y * (1 - xy_sfactor));
-
- /* Recalculate distance */
- coords->distance = sqrt ((shell->last_coords.x - coords->x) *
- (shell->last_coords.x - coords->x) +
- (shell->last_coords.y - coords->y) *
- (shell->last_coords.y - coords->y));
+ /* Apply smoothing to X and Y. */
+ /* This tells how far from the pointer can stray from the line */
+ gdouble max_deviation = SQR (20 * inertia_factor);
+ gdouble cur_deviation = max_deviation;
+ gdouble sin_avg;
+ gdouble sin_old;
+ gdouble sin_new;
+ gdouble cos_avg;
+ gdouble cos_old;
+ gdouble cos_new;
+ gdouble new_x;
+ gdouble new_y;
+
+ sin_new = coords->delta_x / coords->distance;
+ sin_old = shell->last_coords.delta_x / shell->last_coords.distance;
+ sin_avg = sin (asin (sin_old) * inertia_factor +
+ asin (sin_new) * (1 - inertia_factor));
+
+ cos_new = coords->delta_y / coords->distance;
+ cos_old = shell->last_coords.delta_y / shell->last_coords.distance;
+ cos_avg = cos (acos (cos_old) * inertia_factor +
+ acos (cos_new) * (1 - inertia_factor));
+
+ coords->delta_x = sin_avg * coords->distance;
+ coords->delta_y = cos_avg * coords->distance;
+
+ new_x = (shell->last_coords.x - coords->delta_x) * 0.5 + coords->x * 0.5;
+ new_y = (shell->last_coords.y - coords->delta_y) * 0.5 + coords->y * 0.5;
+
+ cur_deviation = SQR(coords->x-new_x) + SQR(coords->y-new_y);
+
+ while (cur_deviation >= max_deviation)
+ {
+ new_x = new_x * 0.8 + coords->x * 0.2;
+ new_y = new_y * 0.8 + coords->y * 0.2;
+
+ cur_deviation = (SQR (coords->x - new_x) +
+ SQR (coords->y - new_y));
+ }
+
+ coords->x = new_x;
+ coords->y = new_y;
+
+ coords->delta_x = shell->last_coords.x - coords->x;
+ coords->delta_y = shell->last_coords.y - coords->y;
+
+ /* Recalculate distance */
+ coords->distance = sqrt (SQR (coords->delta_x) +
+ SQR (coords->delta_y));
}
#ifdef VERBOSE
@@ -297,10 +321,12 @@
shell->last_coords.velocity,
coords->pressure,
coords->distance - dist,
- xy_sfactor);
+ inertia_factor);
#endif
-
}
+ shell->last_coords = *coords;
+ shell->last_disp_motion_time = time;
+
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
