From eae6bec34485676399310376dc32cf5b32323b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Sat, 24 May 2014 21:49:13 +0200 Subject: [PATCH] filter: Ignore non-suitable trackers when calculating initial velocity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit calculate_velocity() didn't skip pointer trackers far away in time when calculating the initial velocity. This check was done later when iterating the rest, so while at it, simplify the function by doing both iterations in one single loop. Signed-off-by: Jonas Ådahl Reviewed-by: Hans de Goede --- src/filter.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/src/filter.c b/src/filter.c index df4d60a4..3221d193 100644 --- a/src/filter.c +++ b/src/filter.c @@ -183,28 +183,15 @@ calculate_velocity(struct pointer_accelerator *accel, uint64_t time) struct pointer_tracker *tracker; double velocity; double result = 0.0; - double initial_velocity; + double initial_velocity = 0.0; double velocity_diff; unsigned int offset; unsigned int dir = tracker_by_offset(accel, 0)->dir; - /* Find first velocity */ - for (offset = 1; offset < NUM_POINTER_TRACKERS; offset++) { - tracker = tracker_by_offset(accel, offset); - - if (time <= tracker->time) - continue; - - result = initial_velocity = - calculate_tracker_velocity(tracker, time); - if (initial_velocity > 0.0) - break; - } - /* Find least recent vector within a timelimit, maximum velocity diff * and direction threshold. */ - for (; offset < NUM_POINTER_TRACKERS; offset++) { + for (offset = 1; offset < NUM_POINTER_TRACKERS; offset++) { tracker = tracker_by_offset(accel, offset); /* Stop if too far away in time */ @@ -219,12 +206,16 @@ calculate_velocity(struct pointer_accelerator *accel, uint64_t time) velocity = calculate_tracker_velocity(tracker, time); - /* Stop if velocity differs too much from initial */ - velocity_diff = fabs(initial_velocity - velocity); - if (velocity_diff > MAX_VELOCITY_DIFF) - break; + if (initial_velocity == 0.0) { + result = initial_velocity = velocity; + } else { + /* Stop if velocity differs too much from initial */ + velocity_diff = fabs(initial_velocity - velocity); + if (velocity_diff > MAX_VELOCITY_DIFF) + break; - result = velocity; + result = velocity; + } } return result;