Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[pjcast]

Got the ol'e Macbook going again.

Patch compiled & ran alright, applied to CVS.

[hostep]

I took some hours today to try to fix gamepad support for mac.

Things fixed:
- multiple gamepads attached simultaneously are now supported (different deviceID's instead of all 0)
- vendor is now set correctly
- axes now work decently

I tested it with 2 PlayStation3 controllers connected simultaneously.
And I hope it will work for other controllers too, but as I don't have other controllers, I couldn't test that.

I already tested it in an Ogre game I made last year, and it works perfectly.

Here's the patch:
http://pieterhoste.be/ois/patch3

[pjcast]

For some reason I'm having issues applying the patch... There shouldn't be any conflicts, I'm on revision 8 just like the patch.

Code: [Select]

patch -p 0 < ~/Desktop/joypatch.txt

(Stripping trailing CRs from patch.)
patching file ois/trunk/includes/mac/MacJoyStick.h
Hunk #1 FAILED at 28.
Hunk #2 FAILED at 48.
2 out of 2 hunks FAILED -- saving rejects to file ois/trunk/includes/mac/MacJoyStick.h.rej
(Stripping trailing CRs from patch.)
patching file ois/trunk/src/mac/MacHIDManager.cpp
Hunk #1 FAILED at 406.
1 out of 1 hunk FAILED -- saving rejects to file ois/trunk/src/mac/MacHIDManager.cpp.rej
(Stripping trailing CRs from patch.)
patching file ois/trunk/src/mac/MacJoyStick.cpp
Hunk #1 FAILED at 32.
Hunk #2 FAILED at 75.
Hunk #3 FAILED at 118.
Hunk #4 FAILED at 162.
Hunk #5 FAILED at 202.
Hunk #6 FAILED at 247.
Hunk #7 FAILED at 290.
7 out of 7 hunks FAILED -- saving rejects to file ois/trunk/src/mac/MacJoyStick.cpp.rej

Wonder if there is some kind of line ending conflict?

[hostep]

Ow indeed, when I try it I also get problems.

Anyway, I did a new diff and this one does work, I've re-uploaded it.
http://pieterhoste.be/ois/patch3

[pjcast]

Nice. Applied the latest patch and built/ran - no issues.

Committed to SVN.