Commit Graph

55 Commits

Author SHA1 Message Date
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
hiker
29f5b14e45 More refactoring. Created factory for DeviceConfigs. 2014-10-29 08:22:25 +11:00
hiker
b66fb2e56b Removed unnecessary parameter for gamepads in processAndMapInput,
started a common virtual function for processAndMapInput. Removed
unnecessary #includes, cosmetic changes.
2014-10-28 09:00:22 +11:00
hiker
99f69f4070 Moved KeyboardConfig and GamepadConfig from DeviceConfig to their
own separate files.
2014-10-27 13:26:52 +11:00
hiker
e8f509eefe Moved DeviceConfig from config to input directory. 2014-10-26 23:26:02 +11:00
hiker
ec908d85c6 Split GamepadDevice and KeyboarDevice from input_device into their
own files. Renamed InputManager::getDeviceList() to getDeviceManager().
2014-10-25 23:09:00 +11:00
hiker
6893e94e71 Replaced irrXML usage with out XMLNode. 2014-10-24 21:47:50 +11:00
hikerstk
8247f73604 Replaced tabs with spaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 12:52:39 +00:00
hikerstk
c5b8732087 Probably biggest commit (in terms of number of files) ever -
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 11:43:21 +00:00
auria
a27853a592 Apply patch by Lilian Gimenez to support gamepad triggers in input code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13054 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-01 22:50:59 +00:00
curaga
57c3cbae3e Space cleanup pass on the headers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:47:39 +00:00
hikerstk
7ac899ade7 Refactored wiimote handling, splitting into two separate files.
Also added non-threading support (while it is too slow/too high
latency it's useful for debugging).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12781 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-22 11:28:57 +00:00
hikerstk
05cec70d86 Fixed 'map fire to select' option by also work for gamepads, only
accept fire (and not any event like steering), and remove setting
the flag each frame.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12191 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 23:43:09 +00:00
hikerstk
fe20c7d6a1 Accept 'fire' key in addition to 'select' to select a kart.
Auria, please review for potential inclusing in 0.8.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12187 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-12-06 10:58:04 +00:00
hikerstk
351f766ca4 Made KArtProperties member of STKConfig a pointer,
which removes the dependency of kart_properties.hpp
from stk_config.hpp, hopefully reducing the compile
time when kart_properties.hpp is changed. Had to
add many missing includes all over the place as a
result :)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 05:59:51 +00:00
auria
92eb0ebd2a Ran a small bash script to remove all of those annoying strings. The only thing they gave us were the need to rebuild after committing
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10363 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-12-06 18:43:36 +00:00
auria
8e6c7506db More attempts at working around the microsoft-pc-joystick-driver issue
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8458 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-25 15:46:04 +00:00
hikerstk
4d8b8e5dea Renamed ptr_vector to PtrVector so that is follows
our naming convention, also changed contentsVector
to m_contents_vector, and removed unused add method
(which is using an iterator, which would not work
when using aligned_arrays on windows anyway).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-03 22:20:53 +00:00
auria
368a7ebd13 In single-player mode, the user can now use all input devices
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7518 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-24 01:41:55 +00:00
auria
d725d5daea Added a few missing copyiright statements. More to come most likely
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7031 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-15 22:56:57 +00:00
hikerstk
f21ede30e3 Fixed bug 3090931: in some circumstances the key bindings for
the 2nd player would become the default, so if the first player
presses 'select' to select a kart, instead a new kart was added.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6738 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-11-28 10:21:36 +00:00
hikerstk
0084cd6a33 More NoCopy.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5944 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-09 05:28:18 +00:00
auria
244b40bfbf Added support for deleting added keyboard configurations
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5929 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-08 22:40:54 +00:00
auria
c5b50e5a5c Major update to input handling code to support our #1 feature request : menu navigation should not be tied to accelerate/brake/steer, there should be keys especially for menu navigation. Note that the code is not yet complete, namely you cannot configure the menu keys
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5369 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-03 18:56:55 +00:00
auria
2810193fb2 Lots of small changes to make the output Doxygen file much more useful
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-23 20:36:13 +00:00
auria
b868909efe Some cleanups with ActivePlayer. Moved it to StateManager, because that's where active players are created and stored - this will be less confusing than hiding it inside a configuration class. More work is still to be done if we want to make this code really clean, though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-18 21:28:32 +00:00
auria
4768654113 Fixed subtle input issue (problem assigning mouse to the right player when keyboard config used is not the first)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4381 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-02 01:55:20 +00:00
auria
2fb710f30b Implemented adding keyboard configs through the GUI
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4357 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-28 18:13:24 +00:00
auria
df422703ac Much cleanup and documentation in input code, which was done on the way of fixing a bug that dealt with multiple and/or custom keyboard configs and menu navigation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4355 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-27 19:12:44 +00:00
auria
cb91674631 Started adding support for multiple keyboard players (does not work at kart selection screen atm)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4223 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-14 15:09:34 +00:00
auria
bc9f8ebf6c Improved assignment of mouse to which player (a few known glitches when game master uses a gamepad, but getting better overall)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4193 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-02 01:04:05 +00:00
auria
22a7479a59 Cleanup in input & GUI code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4182 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-31 22:03:20 +00:00
rforder
db1c53fa94 Moved the handling for the fire & rescue buttons in the kart selection menu out of the device manager & into the input manager (which makes more sense). No more setting the action to PA_FIRST to signify that it was handled internally (too hackish).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3842 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-12 18:19:02 +00:00
rforder
aee48faca8 Updated input configuration GUI to work correctly with recent changes to the input system.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3826 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-09 18:12:35 +00:00
rforder
cf8e767f5c more input code clean-up
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3823 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-09 04:12:04 +00:00
rforder
21fb622a6d Broke down mapInputToPlayerAndAction() into several composite functions to increase readability & ease efforts to debug.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3822 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-07 17:31:14 +00:00
rforder
1d681112af Fixed sticky joystick bug that cropped up in the last commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-07 00:29:43 +00:00
rforder
f3e3206b26 More cleanup for the input system. Removed a lot of functions from InputDevice that won't be used there anymore.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-06 19:05:26 +00:00
rforder
9ba0bd67d2 Added new DeviceConfig class (/config/device_config.cpp) for review. The DeviceConfig class will be responsibile for handling Gamepad and Keyboard configurations. It is now possible to share a single configuration between identical devices. Begun integration, still needs *a lot* of cleanup, but basically works.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-06 18:00:18 +00:00
auria
a44b531525 Replaced usage of some confusing IDs with more explicit pointers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-12 00:18:37 +00:00
auria
8eaef3f63b Better player detection. Still getting some problems with irrlicht widgets : they internally catch some events without asking me. For instance, in 'press fire to join', if player has 'fire' assiged to the spacebar, pressing the spacebar results in irrlicht pressing the currently button - not sure how to get around this.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3726 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-11 01:56:07 +00:00
auria
18dc556fe6 Added functions to clean-up input after a game (though they're not called yet)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3702 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-04 20:09:49 +00:00
auria
a7abbf4c82 More work towards multiplayer (player 1 is now assigned an input device when pressing 'new game'). Cleanup when restarting game not implemented
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-04 20:00:18 +00:00
hikerstk
075c9dbb86 Moved more files into appropriate subdirs, update build
system for VS (verified) and autoconf (not verified).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3574 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-02 12:37:29 +00:00
auria
72c4ac468a playing around a bit more with input. added debug prints to corner what's happening on Arthur's computer
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3561 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-31 00:40:42 +00:00
auria
7e45011c6e cleaned up options menu code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-05-24 00:52:31 +00:00
auria
a15c23d878 the input config screen now contains some stuff... ugly and will need some serious thinking, but going along
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3439 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-26 01:31:56 +00:00
auria
6ed09ea3c5 bringing gamepad back in (won't work in game but will be detected, watch terminal)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3422 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-04-25 18:25:08 +00:00
hikerstk
4da63bbe90 Removed warnings about missing new lines at end of file.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3325 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-31 03:15:41 +00:00
auria
a32dd4c5aa only write config file when needed + other cleanup
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3322 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-30 01:42:12 +00:00