From 7447eeb09c685c3ef7b4bdc149972dd6b1b6ca24 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 17 Jul 2008 20:02:02 +0000 Subject: [PATCH] also mix in the new members of the GimpCoords struct. 2008-07-17 Sven Neumann * app/core/gimpcoords.c (gimp_coords_mix): also mix in the new members of the GimpCoords struct. svn path=/trunk/; revision=26230 --- ChangeLog | 5 +++++ app/core/gimpcoords.c | 38 +++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e128f43aa7..b8690b9480 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-17 Sven Neumann + + * app/core/gimpcoords.c (gimp_coords_mix): also mix in the new + members of the GimpCoords struct. + 2008-07-17 Sven Neumann * app/core/gimpcoords.c (gimp_coords_mix): formatting. diff --git a/app/core/gimpcoords.c b/app/core/gimpcoords.c index 2b23155855..7b2fa59afa 100644 --- a/app/core/gimpcoords.c +++ b/app/core/gimpcoords.c @@ -44,21 +44,33 @@ gimp_coords_mix (const gdouble amul, { if (b) { - ret_val->x = amul * a->x + bmul * b->x; - ret_val->y = amul * a->y + bmul * b->y; - ret_val->pressure = amul * a->pressure + bmul * b->pressure; - ret_val->xtilt = amul * a->xtilt + bmul * b->xtilt; - ret_val->ytilt = amul * a->ytilt + bmul * b->ytilt; - ret_val->wheel = amul * a->wheel + bmul * b->wheel; + ret_val->x = amul * a->x + bmul * b->x; + ret_val->y = amul * a->y + bmul * b->y; + ret_val->pressure = amul * a->pressure + bmul * b->pressure; + ret_val->xtilt = amul * a->xtilt + bmul * b->xtilt; + ret_val->ytilt = amul * a->ytilt + bmul * b->ytilt; + ret_val->wheel = amul * a->wheel + bmul * b->wheel; + ret_val->delta_time = amul * a->delta_time + bmul * b->delta_time; + ret_val->delta_x = amul * a->delta_x + bmul * b->delta_x; + ret_val->delta_y = amul * a->delta_y + bmul * b->delta_y; + ret_val->distance = amul * a->distance + bmul * b->distance; + ret_val->velocity = amul * a->velocity + bmul * b->velocity; + ret_val->random = amul * a->random + bmul * b->random; } else { - ret_val->x = amul * a->x; - ret_val->y = amul * a->y; - ret_val->pressure = amul * a->pressure; - ret_val->xtilt = amul * a->xtilt; - ret_val->ytilt = amul * a->ytilt; - ret_val->wheel = amul * a->wheel; + ret_val->x = amul * a->x; + ret_val->y = amul * a->y; + ret_val->pressure = amul * a->pressure; + ret_val->xtilt = amul * a->xtilt; + ret_val->ytilt = amul * a->ytilt; + ret_val->wheel = amul * a->wheel; + ret_val->delta_time = amul * a->delta_time; + ret_val->delta_x = amul * a->delta_x; + ret_val->delta_y = amul * a->delta_y; + ret_val->distance = amul * a->distance; + ret_val->velocity = amul * a->velocity; + ret_val->random = amul * a->random; } } @@ -118,7 +130,7 @@ gimp_coords_scalarprod (const GimpCoords *a, a->pressure * b->pressure + a->xtilt * b->xtilt + a->ytilt * b->ytilt + - a->wheel * b->wheel ); + a->wheel * b->wheel); }