Quote:
Why on earth has:
static int last_was_x = 0;
.
.
.
if (last_was_x)
last_mickeyy = 0;
been added?
As I recall, because messages being send to the message handler aren't guarenteed to be alternating x/y pairs. I'm not sure what the differences were, but it should be functionally similar.
As I recall, the problem was incorrect scaling (by accelerating only on the amount of x/y values change instead of by the total distance crossed). That should have been fixed.
Also, check out current CVS for some more changes that were made. I don't recall off the top of my head what they were, but the sourceforge tracker should help there.
Quote:
Furthermore I seem to recall that my patch was not applied at all to 4.1.16
Wether for 4.1.16 or 4.1.17, I did apply something equivalent to the patch you posted at some point (manually, the patch didn't apply through the patch program for some reason).
Quote:
At the moment I'm having to rewrite some of wmouse.c every time I get a new version of the WIP 'cause the mouse acceleration has gone back to being absolutely awful.
Rather than hacking about your copy of Allegro, it'd be really nice if you bring things like these up after a WIP is released - either on the forums, or through private message or e-mail. Because things that are broken don't get fixed in the next release unless we know they're broken.
EDIT:
The CVS revision that James' patch was applied in is 1.38, the 4.1.16 release is revision 1.36. Elias made two changes to this, one in revision 1.40 (which is also the 4.1.17 release) and again in 1.41.
The diff from 1.37 to 1.38 (ie, the acceleration patch) is
#SelectExpand
1===================================================================
2RCS file: /cvsroot/alleg/allegro/src/win/wmouse.c,v
3retrieving revision 1.37
4retrieving revision 1.38
5diff -u -r1.37 -r1.38
6--- alleg/allegro/src/win/wmouse.c 2004/10/20 20:03:31 1.37
7+++ alleg/allegro/src/win/wmouse.c 2004/12/01 23:03:57 1.38
8@@ -92,8 +92,8 @@
9 #define MAF_DEFAULT 1 /* mouse acceleration parameters */
10 static int mouse_accel_fact = MAF_DEFAULT;
11 static int mouse_accel_mult = MAF_DEFAULT;
12-static int mouse_accel_thr1 = 5;
13-static int mouse_accel_thr2 = 16;
14+static int mouse_accel_thr1 = 50; /* 50 = 5^2 *2 */
15+static int mouse_accel_thr2 = 512; /* 512 = 16^2 *2 */
16
17 static int mouse_minx = 0; /* mouse range */
18 static int mouse_miny = 0;
19@@ -208,31 +208,39 @@
20 */
21 static void mouse_dinput_handle_event(int ofs, int data)
22 {
23+ static int last_mickeyx = 0;
24+ static int last_mickeyy = 0;
25+ int mag;
26+
27 switch (ofs) {
28
29 case DIMOFS_X:
30 if (!gfx_driver || !gfx_driver->windowed) {
31 if (mouse_accel_mult) {
32- if (ABS(data) >= mouse_accel_thr2)
33+ mag = last_mickeyx*last_mickeyx + last_mickeyy*last_mickeyy;
34+ if (mag >= mouse_accel_thr2)
35 data *= (mouse_accel_mult<<1);
36- else if (ABS(data) >= mouse_accel_thr1)
37+ else if (mag >= mouse_accel_thr1)
38 data *= mouse_accel_mult;
39 }
40
41 dinput_x += data;
42+ last_mickeyx = data;
43 }
44 break;
45
46 case DIMOFS_Y:
47 if (!gfx_driver || !gfx_driver->windowed) {
48 if (mouse_accel_mult) {
49- if (ABS(data) >= mouse_accel_thr2)
50+ mag = last_mickeyx*last_mickeyx + last_mickeyy*last_mickeyy;
51+ if (mag >= mouse_accel_thr2)
52 data *= (mouse_accel_mult<<1);
53- else if (ABS(data) >= mouse_accel_thr1)
54+ else if (mag >= mouse_accel_thr1)
55 data *= mouse_accel_mult;
56 }
57
58 dinput_y += data;
59+ last_mickeyy = data;
60 }
61 break;
(Or check the coloured diff [url http://cvs.sourceforge.net/viewcvs.py/alleg/allegro/src/win/wmouse.c?r1=1.37&r2=1.38]here[/url])
Elias' first fix (that is in 4.1.17) is
#SelectExpand
1===================================================================
2RCS file: /cvsroot/alleg/allegro/src/win/wmouse.c,v
3retrieving revision 1.39
4retrieving revision 1.40
5diff -u -r1.39 -r1.40
6--- alleg/allegro/src/win/wmouse.c 2004/12/04 13:24:17 1.39
7+++ alleg/allegro/src/win/wmouse.c 2004/12/05 08:56:32 1.40
8@@ -93,8 +93,8 @@
9 #define MAF_DEFAULT 1 /* mouse acceleration parameters */
10 static int mouse_accel_fact = MAF_DEFAULT;
11 static int mouse_accel_mult = MAF_DEFAULT;
12-static int mouse_accel_thr1 = 50; /* 50 = 5^2 *2 */
13-static int mouse_accel_thr2 = 512; /* 512 = 16^2 *2 */
14+static int mouse_accel_thr1 = 5 * 5;
15+static int mouse_accel_thr2 = 16 * 16;
16
17 static int mouse_minx = 0; /* mouse range */
18 static int mouse_miny = 0;
19@@ -211,12 +211,15 @@
20 {
21 static int last_mickeyx = 0;
22 static int last_mickeyy = 0;
23+ static int last_was_x = 0;
24 int mag;
25-
26+
27 switch (ofs) {
28
29 case DIMOFS_X:
30 if (!gfx_driver || !gfx_driver->windowed) {
31+ if (last_was_x)
32+ last_mickeyy = 0;
33 if (mouse_accel_mult) {
34 mag = last_mickeyx*last_mickeyx + last_mickeyy*last_mickeyy;
35 if (mag >= mouse_accel_thr2)
36@@ -227,11 +230,14 @@
37
38 dinput_x += data;
39 last_mickeyx = data;
40+ last_was_x = 1;
41 }
42 break;
43
44 case DIMOFS_Y:
45 if (!gfx_driver || !gfx_driver->windowed) {
46+ if (!last_was_x)
47+ last_mickeyx = 0;
48 if (mouse_accel_mult) {
49 mag = last_mickeyx*last_mickeyx + last_mickeyy*last_mickeyy;
50 if (mag >= mouse_accel_thr2)
51@@ -242,6 +248,7 @@
52
53 dinput_y += data;
54 last_mickeyy = data;
55+ last_was_x = 0;
56 }
57 break;
(or [url http://cvs.sourceforge.net/viewcvs.py/alleg/allegro/src/win/wmouse.c?r1=1.39&r2=1.40]colour diff[/url])
and the second (in current CVS) is
#SelectExpand
1===================================================================
2RCS file: /cvsroot/alleg/allegro/src/win/wmouse.c,v
3retrieving revision 1.40
4retrieving revision 1.41
5diff -u -r1.40 -r1.41
6--- alleg/allegro/src/win/wmouse.c 2004/12/05 08:56:32 1.40
7+++ alleg/allegro/src/win/wmouse.c 2004/12/07 17:37:30 1.41
8@@ -209,8 +209,8 @@
9 */
10 static void mouse_dinput_handle_event(int ofs, int data)
11 {
12- static int last_mickeyx = 0;
13- static int last_mickeyy = 0;
14+ static int last_data_x = 0;
15+ static int last_data_y = 0;
16 static int last_was_x = 0;
17 int mag;
18
19@@ -219,9 +219,11 @@
20 case DIMOFS_X:
21 if (!gfx_driver || !gfx_driver->windowed) {
22 if (last_was_x)
23- last_mickeyy = 0;
24+ last_data_y = 0;
25+ last_data_x = data;
26+ last_was_x = 1;
27 if (mouse_accel_mult) {
28- mag = last_mickeyx*last_mickeyx + last_mickeyy*last_mickeyy;
29+ mag = last_data_x*last_data_x + last_data_y*last_data_y;
30 if (mag >= mouse_accel_thr2)
31 data *= (mouse_accel_mult<<1);
32 else if (mag >= mouse_accel_thr1)
33@@ -229,17 +231,17 @@
34 }
35
36 dinput_x += data;
37- last_mickeyx = data;
38- last_was_x = 1;
39 }
40 break;
41
42 case DIMOFS_Y:
43 if (!gfx_driver || !gfx_driver->windowed) {
44 if (!last_was_x)
45- last_mickeyx = 0;
46+ last_data_x = 0;
47+ last_data_y = data;
48+ last_was_x = 0;
49 if (mouse_accel_mult) {
50- mag = last_mickeyx*last_mickeyx + last_mickeyy*last_mickeyy;
51+ mag = last_data_x*last_data_x + last_data_y*last_data_y;
52 if (mag >= mouse_accel_thr2)
53 data *= (mouse_accel_mult<<1);
54 else if (mag >= mouse_accel_thr1)
55@@ -247,8 +249,6 @@
56 }
57
58 dinput_y += data;
59- last_mickeyy = data;
60- last_was_x = 0;
61 }
62 break;
([url http://cvs.sourceforge.net/viewcvs.py/alleg/allegro/src/win/wmouse.c?r1=1.40&r2=1.41]colour diff[/url]).
]]>
.
