frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: rename a bunch of variables to be more self-explanatory 

i → used_offset
iveloc → initial_velocity
res → result
vdiff → velocity_diff
vfac → velocity_factor
tmp → tracker_velocity

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
This commit is contained in:
Peter Hutterer 2011-04-21 14:45:09 +10:00
parent e490190590
commit a0eda8cd36
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dix/ptrveloc.c
View File

@ -595,13 +595,14 @@ CalcTracker(const MotionTracker *tracker, int cur_t){
*/ */
static float static float
QueryTrackers(DeviceVelocityPtr vel, int cur_t){ QueryTrackers(DeviceVelocityPtr vel, int cur_t){
int offset, dir = UNDEFINED, i = -1, age_ms; int offset, dir = UNDEFINED, used_offset = -1, age_ms;
/* initial velocity: a low-offset, valid velocity */ /* initial velocity: a low-offset, valid velocity */
float iveloc = 0, res = 0, tmp, vdiff; float initial_velocity = 0, result = 0, velocity_diff;
float vfac = vel->corr_mul * vel->const_acceleration; /* premultiply */ float velocity_factor = vel->corr_mul * vel->const_acceleration; /* premultiply */
/* loop from current to older data */ /* loop from current to older data */
for(offset = 1; offset < vel->num_tracker; offset++){ for(offset = 1; offset < vel->num_tracker; offset++){
MotionTracker *tracker = TRACKER(vel, offset); MotionTracker *tracker = TRACKER(vel, offset);
float tracker_velocity;
age_ms = cur_t - tracker->time; age_ms = cur_t - tracker->time;
@ -625,42 +626,42 @@ QueryTrackers(DeviceVelocityPtr vel, int cur_t){
break; break;
} }
tmp = CalcTracker(tracker, cur_t) * vfac; tracker_velocity = CalcTracker(tracker, cur_t) * velocity_factor;
if ((iveloc == 0 || offset <= vel->initial_range) && tmp != 0) { if ((initial_velocity == 0 || offset <= vel->initial_range) && tracker_velocity != 0) {
/* set initial velocity and result */ /* set initial velocity and result */
res = iveloc = tmp; result = initial_velocity = tracker_velocity;
i = offset; used_offset = offset;
} else if (iveloc != 0 && tmp != 0) { } else if (initial_velocity != 0 && tracker_velocity != 0) {
vdiff = fabs(iveloc - tmp); velocity_diff = fabs(initial_velocity - tracker_velocity);
if (vdiff <= vel->max_diff || if (velocity_diff <= vel->max_diff ||
vdiff/(iveloc + tmp) < vel->max_rel_diff) { velocity_diff/(initial_velocity + tracker_velocity) < vel->max_rel_diff) {
/* we're in range with the initial velocity, /* we're in range with the initial velocity,
* so this result is likely better * so this result is likely better
* (it contains more information). */ * (it contains more information). */
res = tmp; result = tracker_velocity;
i = offset; used_offset = offset;
}else{ }else{
/* we're not in range, quit - it won't get better. */ /* we're not in range, quit - it won't get better. */
DebugAccelF("(dix prtacc) query: tracker too different:" DebugAccelF("(dix prtacc) query: tracker too different:"
" old %2.2f initial %2.2f diff: %2.2f\n", " old %2.2f initial %2.2f diff: %2.2f\n",
tmp, iveloc, vdiff); tracker_velocity, initial_velocity, velocity_diff);
break; break;
} }
} }
} }
if(offset == vel->num_tracker){ if(offset == vel->num_tracker){
DebugAccelF("(dix prtacc) query: last tracker in effect\n"); DebugAccelF("(dix prtacc) query: last tracker in effect\n");
i = vel->num_tracker-1; used_offset = vel->num_tracker-1;
} }
#ifdef PTRACCEL_DEBUGGING #ifdef PTRACCEL_DEBUGGING
if(i>=0){ if(used_offset >= 0){
MotionTracker *tracker = TRACKER(vel, i); MotionTracker *tracker = TRACKER(vel, used_offset);
DebugAccelF("(dix prtacc) result: offset %i [dx: %i dy: %i diff: %i]\n", DebugAccelF("(dix prtacc) result: offset %i [dx: %i dy: %i diff: %i]\n",
i, tracker->dx, tracker->dy, cur_t - tracker->time); used_offset, tracker->dx, tracker->dy, cur_t - tracker->time);
} }
#endif #endif
return res; return result;
} }
#undef TRACKER_INDEX #undef TRACKER_INDEX